should fix #329

Author: tux-mind

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

@@ -38,12 +38,14 @@
 import org.csploit.android.core.Plugin;
 import org.csploit.android.core.System;
 import org.csploit.android.gui.dialogs.FinishDialog;
+import org.csploit.android.net.Target;
 
 import java.util.ArrayList;
 
 public class ActionActivity extends AppCompatActivity {
   private ArrayList<Plugin> mAvailable = null;
   private ListView theList;
+  private Target mTarget;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -56,8 +58,10 @@ public void onCreate(Bundle savedInstanceState) {
       setTheme(R.style.AppTheme);
     super.onCreate(savedInstanceState);
 
-    if (System.getTargets() != null && System.getTargets().size() > 0 && System.getCurrentTarget() != null) {
-      setTitle("cSploit > " + System.getCurrentTarget());
+    mTarget = System.getCurrentTarget();
+
+    if (mTarget != null) {
+      setTitle("cSploit > " + mTarget);
       setContentView(R.layout.actions_layout);
       getSupportActionBar().setDisplayHomeAsUpEnabled(true);
       theList = (ListView) findViewById(R.id.android_list);

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

@@ -40,7 +40,7 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
@@ -91,6 +91,9 @@
 import java.io.IOException;
 import java.net.NoRouteToHostException;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
 
 import static org.csploit.android.services.UpdateChecker.UPDATE_AVAILABLE;
 import static org.csploit.android.services.UpdateChecker.UPDATE_CHECKING;
@@ -180,7 +183,7 @@ public void createOnlineLayout() {
     lv.setOnItemLongClickListener(new OnItemLongClickListener() {
       @Override
       public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-        Target t = System.getTarget(position);
+        Target t = (Target) mTargetAdapter.getItem(position);
         if (t.getType() == Target.Type.NETWORK) {
           if (mActionMode == null)
             targetAliasPrompt(t);
@@ -200,7 +203,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
     mWipeReceiver.register(MainActivity.this);
     mMsfReceiver.register(MainActivity.this);
 
-    mRadarReceiver.setTargetAdapter(mTargetAdapter);
+    mRadarReceiver.setObserver(mTargetAdapter);
 
     StartRPCServer();
 
@@ -317,6 +320,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
           return;
         }
 
+        Target target = (Target) mTargetAdapter.getItem(position);
+        System.setCurrentTarget(target);
+
         new Thread(new Runnable() {
           @Override
           public void run() {
@@ -329,7 +335,6 @@ public void run() {
           }
         }).start();
 
-        System.setCurrentTarget(position);
         Toast.makeText(MainActivity.this,
                 getString(R.string.selected_) + System.getCurrentTarget(),
                 Toast.LENGTH_SHORT).show();
@@ -497,9 +502,11 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
         case R.id.multi_action:
           final int[] selected = mTargetAdapter.getSelectedPositions();
           if (selected.length > 1) {
-            commonPlugins = System.getPluginsForTarget(System.getTarget(selected[0]));
+            Target target = (Target) mTargetAdapter.getItem(selected[0]);
+            commonPlugins = System.getPluginsForTarget(target);
             for (int i = 1; i < selected.length; i++) {
-              ArrayList<Plugin> targetPlugins = System.getPluginsForTarget(System.getTarget(selected[i]));
+              target = (Target) mTargetAdapter.getItem(selected[i]);
+              ArrayList<Plugin> targetPlugins = System.getPluginsForTarget(target);
               ArrayList<Plugin> removeThem = new ArrayList<Plugin>();
               for (Plugin p : commonPlugins) {
                 if (!targetPlugins.contains(p))
@@ -533,7 +540,7 @@ public void onChoice(int[] choices) {
               (new ErrorDialog(getString(R.string.error), "no common actions found", MainActivity.this)).show();
             }
           } else {
-            targetAliasPrompt(System.getTarget(selected[0]));
+            targetAliasPrompt((Target) mTargetAdapter.getItem(selected[0]));
           }
           mode.finish(); // Action picked, so close the CAB
           return true;
@@ -817,14 +824,24 @@ public void onDestroy() {
     super.onDestroy();
   }
 
-  public class TargetAdapter extends ArrayAdapter<Target> {
-    public TargetAdapter() {
-      super(MainActivity.this, R.layout.target_list_item);
-    }
+  public class TargetAdapter extends BaseAdapter implements Runnable, Observer {
+
+    private List<Target> list = System.getTargets();
+    private boolean isDark = getSharedPreferences("THEME", 0).getBoolean("isDark", false);
 
     @Override
     public int getCount() {
-      return System.getTargets().size();
+      return list.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+      return list.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+      return R.layout.target_list_item;
     }
 
     @Override
@@ -835,24 +852,21 @@ public View getView(int position, View convertView, ViewGroup parent) {
       if (row == null) {
         LayoutInflater inflater = (LayoutInflater) MainActivity.this
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        row = inflater
-                .inflate(R.layout.target_list_item, parent, false);
-        if (getSharedPreferences("THEME", 0).getBoolean("isDark", false))
+        row = inflater.inflate(R.layout.target_list_item, parent, false);
+
+        if (isDark)
           row.setBackgroundResource(R.drawable.card_background_dark);
+
         holder = new TargetHolder();
-        holder.itemImage = (ImageView) (row != null ? row
-                .findViewById(R.id.itemIcon) : null);
-        holder.itemTitle = (TextView) (row != null ? row
-                .findViewById(R.id.itemTitle) : null);
-        holder.itemDescription = (TextView) (row != null ? row
-                .findViewById(R.id.itemDescription) : null);
-
-        if (row != null)
-          row.setTag(holder);
+        holder.itemImage = (ImageView) row.findViewById(R.id.itemIcon);
+        holder.itemTitle = (TextView) row.findViewById(R.id.itemTitle);
+        holder.itemDescription = (TextView) row.findViewById(R.id.itemDescription);
+
+        row.setTag(holder);
       } else
         holder = (TargetHolder) row.getTag();
 
-      Target target = System.getTarget(position);
+      Target target = list.get(position);
 
       if (target.hasAlias())
         holder.itemTitle.setText(Html.fromHtml("<b>"
@@ -864,8 +878,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
       holder.itemTitle.setTextColor(getResources().getColor((target.isConnected() ? R.color.app_color : R.color.gray_text)));
 
-      if (row != null && (getSharedPreferences("THEME", 0).getBoolean("isDark", false)))
-          row.setBackgroundResource(R.drawable.card_background_dark);
       holder.itemTitle.setTypeface(null, Typeface.NORMAL);
       holder.itemImage.setImageResource(target.getDrawableResourceId());
       holder.itemDescription.setText(target.getDescription());
@@ -874,15 +886,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
     public void clearSelection() {
-      for (Target t : System.getTargets())
+      for (Target t : list)
         t.setSelected(false);
       notifyDataSetChanged();
       if (mActionMode != null)
         mActionMode.finish();
     }
 
     public void toggleSelection(int position) {
-      Target t = System.getTarget(position);
+      Target t = list.get(position);
       t.setSelected(!t.isSelected());
       notifyDataSetChanged();
       if (mActionMode != null) {
@@ -895,15 +907,15 @@ public void toggleSelection(int position) {
 
     public int getSelectedCount() {
       int i = 0;
-      for (Target t : System.getTargets())
+      for (Target t : list)
         if (t.isSelected())
           i++;
       return i;
     }
 
     public ArrayList<Target> getSelected() {
       ArrayList<Target> result = new ArrayList<Target>();
-      for (Target t : System.getTargets())
+      for (Target t : list)
         if (t.isSelected())
           result.add(t);
       return result;
@@ -913,12 +925,23 @@ public int[] getSelectedPositions() {
       int[] res = new int[getSelectedCount()];
       int j = 0;
 
-      for (int i = 0; i < System.getTargets().size(); i++)
-        if (System.getTarget(i).isSelected())
+      for (int i = 0; i < list.size(); i++)
+        if (list.get(i).isSelected())
           res[j++] = i;
       return res;
     }
 
+    @Override
+    public void update(Observable observable, Object data) {
+      MainActivity.this.runOnUiThread(this);
+    }
+
+    @Override
+    public void run() {
+      list = System.getTargets();
+      notifyDataSetChanged();
+    }
+
     class TargetHolder {
       ImageView itemImage;
       TextView itemTitle;

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

@@ -16,6 +16,7 @@
 import org.csploit.android.net.metasploit.MsfExploit;
 import org.csploit.android.tools.NMap;
 
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -264,10 +265,12 @@ protected void onHandleIntent(Intent intent) {
     mRunning = true;
 
     //fetch targets
+    // TODO: rewrite this service since target index may change
+    List<Target> list = System.getTargets();
     Target[] targets = new Target[targetsIndex.length];
 
     for(i =0; i< targetsIndex.length;i++)
-      targets[i] = System.getTarget(targetsIndex[i]);
+      targets[i] = list.get(targetsIndex[i]);
 
     //fetch tasks
     for(int stringId : actions) {