changed the way we install the MSF

Author: tux-mind

cSploit/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.csploit.android"
     android:versionCode="1"
-    android:versionName="1.4.9" >
+    android:versionName="1.5.0" >
 
     <uses-sdk
         android:minSdkVersion="9"

cSploit/build.gradle

@@ -4,12 +4,13 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.android.support:support-v4:19.0.+'
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile group: 'org.apache.commons', name: 'commons-compress', version: '1.6'
+    compile 'org.apache.commons:commons-compress:1.6'
     compile 'org.apache.commons:commons-compress:1.6:sources'
     compile 'commons-net:commons-net:3.3'
     compile 'junit:junit:3.8.1'
     compile 'joda-time:joda-time:1.6.2'
     compile 'com.github.zafarkhaja:java-semver:0.8.0'
+    compile 'com.sksamuel.diff:diff:1.1.11'
 }
 
 android {

cSploit/res/layout/preferences.xml

@@ -210,6 +210,12 @@
             android:summary="@string/pref_rpc_port_desc"
             android:title="@string/pref_rpc_port" />
 
+        <EditTextPreference
+            android:defaultValue="NONE"
+            android:key="MSF_MANIFEST_URL"
+            android:summary="@string/pref_msf_manifest_desc"
+            android:title="@string/pref_msf_manifest" />
+
         <Preference
             android:key="PREF_MSF_WIPE"
             android:title="@string/pref_msf_delete"

cSploit/res/values-it/strings.xml

@@ -430,4 +430,6 @@
     <string name="pref_updates_msf_desc">cerca aggiornamenti per il MetaSploit Framework</string>
     <string name="pref_updates_gems">RubyGems</string>
     <string name="pref_updates_gems_desc">cerca aggiornamenti per le Gemme di Ruby</string>
+    <string name="pref_msf_manifest">Manifest personale</string>
+    <string name="pref_msf_manifest_desc">URL di un manifest personalizzato</string>
 </resources>

cSploit/res/values/strings.xml

@@ -488,4 +488,6 @@
     <string name="pref_updates_msf_desc">check for MSF updates</string>
     <string name="pref_updates_gems">RubyGems</string>
     <string name="pref_updates_gems_desc">check for RubyGems updates</string>
+    <string name="pref_msf_manifest">Custom manifest</string>
+    <string name="pref_msf_manifest_desc">custom MSF manifest URL</string>
 </resources>

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

@@ -3,6 +3,10 @@
 import android.content.Intent;
 
 import com.github.zafarkhaja.semver.Version;
+import com.sksamuel.diffpatch.DiffMatchPatch;
+
+import java.util.HashMap;
+import java.util.LinkedList;
 
 /**
  * just a simple struct to handle archives metadata
@@ -15,7 +19,6 @@ public class ArchiveMetadata {
           versionString,
           outputDir,
           executableOutputDir,
-          dirToExtract,
           md5,
           sha1;
   public Version
@@ -27,8 +30,11 @@ public class ArchiveMetadata {
   public Intent
           contentIntent;
   public boolean
+          skipRoot,
           fixShebang,
           errorOccurred;
+  public HashMap<String, LinkedList<DiffMatchPatch.Patch>>
+          patches;
 
   public ArchiveMetadata() {
     reset();
@@ -37,12 +43,13 @@ public ArchiveMetadata() {
   public void reset() {
     synchronized (this) {
       url = name = md5 = sha1 = versionString = path =
-              outputDir = dirToExtract = executableOutputDir = null;
+              outputDir = executableOutputDir = null;
       version = null;
       compression = null;
       archiver = null;
       contentIntent = null;
-      fixShebang = errorOccurred = false;
+      fixShebang = errorOccurred = skipRoot = false;
+      patches = null;
     }
   }