Merge pull request #458 from JVaassen/master

Update SwitchDialog.java
domoticz · Mar 5, 2018 · 008cb8e · 008cb8e
2 parents d1f0d3d + 21bf117
commit 008cb8e
Showing 1 changed file with 17 additions and 24 deletions.
diff --git a/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java b/app/src/main/java/nl/hnogames/domoticz/UI/SwitchDialog.java
@@ -91,33 +91,26 @@ public void show() {
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, final int position, long id) {
-                mDomoticz.getStatus(info.get(position).getIdx(), new StatusReceiver() {
-                    @Override
-                    public void onReceiveStatus(ExtendedStatusInfo extendedStatusInfo) {
-                        if (!extendedStatusInfo.isProtected()) {
+                if (!info.get(position).isProtected()) {
+                    if (dismissListener != null)
+                        dismissListener.onDismiss(info.get(position).getIdx(), null, info.get(position).getName(), info.get(position).isSceneOrGroup());
+                }
+                else {
+                    PasswordDialog passwordDialog = new PasswordDialog(mContext, mDomoticz);
+                    passwordDialog.show();
+                    passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
+                        @Override
+                        public void onDismiss(String password) {
                             if (dismissListener != null)
-                                dismissListener.onDismiss(info.get(position).getIdx(), null, info.get(position).getName(), info.get(position).isSceneOrGroup());
-                        } else {
-                            PasswordDialog passwordDialog = new PasswordDialog(mContext, mDomoticz);
-                            passwordDialog.show();
-                            passwordDialog.onDismissListener(new PasswordDialog.DismissListener() {
-                                @Override
-                                public void onDismiss(String password) {
-                                    dismissListener.onDismiss(info.get(position).getIdx(), password, info.get(position).getName(), info.get(position).isSceneOrGroup());
-                                }
-
-                                @Override
-                                public void onCancel() {
-                                }
-                            });
+                                dismissListener.onDismiss(info.get(position).getIdx(), password, info.get(position).getName(), info.get(position).isSceneOrGroup());
                         }
-                    }
-
-                    @Override
-                    public void onError(Exception error) {
-                    }
-                });
 
+                        @Override
+                        public void onCancel() {
+                        }
+                    });
+                }
+
                 md.dismiss();
             }
         });