فهرست منبع

Merge pull request #2100 from nextcloud/bugfix/2078/RuntimeException-for-cancelExistingNotificationsForRoom

Catch RuntimeException thrown by NotificationManager
Andy Scherzinger 3 سال پیش
والد
کامیت
10753d039e
1فایلهای تغییر یافته به همراه10 افزوده شده و 5 حذف شده
  1. 10 5
      app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

+ 10 - 5
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -1709,14 +1709,19 @@ class ChatController(args: Bundle) :
         binding.messageInputView.findViewById<ImageButton>(R.id.attachmentButton)?.visibility = View.VISIBLE
     }
 
+    @Suppress("Detekt.TooGenericExceptionCaught")
     private fun cancelNotificationsForCurrentConversation() {
         if (conversationUser != null) {
             if (!TextUtils.isEmpty(roomToken)) {
-                NotificationUtils.cancelExistingNotificationsForRoom(
-                    applicationContext,
-                    conversationUser,
-                    roomToken!!
-                )
+                try {
+                    NotificationUtils.cancelExistingNotificationsForRoom(
+                        applicationContext,
+                        conversationUser,
+                        roomToken!!
+                    )
+                } catch (e: RuntimeException) {
+                    Log.w(TAG, "Cancel notifications for current conversation results with an error.", e)
+                }
             }
         }
     }