From 8036f50a6e906506d0105a386ac8c495eee98cb0 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 20 Sep 2021 12:07:45 +0200
Subject: [PATCH] Show mxto bottom sheet when tapping invite notification

---
 changelog.d/4043.bugfix                       |  1 +
 .../vector/app/features/home/HomeActivity.kt  | 27 ++++++++++++++++---
 .../notifications/NotificationUtils.kt        |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/4043.bugfix

diff --git a/changelog.d/4043.bugfix b/changelog.d/4043.bugfix
new file mode 100644
index 0000000000..9da934b5d3
--- /dev/null
+++ b/changelog.d/4043.bugfix
@@ -0,0 +1 @@
+Spaces invitation system notifications don't take me to the join space toast
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index a302276f45..51d6ed79db 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -81,7 +81,8 @@ import javax.inject.Inject
 @Parcelize
 data class HomeActivityArgs(
         val clearNotification: Boolean,
-        val accountCreation: Boolean
+        val accountCreation: Boolean,
+        val inviteNotificationRoomId: String? = null
 ) : Parcelable
 
 class HomeActivity :
@@ -229,6 +230,11 @@ class HomeActivity :
         if (args?.clearNotification == true) {
             notificationDrawerManager.clearAllEvents()
         }
+        if (args?.inviteNotificationRoomId != null) {
+            activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createPermalink(args.inviteNotificationRoomId)?.let {
+                navigator.openMatrixToBottomSheet(this, it)
+            }
+        }
 
         homeActivityViewModel.observeViewEvents {
             when (it) {
@@ -422,9 +428,17 @@ class HomeActivity :
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        if (intent?.getParcelableExtra<HomeActivityArgs>(MvRx.KEY_ARG)?.clearNotification == true) {
+        val parcelableExtra = intent?.getParcelableExtra<HomeActivityArgs>(MvRx.KEY_ARG)
+        if (parcelableExtra?.clearNotification == true) {
             notificationDrawerManager.clearAllEvents()
         }
+        if (parcelableExtra?.inviteNotificationRoomId != null) {
+            activeSessionHolder.getSafeActiveSession()
+                    ?.permalinkService()
+                    ?.createPermalink(parcelableExtra.inviteNotificationRoomId)?.let {
+                        navigator.openMatrixToBottomSheet(this, it)
+                    }
+        }
         handleIntent(intent)
     }
 
@@ -548,10 +562,15 @@ class HomeActivity :
     }
 
     companion object {
-        fun newIntent(context: Context, clearNotification: Boolean = false, accountCreation: Boolean = false): Intent {
+        fun newIntent(context: Context,
+                      clearNotification: Boolean = false,
+                      accountCreation: Boolean = false,
+                      inviteNotificationRoomId: String? = null
+        ): Intent {
             val args = HomeActivityArgs(
                     clearNotification = clearNotification,
-                    accountCreation = accountCreation
+                    accountCreation = accountCreation,
+                    inviteNotificationRoomId = inviteNotificationRoomId
             )
 
             return Intent(context, HomeActivity::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index a74c13a496..5ccaee80bc 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -679,7 +679,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                             stringProvider.getString(R.string.join),
                             joinIntentPendingIntent)
 
-                    val contentIntent = HomeActivity.newIntent(context)
+                    val contentIntent = HomeActivity.newIntent(context, inviteNotificationRoomId = inviteNotifiableEvent.roomId)
                     contentIntent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
                     // pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
                     contentIntent.data = Uri.parse("foobar://" + inviteNotifiableEvent.eventId)