Merge remote-tracking branch 'origin/hotfix'

cSploit · Jan 16, 2016 · 6d5126b · 6d5126b
2 parents 8a29337 + 5a120d7
commit 6d5126b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/cSploit/build.gradle b/cSploit/build.gradle
@@ -53,7 +53,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 22
         versionCode 5
-        versionName "1.6.3"
+        versionName "1.6.4"
         if(System.getenv("NIGHTLY_BUILD")) {
             versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
         }

diff --git a/cSploit/src/org/csploit/android/services/receivers/MsfRpcdServiceReceiver.java b/cSploit/src/org/csploit/android/services/receivers/MsfRpcdServiceReceiver.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -68,16 +69,21 @@ private void showToastForStatus(Context context, MsfRpcdService.Status status) {
   }
 
   private void updateNotificationForStatus(Context context, MsfRpcdService.Status status) {
-    NotificationCompat.Builder mBuilder =
+    NotificationCompat.Builder builder =
             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()));
 
+    PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
+            new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
+
+    builder.setContentIntent(pendingIntent);
+
     NotificationManager mNotificationManager =
             (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-    mNotificationManager.notify(MSF_NOTIFICATION, mBuilder.build());
+    mNotificationManager.notify(MSF_NOTIFICATION, builder.build());
   }
 }