Merge pull #290 into develop

Author: tux-mind

cSploit/res/values/colors.xml

@@ -10,4 +10,9 @@
     <color name="holo_blue_dark">#ff0d222f</color>
     <color name="selectable_blue">#ff36ccff</color>
     <color name="selectable_blue_dark">#ff144d5d</color>
+    <color name="pink">#E91E63</color>
+    <color name="red">#F44336</color>
+    <color name="green">#4CAF50</color>
+    <color name="purple">#3F51B5</color>
+    <color name="orange">#FFC107</color>
 </resources>

cSploit/res/values/strings.xml

@@ -237,15 +237,11 @@
     <string name="error_rpc">RPC error</string>
     <string name="error_rpcd_inval">bad settings</string>
     <string name="error_rpcd_shell">cannot execute shell</string>
-    <string name="rpcd_starting">Starting MetaSploit RPCD&#8230;</string>
+    <string name="rpcd_starting">Starting MetaSploit RPCD.  Standby&#8230;</string>
     <string name="rpcd_started">MetaSploit RPCD started</string>
     <string name="rpcd_stopped">MetaSploit RPCD stopped</string>
     <string name="rpcd_running">MetaSploit RPCD is already running</string>
     <string name="rpcd_timedout">MetaSploit RPCD does not respond</string>
-    <string name="error_rcpd_fatal">fatal error occurred, i\'m searching that bug for send it to my developers.
-        if i won\'t exit please close me from preferences->applications,
-        and ALERT MY DEVELOPERS.
-    </string>
 
     <!-- mitm modules -->
     <string name="mitm_simple_sniff">Simple Sniff</string>
@@ -400,6 +396,8 @@
     <string name="pref_folder">Folder</string>
     <string name="pref_msf_enable">Enable MSF</string>
     <string name="pref_msf_enable_desc">Enable the MetaSploit Framework</string>
+    <string name="pref_msf_notifications">MSF status notifications</string>
+    <string name="pref_msf_notifications_desc">View MSF RPC connection status</string>
     <string name="pref_msf_delete">Delete MSF</string>
     <string name="pref_msf_delete_desc">Delete the MetaSploit Framework from your device</string>
     <string name="pref_msfwipe_message">Do you really want to delete the MetaSploit Framework?</string>
@@ -513,4 +511,5 @@
     <string name="new_apk_found">App verision %s is available, do you want to upgrade ?</string>
     <string name="new_ruby_found">A new version for ruby is available, do you want to upgrade ?</string>
     <string name="new_msf_found">A new msf version is available, do you want to upgrade ?</string>
+    <string name="msf_status">MetaSploit Status</string>
 </resources>

cSploit/res/xml-v14/preferences.xml

@@ -163,6 +163,12 @@
             android:title="@string/pref_msf_enable"
             android:summary="@string/pref_msf_enable_desc" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="MSF_NOTIFICATIONS"
+            android:title="@string/pref_msf_notifications"
+            android:summary="@string/pref_msf_notifications_desc" />
+
         <ListPreference
             android:key="MSF_BRANCH"
             android:summary="@string/pref_msf_branch_desc"

cSploit/res/xml/preferences.xml

@@ -163,6 +163,12 @@
             android:title="@string/pref_msf_enable"
             android:summary="@string/pref_msf_enable_desc" />
 
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="MSF_NOTIFICATIONS"
+            android:title="@string/pref_msf_notifications"
+            android:summary="@string/pref_msf_notifications_desc" />
+
         <ListPreference
             android:key="MSF_BRANCH"
             android:summary="@string/pref_msf_branch_desc"

cSploit/src/org/csploit/android/services/MsfRpcdService.java

