Merge branch 'msf_repo' into develop

Conflicts:
	cSploit/src/org/csploit/android/core/UpdateService.java

Author: tux-mind

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

@@ -1254,7 +1254,6 @@ private void onUpdateDone(UpdateService.action target) {
             switch (target) {
                 case ruby_update:
                 case msf_update:
-                case gems_update:
                     StartRPCServer();
                     break;
                 case core_update:
@@ -1321,12 +1320,6 @@ public void onReceive(Context context, Intent intent) {
                         getString(R.string.new_update_desc2);
 
                 onUpdateAvailable(description, UpdateService.action.msf_update);
-            } else if (intent.getAction().equals(GEMS_AVAILABLE)) {
-
-                final String description = getString(R.string.new_gems_update_desc) + " " +
-                        getString(R.string.new_update_desc2);
-
-                onUpdateAvailable(description, UpdateService.action.gems_update);
             } else if (intent.getAction().equals(UPDATE_AVAILABLE)) {
                 final String remoteVersion = (String) intent.getExtras().get(
                         AVAILABLE_VERSION);

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

@@ -33,8 +33,6 @@ public class ArchiveMetadata {
           skipRoot,
           fixShebang,
           errorOccurred;
-  public HashMap<String, LinkedList<DiffMatchPatch.Patch>>
-          patches;
 
   public ArchiveMetadata() {
     reset();
@@ -49,7 +47,6 @@ public void reset() {
       archiver = null;
       contentIntent = null;
       fixShebang = errorOccurred = skipRoot = false;
-      patches = null;
     }
   }
 

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

@@ -70,9 +70,6 @@ public void run(){
 
     boolean checkRuby = canCheckMsf && prefs.getBoolean("PREF_UPDATES_RUBY", true);
 
-    boolean checkGems = canCheckMsf && prefs.getBoolean("PREF_UPDATES_GEMS", true) &&
-            System.getLocalRubyVersion() != null;
-
     boolean checkMsf = canCheckMsf && prefs.getBoolean("PREF_UPDATES_MSF", true) &&
             System.getLocalRubyVersion() != null;
 
@@ -84,8 +81,6 @@ else if(checkRuby && UpdateService.isRubyUpdateAvailable())
       send(RUBY_AVAILABLE);
     else if(checkMsf && UpdateService.isMsfUpdateAvailable()) {
       send(MSF_AVAILABLE);
-    } else if(checkGems && UpdateService.isGemUpdateAvailable()){
-      send(GEMS_AVAILABLE);
     } else
       send(UPDATE_NOT_AVAILABLE);