Hotfix

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.4.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 

cSploit/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.4.0-beta6'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
@@ -21,10 +21,10 @@ allprojects {
 apply plugin:  'com.android.application'
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.1'
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:design:23.0.1'
-    compile 'com.android.support:preference-v7:23.0.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:preference-v7:23.1.1'
     compile 'org.apache.commons:commons-compress:1.10'
     compile 'commons-net:commons-net:3.3'
     compile 'com.github.zafarkhaja:java-semver:0.9.0'
@@ -37,7 +37,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -52,8 +52,8 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 4
-        versionName "1.6.2"
+        versionCode 6
+        versionName "1.6.6-rc.2"
         if(System.getenv("NIGHTLY_BUILD")) {
             versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
         }

cSploit/res/layout/plugin_inspector.xml

@@ -6,19 +6,6 @@
     android:paddingTop="16sp"
     android:id="@+id/whatever">
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/inspectToggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="20dp"
-        android:src="@drawable/ic_play_arrow_24dp"
-        android:checked="false"
-        android:translationZ="8dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="20dp"
-        android:focusableInTouchMode="true" />
-
     <ProgressBar
         android:id="@+id/inspectActivity"
         android:layout_width="wrap_content"
@@ -156,4 +143,21 @@
         android:gravity="center_vertical"
         />
     </ScrollView>
+
+    <!--
+    Later children in a RelativeLayout tend to float over earlier children in a RelativeLayout.
+    https://www.stackoverflow.com/a/28651543
+    -->
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/inspectToggleButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="20dp"
+        android:src="@drawable/ic_play_arrow_24dp"
+        android:checked="false"
+        android:translationZ="8dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="20dp"
+        android:focusableInTouchMode="true" />
 </RelativeLayout>

cSploit/res/values/strings.xml

@@ -529,4 +529,5 @@
     <string name="mitm_ss_select_target_prompt">Select %s ?</string>
     <string name="github_issues_url" translatable="false">https://github.com/cSploit/android/issues</string>
     <string name="issue_message"><![CDATA[<p>Before opening a new issue, please, take the time to read the already <a href="%1$s">open issues</a>, probably it\' s already open. If it\' s not open we\'ll need as much information as you can get, so please, read <a href="%2$s">this guide</a> in order to know how to report a bug properly.</p>]]></string>
+    <string name="pref_err_empty_or_old">must be empty or an old installation directory.</string>
 </resources>

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

@@ -280,6 +280,8 @@ private void onCoreBeating() {
   }
 
   private void onCoreUpdated() {
+    System.onCoreInstalled();
+
     if (startCore()) {
       onCoreBeating();
     } else if (isRootMissing) {
@@ -612,7 +614,6 @@ public void onInputEntered(String input) {
                         @Override
                         public void run() {
                           System.addOrderedTarget(target);
-                          mTargetAdapter.update(null, null);
                         }
                       });
                     } else
@@ -887,16 +888,20 @@ public View getView(int position, View convertView, ViewGroup parent) {
     }
 
     public void clearSelection() {
-      for (Target t : list)
-        t.setSelected(false);
+      synchronized (this) {
+        for (Target t : list)
+          t.setSelected(false);
+      }
       notifyDataSetChanged();
       if (mActionMode != null)
         mActionMode.finish();
     }
 
     public void toggleSelection(int position) {
-      Target t = list.get(position);
-      t.setSelected(!t.isSelected());
+      synchronized (this) {
+        Target t = list.get(position);
+        t.setSelected(!t.isSelected());
+      }
       notifyDataSetChanged();
       if (mActionMode != null) {
         if (getSelectedCount() > 0)
@@ -908,27 +913,34 @@ public void toggleSelection(int position) {
 
     public int getSelectedCount() {
       int i = 0;
-      for (Target t : list)
-        if (t.isSelected())
-          i++;
+      synchronized (this) {
+        for (Target t : list)
+          if (t.isSelected())
+            i++;
+      }
       return i;
     }
 
     public ArrayList<Target> getSelected() {
       ArrayList<Target> result = new ArrayList<Target>();
-      for (Target t : list)
-        if (t.isSelected())
-          result.add(t);
+      synchronized (this) {
+        for (Target t : list)
+          if (t.isSelected())
+            result.add(t);
+      }
       return result;
     }
 
     public int[] getSelectedPositions() {
-      int[] res = new int[getSelectedCount()];
+      int[] res;
       int j = 0;
 
-      for (int i = 0; i < list.size(); i++)
-        if (list.get(i).isSelected())
-          res[j++] = i;
+      synchronized (this) {
+        res = new int[getSelectedCount()];
+        for (int i = 0; i < list.size(); i++)
+          if (list.get(i).isSelected())
+            res[j++] = i;
+      }
       return res;
     }
 
@@ -948,21 +960,27 @@ public void update(Observable observable, Object data) {
         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;
-            }
+
+          synchronized (this) {
+            int start = lv.getFirstVisiblePosition();
+            int end = Math.min(lv.getLastVisiblePosition(), list.size());
+            for (int i = start; i <= end; i++)
+              if (target == list.get(i)) {
+                View view = lv.getChildAt(i - start);
+                getView(i, view, lv);
+                break;
+              }
+          }
         }
       });
 
     }
 
     @Override
     public void run() {
-      list = System.getTargets();
+      synchronized (this) {
+        list = System.getTargets();
+      }
       notifyDataSetChanged();
     }
 

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

@@ -214,14 +214,84 @@ public void onEnd(int exitCode) {
       }
     }
 
+    private boolean isDirectoryEmptyOrWithVersion(File folder) {
+      String[] files = folder.list();
+
+      if(files.length > 0) {
+        for(String fname : files) {
+          if("VERSION".equals(fname)) {
+            return true;
+          }
+        }
+        return false;
+      }
+
+      return true;
+    }
+
+    private ExecChecker getCheckerForKey(String key) {
+      switch (key) {
+        case "RUBY_DIR":
+          return ExecChecker.ruby();
+        case "MSF_DIR":
+          return ExecChecker.msf();
+      }
+      return null;
+    }
+
+    private String getCurrentPathForKey(String key) {
+      switch (key) {
+        case "RUBY_DIR":
+          return System.getRubyPath();
+        case "MSF_DIR":
+          return System.getMsfPath();
+      }
+      return null;
+    }
+
+    private boolean shallAskForDelete(String key) {
+      return key.equals("RUBY_DIR") || key.equals("MSF_DIR");
+    }
+
+    /**
+     * check if selected directory is valid for the given key.
+     * @param key to be updated
+     * @param path of the chosen directory
+     * @return true if {@code path} is valid, false otherwise
+     */
+    private boolean canChangeDirectoryTo(String key, String path) {
+      File folder = new File(path);
+      ExecChecker checker = getCheckerForKey(key);
+      String oldPath = getCurrentPathForKey(key);
+      String toastMessage = null;
+      boolean valid = false;
+      boolean checkEmptyOrVersion = shallAskForDelete(key);
+
+      if (!folder.exists()) {
+        toastMessage = getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_exists);
+      } else if (!folder.canWrite()) {
+        toastMessage = getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_writable);
+      } else if (checker != null && !checker.canExecuteInDir(path)) {
+        toastMessage = getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_executable);
+      } else if (checkEmptyOrVersion && !isDirectoryEmptyOrWithVersion(folder)) {
+        toastMessage = getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_empty_or_old);
+      } else if (oldPath == null || !oldPath.equals(path)) {
+        valid = true;
+      }
+
+      if(toastMessage != null) {
+        Toast.makeText(getContext(), toastMessage, Toast.LENGTH_LONG).show();
+      }
+
+      return valid;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
       if (requestCode == DirectoryPicker.PICK_DIRECTORY && resultCode != RESULT_CANCELED) {
         Bundle extras = intent.getExtras();
         String path;
         String key;
-        File folder;
-        String oldPath = null;
 
         if (extras == null) {
           Logger.debug("null extra: " + intent);
@@ -236,35 +306,18 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
           return;
         }
 
-        folder = new File(path);
-        ExecChecker checker = null;
-
-
-        if (key.equals("RUBY_DIR")) {
-          oldPath = System.getRubyPath();
-          checker = ExecChecker.ruby();
-        } else if (key.equals("MSF_DIR")) {
-          oldPath = System.getMsfPath();
-          checker = ExecChecker.msf();
-        }
-
-        if (!folder.exists())
-          Toast.makeText(getActivity(), getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_exists), Toast.LENGTH_SHORT).show();
-
-        else if (!folder.canWrite())
-          Toast.makeText(getActivity(), getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_writable), Toast.LENGTH_SHORT).show();
+        if(canChangeDirectoryTo(key, path)) {
 
-        else if (checker != null && !checker.canExecuteInDir(path))
-          Toast.makeText(getActivity(), getString(R.string.pref_folder) + " " + path + " " + getString(R.string.pref_err_executable), Toast.LENGTH_LONG).show();
 
-        else {
-          //noinspection ConstantConditions
           getPreferenceManager().getSharedPreferences().edit().putString(key, path).commit();
-          if (oldPath != null && !oldPath.equals(path)) {
-            File current = new File(oldPath);
 
-            if (current.exists() && current.isDirectory() && current.listFiles().length > 2) {
-              wipe_prompt_older(current);
+          if(shallAskForDelete(key)) {
+            String oldPath = getCurrentPathForKey(key);
+            if(oldPath != null) {
+              File current = new File(oldPath);
+              if(current.exists() && current.isDirectory() && current.list().length > 0) {
+                wipe_prompt_older(current);
+              }
             }
           }
         }