Merge #360 into develop

Conflicts:
	cSploit/res/values/strings.xml

Author: tux-mind

cSploit/res/values/strings.xml

@@ -522,4 +522,6 @@
     <string name="msf_rank_good">Good</string>
     <string name="msf_rank_great">Great</string>
     <string name="msf_rank_excellent">Excellent</string>
+    <string name="mitm_ss_select_target_title">Select target</string>
+    <string name="mitm_ss_select_target_prompt">Select %s ?</string>
 </resources>

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

@@ -1045,6 +1045,14 @@ public static void setCurrentTarget(int index){
     mCurrentTarget = index;
   }
 
+  public static void setCurrentTarget(Target target) {
+    int index = mTargets.indexOf(target);
+    if(index != -1)
+      setCurrentTarget(index);
+    else
+      Logger.error("target '" + target + "' not found");
+  }
+
   public static Target getCurrentTarget(){
     return getTarget(mCurrentTarget);
   }

cSploit/src/org/csploit/android/plugins/mitm/Sniffer.java

@@ -19,14 +19,14 @@
 package org.csploit.android.plugins.mitm;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -38,12 +38,12 @@
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import org.csploit.android.ActionActivity;
 import org.csploit.android.R;
 import org.csploit.android.core.Child;
 import org.csploit.android.core.ChildManager;
 import org.csploit.android.core.System;
 import org.csploit.android.gui.dialogs.ConfirmDialog;
-import org.csploit.android.gui.dialogs.ConfirmDialog.ConfirmDialogListener;
 import org.csploit.android.gui.dialogs.ErrorDialog;
 import org.csploit.android.net.Target;
 import org.csploit.android.plugins.mitm.SpoofSession.OnSessionReadyListener;
@@ -54,7 +54,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class Sniffer extends AppCompatActivity
+public class Sniffer extends AppCompatActivity implements AdapterView.OnItemClickListener
 {
   private static final String[] SORT = {
     "Bandwidth ↓",
@@ -296,18 +296,20 @@ public void onCreate(Bundle savedInstanceState){
     mSpoofSession = new SpoofSession(false, false, null, null);
 
     mSortSpinner.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, SORT));
-    mSortSpinner.setOnItemSelectedListener(new OnItemSelectedListener(){
-      public void onItemSelected(AdapterView<?> adapter, View view, int position, long id){
+    mSortSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+      public void onItemSelected(AdapterView<?> adapter, View view, int position, long id) {
         mSortType = position;
       }
 
-      public void onNothingSelected(AdapterView<?> arg0){
+      public void onNothingSelected(AdapterView<?> arg0) {
       }
     });
 
     mListView.setAdapter(mAdapter);
 
-    mSniffToggleButton.setOnClickListener(new OnClickListener(){
+    mListView.setOnItemClickListener(this);
+
+    mSniffToggleButton.setOnClickListener(new View.OnClickListener(){
       @Override
       public void onClick(View v){
         if(mRunning){
@@ -319,7 +321,7 @@ public void onClick(View v){
     }
     );
 
-    new ConfirmDialog( getString(R.string.file_output), getString(R.string.question_save_to_pcap), this, new ConfirmDialogListener(){
+    new ConfirmDialog( getString(R.string.file_output), getString(R.string.question_save_to_pcap), this, new ConfirmDialog.ConfirmDialogListener(){
       @Override
       public void onConfirm(){
         mDumpToFile = true;
@@ -334,6 +336,40 @@ public void onCancel(){
     }).show();
   }
 
+  @Override
+  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    String address = mAdapter.getByPosition(position).mAddress;
+    final Target t = System.getTargetByAddress(address);
+
+    if (t == null)
+      return;
+
+    new ConfirmDialog(getString(R.string.mitm_ss_select_target_title),
+            String.format(getString(R.string.mitm_ss_select_target_prompt), address),
+            Sniffer.this, new ConfirmDialog.ConfirmDialogListener() {
+      @Override
+      public void onConfirm() {
+        System.setCurrentTarget(t);
+
+        setStoppedState();
+
+        Toast.makeText(Sniffer.this,
+                getString(R.string.selected_) + System.getCurrentTarget(),
+                Toast.LENGTH_SHORT).show();
+
+        startActivity(new Intent(Sniffer.this,
+                ActionActivity.class));
+
+        overridePendingTransition(R.anim.slide_in_left,
+                R.anim.slide_out_left);
+      }
+
+      @Override
+      public void onCancel() {
+      }
+    }).show();
+  }
+
   public synchronized int getSortType(){
     return mSortType;
   }
@@ -357,12 +393,17 @@ private void setStoppedState(){
       mTcpdumpProcess.kill();
       mTcpdumpProcess = null;
     }
-    mSpoofSession.stop();
+    Sniffer.this.runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        mSpoofSession.stop();
 
-    mSniffProgress.setVisibility(View.INVISIBLE);
+        mSniffProgress.setVisibility(View.INVISIBLE);
 
-    mRunning = false;
-    mSniffToggleButton.setChecked(false);
+        mRunning = false;
+        mSniffToggleButton.setChecked(false);
+      }
+    });
   }
 
   private void setSpoofErrorState(final String error){