@@ -58,13 +58,37 @@ public void buildMenuItem(MenuItem item) {
   }
 
   public enum Status {
-    STARTING,
-    CONNECTED,
-    DISCONNECTED,
-    STOPPED,
-    KILLED,
-    START_FAILED,
-    CONNECTION_FAILED,
+    STARTING(R.string.rpcd_starting, R.color.selectable_blue),
+    CONNECTED(R.string.connected_msf, R.color.green),
+    DISCONNECTED(R.string.msfrpc_disconnected, R.color.purple),
+    STOPPED(R.string.rpcd_stopped, R.color.purple),
+    KILLED(R.string.msfrpcd_killed, R.color.purple),
+    START_FAILED(R.string.msfrcd_start_failed, R.color.red),
+    CONNECTION_FAILED(R.string.msf_connection_failed, R.color.red);
+
+    private final int text;
+    private final int color;
+
+    Status(int text, int color) {
+      this.text = text;
+      this.color = color;
+    }
+
+    public boolean inProgress() {
+      return text == R.string.rpcd_starting;
+    }
+
+    public boolean isError() {
+      return color == R.color.red;
+    }
+
+    public int getText() {
+      return text;
+    }
+
+    public int getColor() {
+      return color;
+    }
   }
 
   public MsfRpcdService(Context context) {

cSploit/src/org/csploit/android/services/receivers/MsfRpcdServiceReceiver.java

@@ -1,20 +1,26 @@
 package org.csploit.android.services.receivers;
 
 import android.app.Activity;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
 import org.csploit.android.R;
 import org.csploit.android.core.ManagedReceiver;
+import org.csploit.android.core.System;
 import org.csploit.android.services.MsfRpcdService;
 
 /**
  * Receive and manage intents from the MsfRpcd service
  */
 public class MsfRpcdServiceReceiver extends ManagedReceiver {
 
+  final int MSF_NOTIFICATION = 1337;
   private final IntentFilter filter;
 
   public MsfRpcdServiceReceiver() {
@@ -47,31 +53,29 @@ public void run() {
     } else {
       showToastForStatus(context, status);
     }
+
+    SharedPreferences myPrefs = System.getSettings();
+    if (myPrefs.getBoolean("MSF_NOTIFICATIONS", true)) {
+      updateNotificationForStatus(context, status);
+    }
+
   }
 
   private void showToastForStatus(Context context, MsfRpcdService.Status status) {
-    switch (status) {
-      case STARTING:
-        Toast.makeText(context, R.string.rpcd_starting, Toast.LENGTH_SHORT).show();
-        break;
-      case CONNECTED:
-        Toast.makeText(context, R.string.connected_msf, Toast.LENGTH_SHORT).show();
-        break;
-      case DISCONNECTED:
-        Toast.makeText(context, R.string.msfrpc_disconnected, Toast.LENGTH_SHORT).show();
-        break;
-      case STOPPED:
-        Toast.makeText(context, R.string.rpcd_stopped, Toast.LENGTH_SHORT).show();
-        break;
-      case KILLED:
-        Toast.makeText(context, R.string.msfrpcd_killed, Toast.LENGTH_SHORT).show();
-        break;
-      case START_FAILED:
-        Toast.makeText(context, R.string.msfrcd_start_failed, Toast.LENGTH_LONG).show();
-        break;
-      case CONNECTION_FAILED:
-        Toast.makeText(context, R.string.msf_connection_failed, Toast.LENGTH_LONG).show();
-        break;
-    }
+    Toast.makeText(context, status.getText(), (status.isError() ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT)).show();
+  }
+
+  private void updateNotificationForStatus(Context context, MsfRpcdService.Status status) {
+    NotificationCompat.Builder mBuilder =
+            new NotificationCompat.Builder(context)
+            .setSmallIcon(R.drawable.exploit_msf)
+            .setContentTitle(context.getString(R.string.msf_status))
+            .setProgress(0, 0, status.inProgress())
+            .setContentText(context.getString(status.getText()))
+            .setColor(ContextCompat.getColor(context, status.getColor()));
+
+    NotificationManager mNotificationManager =
+            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+    mNotificationManager.notify(MSF_NOTIFICATION, mBuilder.build());
   }
 }