move duplicate code into reset()

call NetworkRadar#onNewTargetFound for 3 initial targets
call NetworkRadar#onNewTargetFound for each added target

Author: tux-mind

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

@@ -56,6 +56,7 @@
 import org.csploit.android.net.metasploit.Payload;
 import org.csploit.android.net.metasploit.RPCClient;
 import org.csploit.android.net.metasploit.Session;
+import org.csploit.android.services.Services;
 import org.csploit.android.tools.ToolBox;
 
 import java.io.BufferedReader;
@@ -189,21 +190,7 @@ public static void init(Context context) throws Exception{
         MSF_RPC_PORT = 55553;
       }
 
-      // initialize network data at the end
-      mNetwork = new Network(mContext);
-
-      Target network = new Target(mNetwork),
-        gateway = new Target(mNetwork.getGatewayAddress(), mNetwork.getGatewayHardware()),
-        device = new Target(mNetwork.getLocalAddress(), mNetwork.getLocalHardware());
-
-      gateway.setAlias(mNetwork.getSSID());
-      device.setAlias(android.os.Build.MODEL);
-
-      mTargets.add(network);
-      mTargets.add(gateway);
-      mTargets.add(device);
-
-      mInitialized = true;
+      uncaughtReloadNetworkMapping();
 
       ThreadHelper.getSharedExecutor().execute(new Runnable() {
         @Override
@@ -349,23 +336,7 @@ public static void initCore() throws DaemonException, SuException {
 
   public static void reloadNetworkMapping(){
     try{
-      mNetwork = new Network(mContext);
-
-      Target network = new Target(mNetwork),
-        gateway = new Target(mNetwork.getGatewayAddress(), mNetwork.getGatewayHardware()),
-        device = new Target(mNetwork.getLocalAddress(), mNetwork.getLocalHardware());
-
-      gateway.setAlias(mNetwork.getSSID());
-      device.setAlias(android.os.Build.MODEL);
-
-      synchronized (mTargets) {
-        mTargets.clear();
-        mTargets.add(network);
-        mTargets.add(gateway);
-        mTargets.add(device);
-      }
-
-      mInitialized = true;
+      uncaughtReloadNetworkMapping();
     }
     catch(NoRouteToHostException nrthe){
       // swallow bitch
@@ -375,6 +346,14 @@ public static void reloadNetworkMapping(){
     }
   }
 
+  private static void uncaughtReloadNetworkMapping() throws UnknownHostException, SocketException {
+    mNetwork = new Network(mContext);
+
+    reset();
+
+    mInitialized = true;
+  }
+
   public static boolean checkNetworking(final Activity current){
     if(!Network.isWifiConnected(mContext)){
 
@@ -917,18 +896,26 @@ else if(name.endsWith(".tiff"))
     return type;
   }
 
-  public static void reset() throws SocketException{
+  public static void reset() {
     mCurrentTarget = null;
 
     synchronized (mTargets) {
       mTargets.clear();
 
-      // local network
-      mTargets.add(new Target(System.getNetwork()));
-      // network gateway
-      mTargets.add(new Target(System.getNetwork().getGatewayAddress(), System.getNetwork().getGatewayHardware()));
-      // device network address
-      mTargets.add(new Target(System.getNetwork().getLocalAddress(), System.getNetwork().getLocalHardware()));
+      Target network = new Target(mNetwork),
+              gateway = new Target(mNetwork.getGatewayAddress(), mNetwork.getGatewayHardware()),
+              device = new Target(mNetwork.getLocalAddress(), mNetwork.getLocalHardware());
+
+      gateway.setAlias(mNetwork.getSSID());
+      device.setAlias(android.os.Build.MODEL);
+
+      mTargets.add(network);
+      mTargets.add(gateway);
+      mTargets.add(device);
+
+      for(Target t : mTargets) {
+        Services.getNetworkRadar().onNewTargetFound(t);
+      }
     }
   }
 
@@ -1004,12 +991,13 @@ public static boolean addOrderedTarget(Target target){
       for (int i = 0; i < mTargets.size(); i++) {
         if (mTargets.get(i).comesAfter(target)) {
           mTargets.add(i, target);
+          Services.getNetworkRadar().onNewTargetFound(target);
           return true;
         }
       }
 
       mTargets.add(target);
-
+      Services.getNetworkRadar().onNewTargetFound(target);
       return true;
     }
   }

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

@@ -8,6 +8,7 @@
 import org.csploit.android.core.Logger;
 import org.csploit.android.core.System;
 import org.csploit.android.core.ChildManager;
+import org.csploit.android.helpers.ThreadHelper;
 import org.csploit.android.net.Endpoint;
 import org.csploit.android.net.Network;
 import org.csploit.android.net.Target;
@@ -68,12 +69,20 @@ public void buildMenuItem(MenuItem item) {
     item.setEnabled(System.getTools().networkRadar.isEnabled());
   }
 
-  private void onNewHostFound(Target target) {
-    try {
-      System.getTools().nmap.synScan(target, new ScanReceiver(target));
-    } catch (ChildManager.ChildNotStartedException e) {
-      System.errorLogging(e);
-    }
+  public void onNewTargetFound(final Target target) {
+    if(target.getType() == Target.Type.NETWORK)
+      return;
+
+    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 {
@@ -115,10 +124,6 @@ public void onHostFound(byte[] macAddress, InetAddress ipAddress, String name) {
       if(notify) {
         sendIntent(NRDR_CHANGED);
       }
-
-      if(justFound) {
-        onNewHostFound(t);
-      }
     }
 
     @Override