cleaner way to excange notification texts and colors

Author: tux-mind

cSploit/res/values/strings.xml

@@ -511,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/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

@@ -62,68 +62,17 @@ public void run() {
   }
 
   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("MetaSploit RPCD Status");
-    mBuilder.setProgress(0, 0, false);
-    switch (status) {
-      case STARTING:
-        mBuilder.setContentText(context.getResources().getText(R.string.rpcd_starting));
-        mBuilder.setProgress(0, 0, true);
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.selectable_blue));
-        break;
-      case CONNECTED:
-        mBuilder.setContentText(context.getResources().getText(R.string.connected_msf));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.green));
-        break;
-      case DISCONNECTED:
-        mBuilder.setContentText(context.getResources().getText(R.string.msfrpc_disconnected));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.purple));
-        break;
-      case STOPPED:
-        mBuilder.setContentText(context.getResources().getText(R.string.rpcd_stopped));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.purple));
-        break;
-      case KILLED:
-        mBuilder.setContentText(context.getResources().getText(R.string.msfrpcd_killed));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.purple));
-        break;
-      case START_FAILED:
-        mBuilder.setContentText(context.getResources().getText(R.string.msfrcd_start_failed));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.red));
-        break;
-      case CONNECTION_FAILED:
-        mBuilder.setContentText(context.getResources().getText(R.string.msf_connection_failed));
-        mBuilder.setColor(ContextCompat.getColor(context, R.color.red));
-        break;
-    }
+            .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);