TargetList notification system re-implemented.

do not use intents, use Observer.
notify on every interesting event ( target {port , name, connected} changed, target list changed )

Author: tux-mind

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

@@ -204,7 +204,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
     mWipeReceiver.register(MainActivity.this);
     mMsfReceiver.register(MainActivity.this);
 
-    mRadarReceiver.setObserver(mTargetAdapter);
+    System.setTargetListObserver(mTargetAdapter);
 
     StartRPCServer();
 
@@ -930,7 +930,30 @@ public int[] getSelectedPositions() {
 
     @Override
     public void update(Observable observable, Object data) {
-      MainActivity.this.runOnUiThread(this);
+      final Target target = (Target) data;
+
+      if(target == null) {
+        // update the whole list
+        MainActivity.this.runOnUiThread(this);
+        return;
+      }
+
+      // update only a row, if it's displayed
+      MainActivity.this.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          if(lv == null)
+            return;
+          int start = lv.getFirstVisiblePosition();
+          for(int i=start, j=lv.getLastVisiblePosition();i<=j;i++)
+            if(target==list.get(i)){
+              View view = lv.getChildAt(i-start);
+              getView(i, view, lv);
+              break;
+            }
+        }
+      });
+
     }
 
     @Override

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

@@ -86,6 +86,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Observer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
@@ -143,6 +144,8 @@ public class System
 
   private static KnownIssues mKnownIssues = null;
 
+  private static Observer targetListObserver = null;
+
   private final static LinkedList<SettingReceiver> mSettingReceivers = new LinkedList<SettingReceiver>();
 
   public static void init(Context context) throws Exception{
@@ -372,6 +375,33 @@ public static boolean checkNetworking(final Activity current){
     return true;
   }
 
+  public synchronized static void setTargetListObserver(Observer targetListObserver) {
+    System.targetListObserver = targetListObserver;
+  }
+
+  /**
+   * notify that a specific target of the list has been changed
+   * @param target  the changed target
+   */
+  public static void notifyTargetListChanged(Target target) {
+    Observer o;
+    synchronized (System.class) {
+      o = targetListObserver;
+    }
+
+    if(o==null)
+      return;
+
+    o.update(null, target);
+  }
+
+  /**
+   * notify that the targets list has been changed
+   */
+  public static void notifyTargetListChanged() {
+    notifyTargetListChanged(null);
+  }
+
   public static void setLastError(String error){
     mLastError = error;
   }

cSploit/src/org/csploit/android/net/Target.java

@@ -655,6 +655,7 @@ public String getHostname(){
   }
 
   public void addOpenPort(Port port){
+    boolean notifyList = false;
     synchronized (mPorts) {
       Port existing = null;
       for(Port p : mPorts) {
@@ -668,8 +669,11 @@ public void addOpenPort(Port port){
         port.mergeTo(existing);
       } else {
         mPorts.add(port);
+        notifyList = true;
       }
     }
+    if(notifyList)
+      System.notifyTargetListChanged(this);
   }
 
   public void addOpenPort(int port, Protocol protocol){

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

@@ -21,7 +21,6 @@
  * network-radar process manager
  */
 public class NetworkRadar extends NativeService implements MenuControllableService {
-  public static final String NRDR_CHANGED = "NetworkRadar.action.TARGET_CHANGED";
   public static final String NRDR_STOPPED = "NetworkRadar.action.STOPPED";
   public static final String NRDR_STARTED = "NetworkRadar.action.STARTED";
   public static final String NRDR_START_FAILED = "NetworkRadar.action.START_FAILED";
@@ -121,18 +120,23 @@ public void onHostFound(byte[] macAddress, InetAddress ipAddress, String name) {
         }
       }
 
-      if(notify) {
-        sendIntent(NRDR_CHANGED);
+      if(!notify)
+        return;
+
+      if(justFound) {
+        System.notifyTargetListChanged();
+      } else {
+        System.notifyTargetListChanged(t);
       }
     }
 
     @Override
     public void onHostLost(InetAddress ipAddress) {
       Target t = System.getTargetByAddress(ipAddress);
 
-      if(t != null) {
+      if(t != null && t.isConnected()) {
         t.setConneced(false);
-        sendIntent(NRDR_CHANGED);
+        System.notifyTargetListChanged(t);
       }
     }
 
@@ -162,7 +166,6 @@ public ScanReceiver(Target target) {
     @Override
     public void onPortFound(int port, String protocol) {
       target.addOpenPort(port, Network.Protocol.fromString(protocol));
-      sendIntent(NRDR_CHANGED);
     }
   }
 }

cSploit/src/org/csploit/android/services/receivers/NetworkRadarReceiver.java

@@ -4,36 +4,25 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Build;
-import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
-import org.csploit.android.MainActivity;
 import org.csploit.android.R;
 import org.csploit.android.core.*;
 import org.csploit.android.services.NetworkRadar;
 
-import java.util.Observer;
-
 /**
  * receive notifications from NetworkRadar
  */
 public class NetworkRadarReceiver extends ManagedReceiver {
 
   private final IntentFilter filter;
-  private Observer changeObserver;
 
   public NetworkRadarReceiver() {
     filter = new IntentFilter();
 
     filter.addAction(NetworkRadar.NRDR_STARTED);
     filter.addAction(NetworkRadar.NRDR_START_FAILED);
     filter.addAction(NetworkRadar.NRDR_STOPPED);
-    filter.addAction(NetworkRadar.NRDR_CHANGED);
-  }
-
-  public void setObserver(Observer changeObserver) {
-    this.changeObserver = changeObserver;
   }
 
   @Override
@@ -68,11 +57,6 @@ private void notifyIntent(Context context, Intent intent) {
       case NetworkRadar.NRDR_START_FAILED:
         Toast.makeText(context, R.string.net_discovery_start_failed, Toast.LENGTH_LONG).show();
         break;
-      case NetworkRadar.NRDR_CHANGED:
-        if(changeObserver != null) {
-          changeObserver.update(null, null);
-        }
-        break;
     }
   }
 }