Clear received push notifications which were already opened

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -5,6 +5,7 @@ import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
+import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
@@ -52,6 +53,7 @@ class MainPresenter @Inject constructor(
     private val getAccountsInteractor: GetAccountsInteractor,
     private val removeAccountInteractor: RemoveAccountInteractor,
     private val factory: RocketChatClientFactory,
+    private val groupedPush: GroupedPush,
     dbManagerFactory: DatabaseManagerFactory,
     getSettingsInteractor: GetSettingsInteractor,
     managerFactory: ConnectionManagerFactory
@@ -232,4 +234,12 @@ class MainPresenter @Inject constructor(
 
     private fun updateMyself(myself: Myself) =
         view.setupUserAccountInfo(navHeaderMapper.mapToUiModel(myself))
-}
\ No newline at end of file
+
+    fun clearNotificationsForChatroom(chatRoomId: String?) {
+        if (chatRoomId == null) return
+
+        groupedPush.hostToPushMessageList[currentServer]?.let { list ->
+            list.removeAll { it.info.roomId == chatRoomId }
+        }
+    }
+}

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -5,13 +5,13 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.app.ProgressDialog
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Gravity
 import android.view.MenuItem
 import androidx.annotation.IdRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.main.adapter.AccountsAdapter
@@ -55,7 +55,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     private var expanded = false
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
     private var chatRoomId: String? = null
-    private var progressDialog : ProgressDialog? = null
+    private var progressDialog: ProgressDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -74,6 +74,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
 
+        println("ChatRoomId: $chatRoomId")
+        presenter.clearNotificationsForChatroom(chatRoomId)
+
         presenter.connect()
         presenter.loadServerAccounts()
         presenter.loadCurrentInfo()
@@ -270,4 +273,4 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         progressDialog?.dismiss()
         progressDialog = null
     }
-}
\ No newline at end of file
+}

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

@@ -12,4 +12,4 @@ class GroupedPush {
 
     // Map a hostname to a list of push messages that pertain to it.
     val hostToPushMessageList = HashMap<String, MutableList<PushMessage>>()
-}
\ No newline at end of file
+}

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

@@ -18,6 +18,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import android.text.Html
 import android.text.Spanned
+import androidx.core.content.ContextCompat
 import chat.rocket.android.R
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.server.domain.GetAccountInteractor
@@ -36,10 +37,6 @@ import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
-/**
- * Refer to: https://github.com/RocketChat/Rocket.Chat.Android/blob/9e846b7fde8fe0c74b9e0117c37ce49293308db5/app/src/main/java/chat/rocket/android/push/PushManager.kt
- * for old source code.
- */
 class PushManager @Inject constructor(
     private val groupedPushes: GroupedPush,
     private val manager: NotificationManager,
@@ -80,7 +77,7 @@ class PushManager @Inject constructor(
 
             showNotification(pushMessage)
         } catch (ex: Exception) {
-            Timber.d(ex, "Error parsing PUSH message: $data")
+            Timber.e(ex, "Error parsing PUSH message: $data")
             ex.printStackTrace()
         }
     }
@@ -101,7 +98,7 @@ class PushManager @Inject constructor(
         val groupTuple = getGroupForHost(host)
 
         groupTuple.second.incrementAndGet()
-        val notIdListForHostname: MutableList<PushMessage>? = groupedPushes.hostToPushMessageList.get(host)
+        val notIdListForHostname: MutableList<PushMessage>? = groupedPushes.hostToPushMessageList[host]
         if (notIdListForHostname == null) {
             groupedPushes.hostToPushMessageList[host] = arrayListOf(pushMessage)
         } else {
@@ -365,14 +362,14 @@ class PushManager @Inject constructor(
         val res = context.resources
         val smallIcon = res.getIdentifier(
             "rocket_chat_notification", "drawable", context.packageName)
-        with(this, {
+        with(this) {
             setAutoCancel(true)
             setShowWhen(true)
-            color = context.resources.getColor(R.color.colorPrimary)
+            color = ContextCompat.getColor(context, R.color.colorPrimary)
             setDefaults(Notification.DEFAULT_ALL)
             setSmallIcon(smallIcon)
             setSound(alarmSound)
-        })
+        }
         return this
     }
 }