From c6126f3e9c8b704986f71ab041a58b02ae00b602 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 24 Jan 2024 08:42:04 +0100 Subject: [PATCH] Catch exception when navigating to account settings --- app/src/main/java/org/linphone/activities/Navigation.kt | 6 +++++- .../activities/main/sidemenu/fragments/SideMenuFragment.kt | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt index 84abc8c3b..c03d854d1 100644 --- a/app/src/main/java/org/linphone/activities/Navigation.kt +++ b/app/src/main/java/org/linphone/activities/Navigation.kt @@ -844,7 +844,11 @@ internal fun ContactsSettingsFragment.navigateToLdapSettings(configIndex: Int) { internal fun SideMenuFragment.navigateToAccountSettings(identity: String) { val deepLink = "linphone-android://settings/$identity" - findNavController().navigate(Uri.parse(deepLink)) + try { + findNavController().navigate(Uri.parse(deepLink)) + } catch (iae: IllegalArgumentException) { + Log.e("[Navigation] Failed to navigate to deeplink [$deepLink]") + } } internal fun SideMenuFragment.navigateToSettings() { diff --git a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt index a994a7ac6..1e73cef17 100644 --- a/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/sidemenu/fragments/SideMenuFragment.kt @@ -80,9 +80,7 @@ class SideMenuFragment : GenericFragment() { viewModel.accountsSettingsListener = object : SettingListenerStub() { override fun onAccountClicked(identity: String) { - val args = Bundle() - args.putString("Identity", identity) - Log.i("[Side Menu] Navigation to settings for account with identity: $identity") + Log.i("[Side Menu] Navigating to settings for account with identity: $identity") sharedViewModel.toggleDrawerEvent.value = Event(true)