Merge branch 'develop' into fix/resend-crashes

app/src/main/java/chat/rocket/android/activity/AbstractAuthedActivity.java

@@ -56,13 +56,13 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
         editor.putString(RocketChatCache.KEY_SELECTED_ROOM_ID,
             intent.getStringExtra(PushConstants.ROOM_ID));
       }
-
-      if (intent.hasExtra(PushConstants.NOT_ID)) {
-        PushNotificationHandler
-            .cleanUpNotificationStack(intent.getIntExtra(PushConstants.NOT_ID, 0));
-      }
       editor.apply();
     }
+
+    if (intent.hasExtra(PushConstants.NOT_ID)) {
+      PushNotificationHandler
+          .cleanUpNotificationStack(intent.getIntExtra(PushConstants.NOT_ID, 0));
+    }
   }
 
   private void updateHostnameIfNeeded(SharedPreferences prefs) {

app/src/main/java/chat/rocket/android/push/PushNotificationHandler.java

@@ -102,18 +102,17 @@ public class PushNotificationHandler implements PushConstants {
     String hostname = getHostname(extras);
     String roomId = getRoomId(extras);
 
-    if (hostname == null || roomId == null || !isValidHostname(context, hostname)) {
-      return;
-    }
-
     int notId = parseInt(NOT_ID, extras);
     Intent notificationIntent = new Intent(context, MainActivity.class);
     notificationIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
     notificationIntent.putExtra(PUSH_BUNDLE, extras);
-    notificationIntent.putExtra(HOSTNAME, hostname);
-    notificationIntent.putExtra(ROOM_ID, roomId);
     notificationIntent.putExtra(NOT_ID, notId);
 
+    if (hostname != null && roomId != null && isValidHostname(context, hostname)) {
+      notificationIntent.putExtra(HOSTNAME, hostname);
+      notificationIntent.putExtra(ROOM_ID, roomId);
+    }
+
     int requestCode = random.nextInt();
     PendingIntent contentIntent = PendingIntent
         .getActivity(context, requestCode, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);