Merge branch 'issue-332' into release

Author: tux-mind

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

@@ -38,6 +38,7 @@
 
 import org.acra.ACRA;
 import org.acra.ACRAConfiguration;
+import org.apache.commons.compress.utils.IOUtils;
 import org.csploit.android.R;
 import org.csploit.android.WifiScannerActivity;
 import org.csploit.android.gui.dialogs.FatalDialog;
@@ -149,8 +150,10 @@ public static void init(Context context) throws Exception{
       mStoragePath = getSettings().getString("PREF_SAVE_PATH", Environment.getExternalStorageDirectory().toString());
       mSessionName = "csploit-session-" + java.lang.System.currentTimeMillis();
       mKnownIssues = new KnownIssues();
-      mPlugins = new ArrayList<Plugin>();
+      mPlugins = new ArrayList<>();
       mOpenPorts = new SparseIntArray(3);
+      mServices = new HashMap<>();
+      mPorts = new HashMap<>();
 
       // if we are here, network initialization didn't throw any error, lock wifi
       WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -515,38 +518,39 @@ public static void unregisterSettingListener(SettingReceiver receiver) {
     }
   }
 
-  private static void preloadServices(){
-    if(mServices == null || mPorts == null){
-      try{
-        // preload network service map and mac vendors
-        mServices = new HashMap<String, String>();
-        mPorts = new HashMap<String, String>();
-
-        @SuppressWarnings("ConstantConditions")
-        FileInputStream fstream = new FileInputStream(mContext.getFilesDir().getAbsolutePath() + "/tools/nmap/nmap-services");
+  public static void preloadServices(){
+    if (!mServices.isEmpty())
+      return;
 
-        DataInputStream in = new DataInputStream(fstream);
-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-        String line;
-        Matcher matcher;
+    FileReader fr = null;
+    BufferedReader reader = null;
+    try{
+      // preload network service and ports map
 
-        while((line = reader.readLine()) != null){
-          line = line.trim();
+      fr = new FileReader(mContext.getFilesDir().getAbsolutePath() + "/tools/nmap/nmap-services");
+      reader = new BufferedReader(fr);
+      String line;
+      Matcher matcher;
+      String port, proto;
 
-          if((matcher = SERVICE_PARSER.matcher(line)) != null && matcher.find()){
-            String proto = matcher.group(1),
-              port = matcher.group(2);
+      while ((line = reader.readLine()) != null) {
+        if ((matcher = SERVICE_PARSER.matcher(line)) != null && matcher.find()) {
+          proto = matcher.group(1);
+          port = matcher.group(2);
 
-            mServices.put(proto, port);
-            mPorts.put(port, proto);
-          }
+          mServices.put(proto, port);
+          mPorts.put(port, proto);
         }
-
-        in.close();
-      }
-      catch(Exception e){
-        errorLogging(e);
       }
+
+    } catch (Exception e) {
+      mServices.clear();
+      mPorts.clear();
+
+      errorLogging(e);
+    } finally {
+      IOUtils.closeQuietly(reader);
+      IOUtils.closeQuietly(fr);
     }
   }
 
@@ -941,7 +945,6 @@ public static String getMacVendor(byte[] mac){
   }
 
   public static String getProtocolByPort(String port){
-    preloadServices();
 
     return mPorts.containsKey(port) ? mPorts.get(port) : null;
   }
@@ -951,7 +954,6 @@ public static String getProtocolByPort(int port) {
   }
 
   public static int getPortByProtocol(String protocol){
-    preloadServices();
 
     return mServices.containsKey(protocol) ? Integer.parseInt(mServices.get(protocol)) : 0;
   }

cSploit/src/org/csploit/android/plugins/PortScanner.java

@@ -23,7 +23,6 @@
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -111,7 +110,7 @@ private void saveCustomParameters (boolean displayed){
 		SharedPreferences.Editor edit = mPreferences.edit();
 		edit.putBoolean(CUSTOM_PARAMETERS, displayed);
 		edit.putString(CUSTOM_PARAMETERS_TEXT, mTextParameters.getText().toString());
-		edit.commit();
+		edit.apply();
 	}
 
 	private void setStoppedState() {
@@ -187,6 +186,13 @@ public void onCreate(Bundle savedInstanceState) {
 		mScanToggleButton = (ToggleButton) findViewById(R.id.scanToggleButton);
 		mScanProgress = (ProgressBar) findViewById(R.id.scanActivity);
 
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				System.preloadServices();
+			}
+		}).start();
+
 		if (mPreferences.getBoolean(CUSTOM_PARAMETERS, false))
 			displayParametersField();
 
@@ -403,11 +409,11 @@ public void onPortFound(final int port, String protocol) {
 				public void run() {
           String entry;
 
-					if (resolvedProtocol != null)
+					if (resolvedProtocol != null) {
 						entry = port + " ( " + resolvedProtocol + " )";
-
-					else
+					} else {
 						entry = portProtocol + " : " + port;
+					}
 
 					// add open port to the listview and notify the environment
 					// about the event