revert 4d5b368

Author: tux-mind

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

@@ -200,7 +200,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
     mWipeReceiver.register(MainActivity.this);
     mMsfReceiver.register(MainActivity.this);
 
-    getNetworkRadar().setAdapter(mTargetAdapter);
+    mRadarReceiver.setTargetAdapter(mTargetAdapter);
 
     StartRPCServer();
 

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

@@ -1,8 +1,8 @@
 package org.csploit.android.services;
 
 import android.app.Activity;
+import android.content.Context;
 import android.view.MenuItem;
-import android.widget.BaseAdapter;
 
 import org.csploit.android.R;
 import org.csploit.android.core.Logger;
@@ -11,29 +11,20 @@
 import org.csploit.android.net.Target;
 
 import java.net.InetAddress;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * 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";
 
-  private final List<TargetTask> taskList = new LinkedList<>();
-  private final TargetSubmitter submitter = new TargetSubmitter();
-  private BaseAdapter adapter;
-
-  public NetworkRadar(Activity context) {
+  public NetworkRadar(Context context) {
     this.context = context;
   }
 
-  public void setAdapter(BaseAdapter adapter) {
-    this.adapter = adapter;
-  }
-
   public boolean start() {
     stop();
     try {
@@ -78,48 +69,41 @@ private class Receiver extends org.csploit.android.tools.NetworkRadar.HostReceiv
     @Override
     public void onHostFound(byte[] macAddress, InetAddress ipAddress, String name) {
       Target t;
-      TargetTask task = null;
+      boolean notify = false;
 
       t = System.getTargetByAddress(ipAddress);
 
       if(t==null) {
         t = new Target(ipAddress, macAddress);
-        t.setAlias(name);
 
-        task = new TargetTask(t, true, null, true);
-      } else {
-        boolean aliasChanged = name != null && !name.equals(t.getAlias());
+        System.addOrderedTarget(t);
 
-        if(aliasChanged || !t.isConnected()) {
-          task = new TargetTask(t, false, (aliasChanged ? name : t.getAlias()), true);
-        }
+        notify = true;
       }
 
-      if(task == null)
-        return;
+      if( !t.isConnected() ) {
+        t.setConneced(true);
+        notify = true;
+      }
 
-      synchronized (taskList) {
-        taskList.add(task);
+      if (name != null && !name.equals(t.getAlias())) {
+        t.setAlias(name);
+        notify = true;
       }
 
-      ((Activity)context).runOnUiThread(submitter);
+      if(notify) {
+        sendIntent(NRDR_CHANGED);
+      }
     }
 
     @Override
     public void onHostLost(InetAddress ipAddress) {
       Target t = System.getTargetByAddress(ipAddress);
 
-      if(t == null) {
-        return;
-      }
-
-      synchronized (taskList) {
-        taskList.add(
-                new TargetTask(t, false, t.getAlias(), false)
-        );
+      if(t != null) {
+        t.setConneced(false);
+        sendIntent(NRDR_CHANGED);
       }
-
-      ((Activity)context).runOnUiThread(submitter);
     }
 
     @Override
@@ -136,45 +120,4 @@ public void onDeath(int signal) {
       sendIntent(NRDR_STOPPED);
     }
   }
-
-  private class TargetTask {
-    final Target target;
-    final boolean add;
-    final String name;
-    final boolean connected;
-
-    public TargetTask(Target target, boolean add, String name, boolean connected) {
-      this.target = target;
-      this.add = add;
-      this.name = name;
-      this.connected = connected;
-    }
-  }
-
-  private class TargetSubmitter implements Runnable {
-    @Override
-    public void run() {
-      synchronized (taskList) {
-        if(!taskList.isEmpty()) {
-          for (TargetTask task : taskList) {
-            processTask(task);
-          }
-          if(adapter != null)
-            adapter.notifyDataSetChanged();
-        }
-      }
-    }
-
-    private void processTask(final TargetTask task) {
-      if(task.add) {
-        System.addOrderedTarget(task.target);
-      } else {
-        task.target.setConneced(task.connected);
-        task.target.setAlias(task.name);
-      }
-    }
-
-  }
-
-
 }

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

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.widget.BaseAdapter;
 import android.widget.Toast;
 
 import org.csploit.android.R;
@@ -16,13 +17,19 @@
 public class NetworkRadarReceiver extends ManagedReceiver {
 
   private final IntentFilter filter;
+  private BaseAdapter targetAdapter;
 
   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 setTargetAdapter(BaseAdapter targetAdapter) {
+    this.targetAdapter = targetAdapter;
   }
 
   @Override
@@ -57,6 +64,10 @@ 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(targetAdapter != null)
+          targetAdapter.notifyDataSetChanged();
+        break;
     }
   }
 }