change autoScan state only when needed, do not check on every host found

Author: tux-mind

cSploit/src/org/csploit/android/SettingsActivity.java

@@ -41,6 +41,7 @@
 import org.csploit.android.gui.dialogs.ChoiceDialog;
 import org.csploit.android.gui.dialogs.ConfirmDialog;
 import org.csploit.android.net.GitHubParser;
+import org.csploit.android.services.Services;
 import org.csploit.android.tools.Raw;
 import org.json.JSONException;
 
@@ -376,6 +377,8 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
       } else if (key.equals("MSF_ENABLED")) {
         if (mMsfEnabled.isChecked())
           onMsfEnabled();
+      } else if (key.equals("PREF_AUTO_PORTSCAN")) {
+        Services.getNetworkRadar().onAutoScanChanged();
       }
 
       if (message != null)

cSploit/src/org/csploit/android/core/System.java

@@ -305,6 +305,7 @@ public static void shutdownCoreDaemon(){
     Client.Disconnect();
 
     mCoreInitialized = false;
+    Services.getNetworkRadar().onAutoScanChanged();
   }
 
   public static void initCore() throws DaemonException, SuException {
@@ -335,6 +336,7 @@ public static void initCore() throws DaemonException, SuException {
     reloadTools();
 
     mCoreInitialized = true;
+    Services.getNetworkRadar().onAutoScanChanged();
   }
 
   public static void reloadNetworkMapping(){
@@ -948,7 +950,7 @@ public static void reset() {
   }
 
   public static void scanThemAll() {
-    if(!mCoreInitialized) {
+    if(!Services.getNetworkRadar().isAutoScanEnabled()) {
       return;
     }
     synchronized (mTargets) {
@@ -1212,6 +1214,7 @@ public static void clean(boolean releaseLocks){
 
       Client.Disconnect();
       mCoreInitialized = false;
+      Services.getNetworkRadar().onAutoScanChanged();
     }
     catch(Exception e){
       errorLogging(e);

cSploit/src/org/csploit/android/services/NetworkRadar.java

@@ -26,6 +26,8 @@ public class NetworkRadar extends NativeService implements MenuControllableServi
   public static final String NRDR_STARTED = "NetworkRadar.action.STARTED";
   public static final String NRDR_START_FAILED = "NetworkRadar.action.START_FAILED";
 
+  private boolean autoScan = true;
+
   public NetworkRadar(Context context) {
     this.context = context;
   }
@@ -69,26 +71,28 @@ public void buildMenuItem(MenuItem item) {
     item.setEnabled(System.getTools().networkRadar.isEnabled() && System.getNetwork() != null);
   }
 
-  public void onNewTargetFound(final Target target) {
-    if (target.getType() == Target.Type.NETWORK)
-      return;
+  public void onAutoScanChanged() {
+    autoScan = System.isCoreInitialized() && System.getSettings().getBoolean("PREF_AUTO_PORTSCAN", true);
+    Logger.info("autoScan has been set to " + autoScan);
+  }
 
-    if (!System.isCoreInitialized()) {
+  public boolean isAutoScanEnabled() {
+    return autoScan;
+  }
+
+  public void onNewTargetFound(final Target target) {
+    if(!autoScan || target.getType() == Target.Type.NETWORK)
       return;
-    }
-    SharedPreferences prefs = System.getSettings();
-    if (prefs.getBoolean("PREF_AUTO_PORTSCAN", true)) {
-      ThreadHelper.getSharedExecutor().execute(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            System.getTools().nmap.synScan(target, new ScanReceiver(target));
-          } catch (ChildManager.ChildNotStartedException e) {
-            System.errorLogging(e);
-          }
+    ThreadHelper.getSharedExecutor().execute(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          System.getTools().nmap.synScan(target, new ScanReceiver(target));
+        } catch (ChildManager.ChildNotStartedException e) {
+          System.errorLogging(e);
         }
-      });
-    }
+      }
+    });
   }
 
   private class Receiver extends HostReceiver {