fixes #412

Author: tux-mind

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

@@ -122,11 +122,9 @@ private String getRealPath(final String file) {
       updateFuseBinds();
 
     synchronized (mFuseBinds) {
-      if(mFuseBinds.size()>0) {
-        for(FuseBind b : mFuseBinds) {
-          if(file.startsWith(b.mountpoint)) {
-            return b.source + file.substring(b.mountpoint.length());
-          }
+      for(FuseBind b : mFuseBinds) {
+        if(file.startsWith(b.mountpoint)) {
+          return b.source + file.substring(b.mountpoint.length());
         }
       }
       return null;

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

@@ -845,8 +845,10 @@ public static void loadSession(String filename) throws Exception{
   }
 
   public synchronized static ToolBox getTools() {
-    if(mTools == null)
+    if(mTools == null) {
       mTools = new ToolBox();
+      mTools.reload();
+    }
     return mTools;
   }
 

cSploit/src/org/csploit/android/tools/MsfRpcd.java

@@ -22,13 +22,6 @@ public void onEvent(Event e) {
 
   public MsfRpcd() {
     mHandler = "msfrpcd";
-
-    setEnabled();
-
-    if(mEnabled)
-      setupEnvironment();
-
-    registerSettingReceiver();
   }
 
   /**

cSploit/src/org/csploit/android/tools/Ruby.java

@@ -30,10 +30,11 @@ public class Ruby extends Tool {
 
   private final static String rubyLib = "%1$s/site_ruby/1.9.1:%1$s/site_ruby/1.9.1/arm-linux-androideabi:%1$s/site_ruby:%1$s/vendor_ruby/1.9.1:%1$s/vendor_ruby/1.9.1/arm-linux-androideabi:%1$s/vendor_ruby:%1$s/1.9.1:%1$s/1.9.1/arm-linux-androideabi";
 
-
   public Ruby() {
     mHandler = "raw";
+  }
 
+  public void init() {
     setEnabled();
 
     if(mEnabled)

cSploit/src/org/csploit/android/tools/ToolBox.java

@@ -57,26 +57,18 @@ public ToolBox() {
   public void reload() {
     raw.setEnabled();
     shell.setEnabled();
-    ruby.setEnabled();
     nmap.setEnabled();
     hydra.setEnabled();
     arpSpoof.setEnabled();
     ettercap.setEnabled();
     fusemounts.setEnabled();
     ipTables.setEnabled();
     tcpDump.setEnabled();
-    msf.setEnabled();
     networkRadar.setEnabled();
-    msfrpcd.setEnabled();
     logcat.setEnabled();
 
-    if(ruby.isEnabled())
-      ruby.setupEnvironment();
-
-    if(msf.isEnabled())
-      msf.setupEnvironment();
-
-    if(msfrpcd.isEnabled())
-      msfrpcd.setupEnvironment();
+    ruby.init();
+    msf.init();
+    msfrpcd.init();
   }
 }