merge hotfix to develop

CHANGES.md

@@ -1,4 +1,4 @@
-Changes in Element 1.1.6 (2021-XX-XX)
+Changes in Element 1.1.7 (2021-XX-XX)
 ===================================================
 
 Features ✨:
@@ -25,6 +25,13 @@ Test:
 Other changes:
  - New store descriptions
 
+Changes in Element 1.1.6 (2021-04-16)
+===================================================
+
+Bugfix 🐛:
+ - Fix crash on the timeline
+ - App crashes on "troubleshoot notifications" button (#3187)
+
 Changes in Element 1.1.5 (2021-04-15)
 ===================================================
 

fastlane/metadata/android/en-US/changelogs/40101060.txt

@@ -0,0 +1,2 @@
+Main changes in this version: hot fixes for 1.1.5
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.6

vector/build.gradle

@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 6
+ext.versionPatch = 7
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt

@@ -24,9 +24,11 @@ import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
 import javax.inject.Inject
 
@@ -47,22 +49,26 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             return
         }
         action = GlobalScope.launch {
-            status = runCatching { pushersManager.testPush(fcmToken) }
-                    .fold(
-                            {
-                                // Wait for the push to be received
-                                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
-                                TestStatus.RUNNING
-                            },
-                            {
-                                description = if (it is PushGatewayFailure.PusherRejected) {
-                                    stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
-                                } else {
-                                    errorFormatter.toHumanReadable(it)
+            val result = runCatching { pushersManager.testPush(fcmToken) }
+
+            withContext(Dispatchers.Main) {
+                status = result
+                        .fold(
+                                {
+                                    // Wait for the push to be received
+                                    description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
+                                    TestStatus.RUNNING
+                                },
+                                {
+                                    description = if (it is PushGatewayFailure.PusherRejected) {
+                                        stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                                    } else {
+                                        errorFormatter.toHumanReadable(it)
+                                    }
+                                    TestStatus.FAILED
                                 }
-                                TestStatus.FAILED
-                            }
-                    )
+                        )
+            }
         }
     }
 

vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt

@@ -178,10 +178,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         updateShowDialerOptionState()
         room.getRoomSummaryLive()
         viewModelScope.launch {
-            try {
-                room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
-            } catch (_: Exception) {
-            }
+            tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
         }
         // Inform the SDK that the room is displayed
         viewModelScope.launch {
@@ -551,10 +548,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
                 viewModelScope.launch {
-                    try {
-                        room.setReadMarker(it)
-                    } catch (_: Exception) {
-                    }
+                    tryOrNull { room.setReadMarker(it) }
                 }
             }
             mostRecentDisplayedEvent = null
@@ -1259,7 +1253,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
                         viewModelScope.launch {
-                            room.setReadReceipt(eventId)
+                            tryOrNull { room.setReadReceipt(eventId) }
                         }
                     }
                 })
@@ -1268,10 +1262,7 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleMarkAllAsRead() {
         viewModelScope.launch {
-            try {
-                room.markAsRead(ReadService.MarkAsReadParams.BOTH)
-            } catch (_: Exception) {
-            }
+            tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.BOTH) }
         }
     }
 

vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt

@@ -25,6 +25,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.read.ReadService
@@ -78,7 +79,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 GlobalScope.launch {
-                    room.join()
+                    tryOrNull { room.join() }
                 }
             }
         }
@@ -89,7 +90,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 GlobalScope.launch {
-                    room.leave()
+                    tryOrNull { room.leave() }
                 }
             }
         }
@@ -100,10 +101,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 GlobalScope.launch {
-                    try {
-                        room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
-                    } catch (_: Exception) {
-                    }
+                    tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
                 }
             }
         }

vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt

@@ -20,8 +20,11 @@ import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleKind
 import javax.inject.Inject
@@ -50,10 +53,12 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                         if (manager?.diagStatus == TestStatus.RUNNING) return // wait before all is finished
 
                         GlobalScope.launch {
-                            runCatching {
+                            tryOrNull {
                                 session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
                             }
-                            manager?.retry(activityResultLauncher)
+                            withContext(Dispatchers.Main) {
+                                manager?.retry(activityResultLauncher)
+                            }
                         }
                     }
                 }