Updated Logic

Author: codehasan

app/src/main/java/io/github/ratul/topactivity/ui/MainActivity.java

@@ -225,7 +225,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             return;
         }
         if (isChecked && buttonView == mWindowSwitch) {
-            if (Build.VERSION.SDK_INT >= 24 && DatabaseUtil.hasBattery() && !((PowerManager) getSystemService("power")).isIgnoringBatteryOptimizations(getPackageName())) {
+            if (Build.VERSION.SDK_INT >= 24 && !DatabaseUtil.hasBattery() && !((PowerManager) getSystemService("power")).isIgnoringBatteryOptimizations(getPackageName())) {
                 setupBattery();
                 DatabaseUtil.setHasBattery(true);
                 return;
@@ -353,6 +353,13 @@ public void onClick(View v) {
                     fancy.dismiss();
                 }
             });
+        fancy.getDialog().setOnDismissListener(new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface dialog) {
+                    refreshWindowSwitch();
+                    refreshAccessibilitySwitch();
+                }
+            });
         fancy.setCancelable(false);
         fancy.show();