Add support to push messages not containing a an ejson field and thus having...

Add support to push messages not containing a an ejson field and thus having no more than a message an a title. This way, a simple notification should be shown and not attached to any real channel list of messages

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -26,6 +26,7 @@ import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
 import com.squareup.moshi.Json
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.experimental.runBlocking
@@ -41,14 +42,15 @@ import javax.inject.Inject
  * for old source code.
  */
 class PushManager @Inject constructor(
-        private val groupedPushes: GroupedPush,
-        private val manager: NotificationManager,
-        private val moshi: Moshi,
-        private val getAccountInteractor: GetAccountInteractor,
-        private val getSettingsInteractor: GetSettingsInteractor,
-        private val context: Context
+    private val groupedPushes: GroupedPush,
+    private val manager: NotificationManager,
+    private val moshi: Moshi,
+    private val getAccountInteractor: GetAccountInteractor,
+    private val getSettingsInteractor: GetSettingsInteractor,
+    private val context: Context
 ) {
-    private val randomizer = Random()
+
+    private val random = Random()
 
     /**
      * Handles a receiving push by creating and displaying an appropriate notification based
@@ -59,7 +61,7 @@ class PushManager @Inject constructor(
         val message = data["message"] as String?
         val ejson = data["ejson"] as String?
         val title = data["title"] as String?
-        val notId = data["notId"] as String? ?: randomizer.nextInt().toString()
+        val notId = data["notId"] as String? ?: random.nextInt().toString()
         val image = data["image"] as String?
         val style = data["style"] as String?
         val summaryText = data["summaryText"] as String?
@@ -67,9 +69,13 @@ class PushManager @Inject constructor(
 
         try {
             val adapter = moshi.adapter<PushInfo>(PushInfo::class.java)
-            val info = adapter.fromJson(ejson)
 
-            val pushMessage = PushMessage(title!!, message!!, info!!, image, count, notId, summaryText, style)
+            val pushMessage = if (ejson != null) {
+                val info = adapter.fromJson(ejson)
+                PushMessage(title!!, message!!, info!!, image, count, notId, summaryText, style)
+            } else {
+                PushMessage(title!!, message!!, PushInfo.EMPTY, image, count, notId, summaryText, style)
+            }
 
             Timber.d("Received push message: $pushMessage")
 
@@ -82,13 +88,17 @@ class PushManager @Inject constructor(
 
     @SuppressLint("NewApi")
     suspend fun showNotification(pushMessage: PushMessage) {
-        if (!hasAccount(pushMessage.info.host)) {
-            Timber.d("ignoring push message: $pushMessage")
+        val notId = pushMessage.notificationId.toInt()
+        val host = pushMessage.info.host
+
+        if (!hasAccount(host)) {
+            createSingleNotification(pushMessage)?.let {
+                NotificationManagerCompat.from(context).notify(notId, it)
+            }
+            Timber.d("ignoring push message: $pushMessage (maybe a test notification?)")
             return
         }
 
-        val notId = pushMessage.notificationId.toInt()
-        val host = pushMessage.info.host
         val groupTuple = getGroupForHost(host)
 
         groupTuple.second.incrementAndGet()
@@ -103,7 +113,7 @@ class PushManager @Inject constructor(
         val pushMessageList = groupedPushes.hostToPushMessageList[host]
 
         notification?.let {
-            manager.notify(notId, notification)
+            manager.notify(notId, it)
         }
 
         pushMessageList?.let {
@@ -137,7 +147,7 @@ class PushManager @Inject constructor(
             val host = info.host
 
             val builder = createBaseNotificationBuilder(pushMessage, grouped = true)
-                    .setGroupSummary(true)
+                .setGroupSummary(true)
 
             if (style == null || style == "inbox") {
                 val pushMessageList = groupedPushes.hostToPushMessageList[host]
@@ -150,7 +160,7 @@ class PushManager @Inject constructor(
                     builder.setContentTitle(getTitle(count, title))
 
                     val inbox = NotificationCompat.InboxStyle()
-                            .setBigContentTitle(getTitle(count, title))
+                        .setBigContentTitle(getTitle(count, title))
 
                     for (push in pushMessageList) {
                         inbox.addLine(push.message)
@@ -160,8 +170,8 @@ class PushManager @Inject constructor(
                 }
             } else {
                 val bigText = NotificationCompat.BigTextStyle()
-                        .bigText(message.fromHtml())
-                        .setBigContentTitle(title.fromHtml())
+                    .bigText(message.fromHtml())
+                    .setBigContentTitle(title.fromHtml())
 
                 builder.setStyle(bigText)
             }
@@ -177,12 +187,12 @@ class PushManager @Inject constructor(
             val host = info.host
 
             val builder = createBaseNotificationBuilder(pushMessage)
-                    .setGroupSummary(false)
+                .setGroupSummary(false)
 
             if (style == null || "inbox" == style) {
                 val pushMessageList = groupedPushes.hostToPushMessageList.get(host)
 
-                pushMessageList?.let {
+                if (pushMessageList != null) {
                     val userMessages = pushMessageList.filter {
                         it.notificationId == pushMessage.notificationId
                     }
@@ -203,18 +213,23 @@ class PushManager @Inject constructor(
                         builder.setStyle(inbox)
                     } else {
                         val bigTextStyle = NotificationCompat.BigTextStyle()
-                                .bigText(message.fromHtml())
+                            .bigText(message.fromHtml())
                         builder.setStyle(bigTextStyle)
                     }
+                } else {
+                    // We don't know which kind of push is this - maybe a test push, so just show it
+                    val bigTextStyle = NotificationCompat.BigTextStyle()
+                        .bigText(message.fromHtml())
+                    builder.setStyle(bigTextStyle)
+                    return builder.build()
                 }
             } else {
                 val bigTextStyle = NotificationCompat.BigTextStyle()
-                        .bigText(message.fromHtml())
+                    .bigText(message.fromHtml())
                 builder.setStyle(bigTextStyle)
             }
 
-            return builder.addReplyAction(pushMessage)
-                    .build()
+            return builder.addReplyAction(pushMessage).build()
         }
     }
 
@@ -227,21 +242,32 @@ class PushManager @Inject constructor(
             val deleteIntent = getDismissIntent(context, pushMessage)
 
             val builder = NotificationCompat.Builder(context, host)
-                    .setWhen(info.createdAt)
-                    .setContentTitle(title.fromHtml())
-                    .setContentText(message.fromHtml())
-                    .setGroup(host)
-                    .setDeleteIntent(deleteIntent)
-                    .setContentIntent(contentIntent)
-                    .setMessageNotification()
+                .setWhen(info.createdAt)
+                .setContentTitle(title.fromHtml())
+                .setContentText(message.fromHtml())
+                .setGroup(host)
+                .setDeleteIntent(deleteIntent)
+                .setContentIntent(contentIntent)
+                .setMessageNotification()
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                val channel = NotificationChannel(host, host, NotificationManager.IMPORTANCE_HIGH)
+                val channelId: String
+                val channelName: String
+                if (host.isEmpty()) {
+                    builder.setContentIntent(deleteIntent)
+                    channelName = "Test Notification"
+                    channelId = "test-channel"
+                } else {
+                    channelName = host
+                    channelId = host
+                }
+                val channel = NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH)
                 channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
                 channel.enableLights(false)
                 channel.enableVibration(true)
                 channel.setShowBadge(true)
                 manager.createNotificationChannel(channel)
+                builder.setChannelId(channelId)
             }
 
             //TODO: Get Site_Name PublicSetting from cache
@@ -265,8 +291,8 @@ class PushManager @Inject constructor(
 
     private fun getDismissIntent(context: Context, pushMessage: PushMessage): PendingIntent {
         val deleteIntent = Intent(context, DeleteReceiver::class.java)
-                .putExtra(EXTRA_NOT_ID, pushMessage.notificationId.toInt())
-                .putExtra(EXTRA_HOSTNAME, pushMessage.info.host)
+            .putExtra(EXTRA_NOT_ID, pushMessage.notificationId.toInt())
+            .putExtra(EXTRA_HOSTNAME, pushMessage.info.host)
         return PendingIntent.getBroadcast(context, pushMessage.notificationId.toInt(), deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 
@@ -276,7 +302,7 @@ class PushManager @Inject constructor(
         /*if (!grouped) {
             notificationIntent.putExtra(EXTRA_ROOM_ID, pushMessage.info.roomId)
         }*/
-        return PendingIntent.getActivity(context, randomizer.nextInt(), notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+        return PendingIntent.getActivity(context, random.nextInt(), notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 
     // CharSequence extensions
@@ -288,13 +314,13 @@ class PushManager @Inject constructor(
     private fun NotificationCompat.Builder.addReplyAction(pushMessage: PushMessage): NotificationCompat.Builder {
         val replyTextHint = context.getText(R.string.notif_action_reply_hint)
         val replyRemoteInput = RemoteInput.Builder(REMOTE_INPUT_REPLY)
-                .setLabel(replyTextHint)
-                .build()
+            .setLabel(replyTextHint)
+            .build()
         val pendingIntent = getReplyPendingIntent(pushMessage)
         val replyAction = NotificationCompat.Action.Builder(R.drawable.ic_action_message_reply_24dp, replyTextHint, pendingIntent)
-                .addRemoteInput(replyRemoteInput)
-                .setAllowGeneratedReplies(true)
-                .build()
+            .addRemoteInput(replyRemoteInput)
+            .setAllowGeneratedReplies(true)
+            .build()
 
         this.addAction(replyAction)
         return this
@@ -317,17 +343,17 @@ class PushManager @Inject constructor(
         val replyIntent = getReplyIntent(pushMessage)
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             PendingIntent.getBroadcast(
-                    context,
-                    randomizer.nextInt(),
-                    replyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                context,
+                random.nextInt(),
+                replyIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT
             )
         } else {
             PendingIntent.getActivity(
-                    context,
-                    randomizer.nextInt(),
-                    replyIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT
+                context,
+                random.nextInt(),
+                replyIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT
             )
         }
     }
@@ -336,7 +362,7 @@ class PushManager @Inject constructor(
         val alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         val res = context.resources
         val smallIcon = res.getIdentifier(
-                "rocket_chat_notification", "drawable", context.packageName)
+            "rocket_chat_notification", "drawable", context.packageName)
         with(this, {
             setAutoCancel(true)
             setShowWhen(true)
@@ -350,24 +376,25 @@ class PushManager @Inject constructor(
 }
 
 data class PushMessage(
-        val title: String,
-        val message: String,
-        val info: PushInfo,
-        val image: String? = null,
-        val count: String? = null,
-        val notificationId: String,
-        val summaryText: String? = null,
-        val style: String? = null
+    val title: String,
+    val message: String,
+    val info: PushInfo,
+    val image: String? = null,
+    val count: String? = null,
+    val notificationId: String,
+    val summaryText: String? = null,
+    val style: String? = null
 ) : Parcelable {
+
     constructor(parcel: Parcel) : this(
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readParcelable(PushMessage::class.java.classLoader),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString())
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readParcelable(PushMessage::class.java.classLoader),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString())
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(title)
@@ -397,11 +424,11 @@ data class PushMessage(
 
 @JsonSerializable
 data class PushInfo @KotshiConstructor constructor(
-        @Json(name = "host") val hostname: String,
-        @Json(name = "rid") val roomId: String,
-        val type: RoomType,
-        val name: String?,
-        val sender: PushSender?
+    @Json(name = "host") val hostname: String,
+    @Json(name = "rid") val roomId: String,
+    val type: RoomType,
+    val name: String?,
+    val sender: PushSender?
 ) : Parcelable {
     val createdAt: Long
         get() = System.currentTimeMillis()
@@ -410,11 +437,11 @@ data class PushInfo @KotshiConstructor constructor(
     }
 
     constructor(parcel: Parcel) : this(
-            parcel.readString(),
-            parcel.readString(),
-            roomTypeOf(parcel.readString()),
-            parcel.readString(),
-            parcel.readParcelable(PushInfo::class.java.classLoader))
+        parcel.readString(),
+        parcel.readString(),
+        roomTypeOf(parcel.readString()),
+        parcel.readString(),
+        parcel.readParcelable(PushInfo::class.java.classLoader))
 
     private fun sanitizeUrl(baseUrl: String): String {
         var url = baseUrl.trim()
@@ -438,6 +465,9 @@ data class PushInfo @KotshiConstructor constructor(
     }
 
     companion object CREATOR : Parcelable.Creator<PushInfo> {
+        val EMPTY = PushInfo(hostname = "", roomId = "", type = RoomType.CHANNEL, name = "",
+            sender = null)
+
         override fun createFromParcel(parcel: Parcel): PushInfo {
             return PushInfo(parcel)
         }
@@ -450,14 +480,14 @@ data class PushInfo @KotshiConstructor constructor(
 
 @JsonSerializable
 data class PushSender @KotshiConstructor constructor(
-        @Json(name = "_id") val id: String,
-        val username: String?,
-        val name: String?
+    @Json(name = "_id") val id: String,
+    val username: String?,
+    val name: String?
 ) : Parcelable {
     constructor(parcel: Parcel) : this(
-            parcel.readString(),
-            parcel.readString(),
-            parcel.readString())
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString())
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(id)