Fix: #970 revert to old logic to check root during apply.

ukanth · Jun 12, 2019 · 1d9cc72 · 1d9cc72
1 parent 3384d68
commit 1d9cc72
Showing 1 changed file with 34 additions and 31 deletions.
diff --git a/aFWall/src/main/java/dev/ukanth/ufirewall/MainActivity.java b/aFWall/src/main/java/dev/ukanth/ufirewall/MainActivity.java
@@ -2277,39 +2277,42 @@ protected void onPreExecute() {
         @Override
         protected Boolean doInBackground(Void... params) {
             //set the progress
-            if (!Shell.SU.available()) return false;
-
-            Api.setRulesUpToDate(false);
-            Api.applySavedIptablesRules(getApplicationContext(), true, new RootCommand()
-                    .setSuccessToast(R.string.rules_applied)
-                    .setFailureToast(R.string.error_apply)
-                    .setReopenShell(true)
-                    .setCallback(new RootCommand.Callback() {
-                        public void cbFunc(RootCommand state) {
-                            try {
-                                if (runProgress != null) {
-                                    runProgress.dismiss();
+            if (G.hasRoot() && Shell.SU.available()) {
+                Api.setRulesUpToDate(false);
+                Api.applySavedIptablesRules(getApplicationContext(), true, new RootCommand()
+                        .setSuccessToast(R.string.rules_applied)
+                        .setFailureToast(R.string.error_apply)
+                        .setReopenShell(true)
+                        .setCallback(new RootCommand.Callback() {
+                            public void cbFunc(RootCommand state) {
+                                try {
+                                    if (runProgress != null) {
+                                        runProgress.dismiss();
+                                    }
+                                } catch (Exception ex) {
                                 }
-                            } catch (Exception ex) {
-                            }
-                            if (state.exitCode == 0) {
-                                setDirty(false);
-                            }
-                            //queue.clear();
-                            runOnUiThread(() -> {
-                                setDirty(false);
-                                if (state.exitCode != 0) {
-                                    Api.errorNotification(ctx);
-                                    menuSetApplyOrSave(MainActivity.this.mainMenu, false);
-                                    Api.setEnabled(ctx, false, true);
-                                } else {
-                                    menuSetApplyOrSave(MainActivity.this.mainMenu, enabled);
-                                    Api.setEnabled(ctx, enabled, true);
+                                if (state.exitCode == 0) {
+                                    setDirty(false);
                                 }
-                            });
-                        }
-                    }));
-            return true;
+                                //queue.clear();
+                                runOnUiThread(() -> {
+                                    setDirty(false);
+                                    if (state.exitCode != 0) {
+                                        Api.errorNotification(ctx);
+                                        menuSetApplyOrSave(MainActivity.this.mainMenu, false);
+                                        Api.setEnabled(ctx, false, true);
+                                    } else {
+                                        menuSetApplyOrSave(MainActivity.this.mainMenu, enabled);
+                                        Api.setEnabled(ctx, enabled, true);
+                                    }
+                                });
+                            }
+                        }));
+                return true;
+            } else {
+                return false;
+            }
+
         }
 
         @Override