If we need the FragmentManager, let's require to have a FragmentActivity.

vector/src/main/java/im/vector/app/features/home/HomeActivity.kt

@@ -377,7 +377,7 @@ class HomeActivity :
 
             lifecycleScope.launch {
                 val isHandled = permalinkHandler.launch(
-                        context = this@HomeActivity,
+                        fragmentActivity = this@HomeActivity,
                         deepLink = resolvedLink,
                         navigationInterceptor = this@HomeActivity,
                         buildTask = true

vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt

@@ -232,9 +232,10 @@ class HomeDetailFragment :
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
                     colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
                     contentAction = Runnable {
-                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { vectorBaseActivity ->
-                                ?.navigator
+                            vectorBaseActivity.navigator
-                                ?.requestSessionVerification(requireContext(), newest.deviceId ?: "")
+                                    .requestSessionVerification(vectorBaseActivity, newest.deviceId ?: "")
+                        }
                         unknownDeviceDetectorSharedViewModel.handle(
                                 UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )

vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt

@@ -250,9 +250,10 @@ class NewHomeDetailFragment :
                     viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
                     colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
                     contentAction = Runnable {
-                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { vectorBaseActivity ->
-                                ?.navigator
+                            vectorBaseActivity.navigator
-                                ?.requestSessionVerification(requireContext(), newest.deviceId ?: "")
+                                    .requestSessionVerification(vectorBaseActivity, newest.deviceId ?: "")
+                        }
                         unknownDeviceDetectorSharedViewModel.handle(
                                 UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
                         )

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

@@ -2190,7 +2190,7 @@ class TimelineFragment :
     override fun onRoomCreateLinkClicked(url: String) {
         viewLifecycleOwner.lifecycleScope.launchWhenResumed {
             permalinkHandler
-                    .launch(requireContext(), url, object : NavigationInterceptor {
+                    .launch(requireActivity(), url, object : NavigationInterceptor {
                         override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             requireActivity().finish()
                             return false

vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt

@@ -188,7 +188,7 @@ class RoomListFragment :
     }
 
     private fun handleShowMxToLink(link: String) {
-        navigator.openMatrixToBottomSheet(requireContext(), link, OriginOfMatrixTo.ROOM_LIST)
+        navigator.openMatrixToBottomSheet(requireActivity(), link, OriginOfMatrixTo.ROOM_LIST)
     }
 
     override fun onDestroyView() {

vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt

@@ -25,7 +25,6 @@ import android.view.View
 import android.view.Window
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
@@ -225,43 +224,38 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, SpacePreviewActivity.newIntent(context, spaceId), false)
     }
 
-    override fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String) {
+    override fun performDeviceVerification(fragmentActivity: FragmentActivity, otherUserId: String, sasTransactionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val tx = session.cryptoService().verificationService().getExistingTransaction(otherUserId, sasTransactionId)
                 ?: return
         (tx as? IncomingSasVerificationTransaction)?.performAccept()
-        if (context is AppCompatActivity) {
         VerificationBottomSheet.withArgs(
                 roomId = null,
                 otherUserId = otherUserId,
                 transactionId = sasTransactionId
-            ).show(context.supportFragmentManager, "REQPOP")
+        ).show(fragmentActivity.supportFragmentManager, "REQPOP")
-        }
     }
 
-    override fun requestSessionVerification(context: Context, otherSessionId: String) {
+    override fun requestSessionVerification(fragmentActivity: FragmentActivity, otherSessionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val pr = session.cryptoService().verificationService().requestKeyVerification(
                 supportedVerificationMethodsProvider.provide(),
                 session.myUserId,
                 listOf(otherSessionId)
         )
-        if (context is AppCompatActivity) {
         VerificationBottomSheet.withArgs(
                 roomId = null,
                 otherUserId = session.myUserId,
                 transactionId = pr.transactionId
-            ).show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+        ).show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-        }
     }
 
-    override fun requestSelfSessionVerification(context: Context) {
+    override fun requestSelfSessionVerification(fragmentActivity: FragmentActivity) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val otherSessions = session.cryptoService()
                 .getCryptoDeviceInfo(session.myUserId)
                 .filter { it.deviceId != session.sessionParams.deviceId }
                 .map { it.deviceId }
-        if (context is AppCompatActivity) {
         if (otherSessions.isNotEmpty()) {
             val pr = session.cryptoService().verificationService().requestKeyVerification(
                     supportedVerificationMethodsProvider.provide(),
@@ -269,30 +263,25 @@ class DefaultNavigator @Inject constructor(
                     otherSessions
             )
             VerificationBottomSheet.forSelfVerification(session, pr.transactionId ?: pr.localId)
-                        .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+                    .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
         } else {
             VerificationBottomSheet.forSelfVerification(session)
-                        .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+                    .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-            }
         }
     }
 
-    override fun waitSessionVerification(context: Context) {
+    override fun waitSessionVerification(fragmentActivity: FragmentActivity) {
         val session = sessionHolder.getSafeActiveSession() ?: return
-        if (context is AppCompatActivity) {
         VerificationBottomSheet.forSelfVerification(session)
-                    .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
+                .show(fragmentActivity.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
-        }
     }
 
-    override fun upgradeSessionSecurity(context: Context, initCrossSigningOnly: Boolean) {
+    override fun upgradeSessionSecurity(fragmentActivity: FragmentActivity, initCrossSigningOnly: Boolean) {
-        if (context is AppCompatActivity) {
         BootstrapBottomSheet.show(
-                    context.supportFragmentManager,
+                fragmentActivity.supportFragmentManager,
                 if (initCrossSigningOnly) SetupMode.CROSS_SIGNING_ONLY else SetupMode.NORMAL
         )
     }
-    }
 
     override fun openRoomMemberProfile(userId: String, roomId: String?, context: Context, buildTask: Boolean) {
         val args = RoomMemberProfileArgs(userId = userId, roomId = roomId)
@@ -317,16 +306,14 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo) {
+    override fun openMatrixToBottomSheet(fragmentActivity: FragmentActivity, link: String, origin: OriginOfMatrixTo) {
-        if (context is AppCompatActivity) {
+        if (fragmentActivity !is MatrixToBottomSheet.InteractionListener) {
-            if (context !is MatrixToBottomSheet.InteractionListener) {
             fatalError("Caller context should implement MatrixToBottomSheet.InteractionListener", vectorPreferences.failFast())
             return
         }
         // TODO check if there is already one??
         MatrixToBottomSheet.withLink(link, origin)
-                    .show(context.supportFragmentManager, "HA#MatrixToBottomSheet")
+                .show(fragmentActivity.supportFragmentManager, "HA#MatrixToBottomSheet")
-        }
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
@@ -380,24 +367,20 @@ class DefaultNavigator @Inject constructor(
         debugNavigator.openDebugMenu(context)
     }
 
-    override fun openKeysBackupSetup(context: Context, showManualExport: Boolean) {
+    override fun openKeysBackupSetup(fragmentActivity: FragmentActivity, showManualExport: Boolean) {
         // if cross signing is enabled and trusted or not set up at all we should propose full 4S
         sessionHolder.getSafeActiveSession()?.let { session ->
             if (session.cryptoService().crossSigningService().getMyCrossSigningKeys() == null ||
                     session.cryptoService().crossSigningService().canCrossSign()) {
-                (context as? AppCompatActivity)?.let {
+                BootstrapBottomSheet.show(fragmentActivity.supportFragmentManager, SetupMode.NORMAL)
-                    BootstrapBottomSheet.show(it.supportFragmentManager, SetupMode.NORMAL)
-                }
             } else {
-                context.startActivity(KeysBackupSetupActivity.intent(context, showManualExport))
+                fragmentActivity.startActivity(KeysBackupSetupActivity.intent(fragmentActivity, showManualExport))
             }
         }
     }
 
-    override fun open4SSetup(context: Context, setupMode: SetupMode) {
+    override fun open4SSetup(fragmentActivity: FragmentActivity, setupMode: SetupMode) {
-        if (context is AppCompatActivity) {
+        BootstrapBottomSheet.show(fragmentActivity.supportFragmentManager, setupMode)
-            BootstrapBottomSheet.show(context.supportFragmentManager, setupMode)
-        }
     }
 
     override fun openKeysBackupManager(context: Context) {

vector/src/main/java/im/vector/app/features/navigation/Navigator.kt

@@ -77,15 +77,15 @@ interface Navigator {
 
     fun openSpacePreview(context: Context, spaceId: String)
 
-    fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String)
+    fun performDeviceVerification(fragmentActivity: FragmentActivity, otherUserId: String, sasTransactionId: String)
 
-    fun requestSessionVerification(context: Context, otherSessionId: String)
+    fun requestSessionVerification(fragmentActivity: FragmentActivity, otherSessionId: String)
 
-    fun requestSelfSessionVerification(context: Context)
+    fun requestSelfSessionVerification(fragmentActivity: FragmentActivity)
 
-    fun waitSessionVerification(context: Context)
+    fun waitSessionVerification(fragmentActivity: FragmentActivity)
 
-    fun upgradeSessionSecurity(context: Context, initCrossSigningOnly: Boolean)
+    fun upgradeSessionSecurity(fragmentActivity: FragmentActivity, initCrossSigningOnly: Boolean)
 
     fun openRoomForSharingAndFinish(activity: Activity, roomId: String, sharedData: SharedData)
 
@@ -93,7 +93,7 @@ interface Navigator {
 
     fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData, fromEmailInviteLink: PermalinkData.RoomEmailInviteLink? = null)
 
-    fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo)
+    fun openMatrixToBottomSheet(fragmentActivity: FragmentActivity, link: String, origin: OriginOfMatrixTo)
 
     fun openCreateRoom(context: Context, initialName: String = "", openAfterCreate: Boolean = true)
 
@@ -111,9 +111,9 @@ interface Navigator {
 
     fun openDebug(context: Context)
 
-    fun openKeysBackupSetup(context: Context, showManualExport: Boolean)
+    fun openKeysBackupSetup(fragmentActivity: FragmentActivity, showManualExport: Boolean)
 
-    fun open4SSetup(context: Context, setupMode: SetupMode)
+    fun open4SSetup(fragmentActivity: FragmentActivity, setupMode: SetupMode)
 
     fun openKeysBackupManager(context: Context)
 

vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt

@@ -19,6 +19,7 @@ package im.vector.app.features.permalink
 import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
+import androidx.fragment.app.FragmentActivity
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.isIgnored
@@ -52,17 +53,17 @@ class PermalinkHandler @Inject constructor(
 ) {
 
     suspend fun launch(
-            context: Context,
+            fragmentActivity: FragmentActivity,
             deepLink: String?,
             navigationInterceptor: NavigationInterceptor? = null,
             buildTask: Boolean = false
     ): Boolean {
         val uri = deepLink?.let { Uri.parse(it) }
-        return launch(context, uri, navigationInterceptor, buildTask)
+        return launch(fragmentActivity, uri, navigationInterceptor, buildTask)
     }
 
     suspend fun launch(
-            context: Context,
+            fragmentActivity: FragmentActivity,
             deepLink: Uri?,
             navigationInterceptor: NavigationInterceptor? = null,
             buildTask: Boolean = false
@@ -70,12 +71,12 @@ class PermalinkHandler @Inject constructor(
         return when {
             deepLink == null -> false
             deepLink.isIgnored() -> true
-            !isPermalinkSupported(context, deepLink.toString()) -> false
+            !isPermalinkSupported(fragmentActivity, deepLink.toString()) -> false
             else -> {
                 tryOrNull {
                     withContext(Dispatchers.Default) {
                         val permalinkData = PermalinkParser.parse(deepLink)
-                        handlePermalink(permalinkData, deepLink, context, navigationInterceptor, buildTask)
+                        handlePermalink(permalinkData, deepLink, fragmentActivity, navigationInterceptor, buildTask)
                     }
                 } ?: false
             }
@@ -85,22 +86,22 @@ class PermalinkHandler @Inject constructor(
     private suspend fun handlePermalink(
             permalinkData: PermalinkData,
             rawLink: Uri,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             navigationInterceptor: NavigationInterceptor?,
             buildTask: Boolean
     ): Boolean {
         return when (permalinkData) {
-            is PermalinkData.RoomLink -> handleRoomLink(permalinkData, rawLink, context, navigationInterceptor, buildTask)
+            is PermalinkData.RoomLink -> handleRoomLink(permalinkData, rawLink, fragmentActivity, navigationInterceptor, buildTask)
-            is PermalinkData.UserLink -> handleUserLink(permalinkData, rawLink, context, navigationInterceptor, buildTask)
+            is PermalinkData.UserLink -> handleUserLink(permalinkData, rawLink, fragmentActivity, navigationInterceptor, buildTask)
-            is PermalinkData.FallbackLink -> handleFallbackLink(permalinkData, context)
+            is PermalinkData.FallbackLink -> handleFallbackLink(permalinkData, fragmentActivity)
-            is PermalinkData.RoomEmailInviteLink -> handleRoomInviteLink(permalinkData, context)
+            is PermalinkData.RoomEmailInviteLink -> handleRoomInviteLink(permalinkData, fragmentActivity)
         }
     }
 
     private suspend fun handleRoomLink(
             permalinkData: PermalinkData.RoomLink,
             rawLink: Uri,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             navigationInterceptor: NavigationInterceptor?,
             buildTask: Boolean
     ): Boolean {
@@ -119,7 +120,7 @@ class PermalinkHandler @Inject constructor(
         }
         openRoom(
                 navigationInterceptor,
-                context = context,
+                fragmentActivity = fragmentActivity,
                 roomId = roomId,
                 permalinkData = permalinkData,
                 rawLink = rawLink,
@@ -200,7 +201,7 @@ class PermalinkHandler @Inject constructor(
      */
     private fun openRoom(
             navigationInterceptor: NavigationInterceptor?,
-            context: Context,
+            fragmentActivity: FragmentActivity,
             roomId: String?,
             permalinkData: PermalinkData.RoomLink,
             rawLink: Uri,
@@ -209,7 +210,7 @@ class PermalinkHandler @Inject constructor(
     ) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         if (roomId == null) {
-            context.toast(R.string.room_error_not_found)
+            fragmentActivity.toast(R.string.room_error_not_found)
             return
         }
         val roomSummary = session.getRoomSummary(roomId)
@@ -218,19 +219,19 @@ class PermalinkHandler @Inject constructor(
 //        val roomAlias = permalinkData.getRoomAliasOrNull()
         val isSpace = roomSummary?.roomType == RoomType.SPACE
         return when {
-            membership == Membership.BAN -> context.toast(R.string.error_opening_banned_room)
+            membership == Membership.BAN -> fragmentActivity.toast(R.string.error_opening_banned_room)
             membership?.isActive().orFalse() -> {
                 if (!isSpace && membership == Membership.JOIN) {
                     // If it's a room you're in, let's just open it, you can tap back if needed
-                    navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, context, rootThreadEventId, roomSummary)
+                    navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, fragmentActivity, rootThreadEventId, roomSummary)
                 } else {
-                    // maybe open space preview navigator.openSpacePreview(context, roomId)? if already joined?
+                    // maybe open space preview navigator.openSpacePreview(fragmentActivity, roomId)? if already joined?
-                    navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
+                    navigator.openMatrixToBottomSheet(fragmentActivity, rawLink.toString(), OriginOfMatrixTo.LINK)
                 }
             }
             else -> {
                 // XXX this could trigger another server load
-                navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
+                navigator.openMatrixToBottomSheet(fragmentActivity, rawLink.toString(), OriginOfMatrixTo.LINK)
             }
         }
     }

vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt

@@ -130,7 +130,7 @@ class PublicRoomsFragment :
         viewLifecycleOwner.lifecycleScope.launch {
             val permalink = session.permalinkService().createPermalink(roomIdOrAlias)
             val isHandled = permalinkHandler
-                    .launch(requireContext(), permalink, object : NavigationInterceptor {
+                    .launch(requireActivity(), permalink, object : NavigationInterceptor {
                         override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
                             requireActivity().finish()
                             return false

vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt

@@ -94,7 +94,7 @@ class VectorSettingsDevicesFragment :
                     }
                 }
                 is DevicesViewEvents.PromptResetSecrets -> {
-                    navigator.open4SSetup(requireContext(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
+                    navigator.open4SSetup(requireActivity(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
                 }
             }
         }

vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt

@@ -99,7 +99,7 @@ class VectorSettingsDevicesFragment :
                     }
                 }
                 is DevicesViewEvents.PromptResetSecrets -> {
-                    navigator.open4SSetup(requireContext(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
+                    navigator.open4SSetup(requireActivity(), SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET)
                 }
             }
         }