6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix crash observe on the PlayStore (#341)

Browse Source
This commit is contained in:
Benoit Marty 2019-07-12 14:40:35 +02:00
parent b15dea6de3
commit 222201cc64
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -12,6 +12,7 @@ Other changes:


Bugfix: Bugfix:
- Fix regression on permalink click - Fix regression on permalink click
- Fix crash reported by the PlayStore (#341)


Translations: Translations:
- -

34
vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt
View File

@ -121,11 +121,13 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
Timber.v("clearMessageEventOfRoom $roomId") Timber.v("clearMessageEventOfRoom $roomId")


if (roomId != null) { if (roomId != null) {
eventList.removeAll { e -> synchronized(eventList) {
if (e is NotifiableMessageEvent) { eventList.removeAll { e ->
return@removeAll e.roomId == roomId if (e is NotifiableMessageEvent) {
return@removeAll e.roomId == roomId
}
return@removeAll false
} }
return@removeAll false
} }
NotificationUtils.cancelNotificationMessage(context, roomId, ROOM_MESSAGES_NOTIFICATION_ID) NotificationUtils.cancelNotificationMessage(context, roomId, ROOM_MESSAGES_NOTIFICATION_ID)
} }
@ -433,18 +435,20 @@ class NotificationDrawerManager @Inject constructor(private val context: Context




fun persistInfo() { fun persistInfo() {
if (eventList.isEmpty()) { synchronized(eventList) {
deleteCachedRoomNotifications(context) if (eventList.isEmpty()) {
return deleteCachedRoomNotifications(context)
} return
try { }
val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME) try {
if (!file.exists()) file.createNewFile() val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
FileOutputStream(file).use { if (!file.exists()) file.createNewFile()
SecretStoringUtils.securelyStoreObject(eventList, "notificationMgr", it, this.context) FileOutputStream(file).use {
SecretStoringUtils.securelyStoreObject(eventList, "notificationMgr", it, this.context)
}
} catch (e: Throwable) {
Timber.e(e, "## Failed to save cached notification info")
} }
} catch (e: Throwable) {
Timber.e(e, "## Failed to save cached notification info")
} }
} }