From be9a91e3feeb2b804f9b0f680eb17c0fc8ef992b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 6 Sep 2020 00:58:00 +0200
Subject: [PATCH] Android 6: App crash when read Contact permission is granted
 (#2064)

---
 CHANGES.md                                           |  1 +
 .../vector/app/core/platform/VectorBaseActivity.kt   |  8 ++++++++
 .../createdirect/CreateDirectRoomActivity.kt         | 10 +++++++++-
 .../app/features/invite/InviteUsersToRoomActivity.kt | 12 ++++++++++--
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b7cda86878..7eecb0ee3a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@ Bugfix 🐛:
  - Login with Matrix-Id | Autodiscovery fails if identity server is invalid and Homeserver ok (#2027)
  - Support for image compression on Android 10
  - Verification popup won't show
+ - Android 6: App crash when read Contact permission is granted (#2064)
 
 Translations 🗣:
  - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.riot.im/projects/matrix-doc/) (#1909)
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index bedb02949f..b9d8924be1 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -345,6 +345,14 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
                 }
     }
 
+    protected var postResumeScheduledAction: Runnable? = null
+
+    override fun onPostResume() {
+        super.onPostResume()
+        postResumeScheduledAction?.run()
+        postResumeScheduledAction = null
+    }
+
     override fun onPause() {
         super.onPause()
         Timber.i("onPause Activity ${this.javaClass.simpleName}")
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 41260b06c8..d602b5f1f2 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -49,8 +49,10 @@ import im.vector.app.features.userdirectory.UserDirectorySharedAction
 import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
 import im.vector.app.features.userdirectory.UserDirectoryViewModel
 import kotlinx.android.synthetic.main.activity.*
+import org.matrix.android.sdk.api.extensions.tryThis
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import timber.log.Timber
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -113,7 +115,13 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                try {
+                    addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                } catch (throwable: Throwable) {
+                    Timber.w(throwable)
+                    // Bug on API23
+                    postResumeScheduledAction = Runnable { tryThis { addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) } }
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index 096579091f..94a0ac75be 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -45,9 +45,11 @@ import im.vector.app.features.userdirectory.UserDirectoryFragment
 import im.vector.app.features.userdirectory.UserDirectorySharedAction
 import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
 import im.vector.app.features.userdirectory.UserDirectoryViewModel
-import org.matrix.android.sdk.api.failure.Failure
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity.*
+import org.matrix.android.sdk.api.extensions.tryThis
+import org.matrix.android.sdk.api.failure.Failure
+import timber.log.Timber
 import java.net.HttpURLConnection
 import javax.inject.Inject
 
@@ -114,7 +116,13 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                try {
+                    addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java)
+                } catch (throwable: Throwable) {
+                    Timber.w(throwable)
+                    // Bug on API23
+                    postResumeScheduledAction = Runnable { tryThis { addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) } }
+                }
             }
         }
     }