diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt index d114abf32..f7be7845a 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt @@ -46,10 +46,10 @@ class AccountLoginFragment : AbstractPhoneFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedAssistantViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } viewModel = ViewModelProvider(this).get(QrCodeViewModel::class.java) binding.viewModel = viewModel diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt index e1b489d16..ab3e74140 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/RemoteProvisioningFragment.kt @@ -42,9 +42,9 @@ class RemoteProvisioningFragment : GenericFragment() { binding.setBackClickListener { if (!findNavController().popBackStack()) { - activity?.finish() + requireActivity().finish() + requireActivity().overridePendingTransition(R.anim.enter_left, R.anim.exit_right) } } } diff --git a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt index 4ed3f65ca..dd2c04ebe 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/ControlsFragment.kt @@ -66,9 +66,9 @@ class ControlsFragment : GenericFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedCallViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } callsViewModel = ViewModelProvider(this).get(CallsViewModel::class.java) binding.viewModel = callsViewModel @@ -86,7 +86,7 @@ class ControlsFragment : GenericFragment() { callsViewModel.noMoreCallEvent.observe(viewLifecycleOwner, { it.consume { - activity?.finish() + requireActivity().finish() } }) diff --git a/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt b/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt index c6237ce39..602ee7afe 100644 --- a/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt +++ b/app/src/main/java/org/linphone/activities/call/fragments/StatusFragment.kt @@ -49,9 +49,9 @@ class StatusFragment : GenericFragment() { viewModel = ViewModelProvider(this).get(StatusViewModel::class.java) binding.viewModel = viewModel - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedCallViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } binding.setStatsClickListener { sharedViewModel.toggleDrawerEvent.value = Event(true) diff --git a/app/src/main/java/org/linphone/activities/launcher/LauncherActivity.kt b/app/src/main/java/org/linphone/activities/launcher/LauncherActivity.kt index 96947e695..1e2624973 100644 --- a/app/src/main/java/org/linphone/activities/launcher/LauncherActivity.kt +++ b/app/src/main/java/org/linphone/activities/launcher/LauncherActivity.kt @@ -55,5 +55,6 @@ class LauncherActivity : GenericActivity() { intent.data = getIntent().data startActivity(intent) + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) } } diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt index 9ea535e78..dc6296439 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/ChatRoomCreationFragment.kt @@ -52,9 +52,9 @@ class ChatRoomCreationFragment : SecureFragment binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val createGroup = arguments?.getBoolean("createGroup") ?: false diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt index 28bb26571..2fa211892 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt @@ -89,9 +89,9 @@ class DetailChatRoomFragment : MasterFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val chatRoom = sharedViewModel.selectedChatRoom.value chatRoom ?: return diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt index 647bb44a2..8cee2b818 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt @@ -43,9 +43,9 @@ class EphemeralFragment : SecureFragment() { isSecure = true binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val chatRoom = sharedViewModel.selectedChatRoom.value chatRoom ?: return diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt index 317b180ea..597585b0c 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/GroupInfoFragment.kt @@ -55,9 +55,9 @@ class GroupInfoFragment : SecureFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val chatRoom: ChatRoom? = sharedViewModel.selectedGroupChatRoom.value isSecure = chatRoom?.currentParams?.encryptionEnabled() ?: false diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt index fd83b3adb..6624d21b4 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt @@ -48,9 +48,9 @@ class ImdnFragment : SecureFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val chatRoom = sharedViewModel.selectedChatRoom.value chatRoom ?: return diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt index 0602bf885..9906aa07a 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt @@ -79,9 +79,9 @@ class MasterChatRoomsFragment : MasterFragment(), S binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } viewModel = ViewModelProvider( this, diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt index 8accfaa28..6968039ed 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt @@ -52,9 +52,9 @@ class DetailContactFragment : GenericFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val contact = sharedViewModel.selectedContact.value contact ?: return diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt index 643251de8..e6f32d294 100644 --- a/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/MasterContactsFragment.kt @@ -67,9 +67,9 @@ class MasterContactsFragment : MasterFragment() { viewModel = ViewModelProvider(this).get(DialerViewModel::class.java) binding.viewModel = viewModel - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } binding.setNewContactClickListener { val deepLink = "linphone-android://contact/new/${viewModel.enteredUri.value}" diff --git a/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt index 5e250e043..40654baed 100644 --- a/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/fragments/StatusFragment.kt @@ -44,9 +44,9 @@ class StatusFragment : GenericFragment() { viewModel = ViewModelProvider(this).get(StatusViewModel::class.java) binding.viewModel = viewModel - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } sharedViewModel.proxyConfigRemoved.observe(viewLifecycleOwner, { Log.i("[Status Fragment] A proxy config was removed, update default proxy state") diff --git a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt b/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt index e51d81a50..909628e78 100644 --- a/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/fragments/TabsFragment.kt @@ -49,9 +49,9 @@ class TabsFragment : GenericFragment(), NavController.OnDes binding.lifecycleOwner = this - viewModel = activity?.run { + viewModel = requireActivity().run { ViewModelProvider(this).get(TabsViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } binding.viewModel = viewModel binding.setHistoryClickListener { diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt index 46b7c4f50..7360eae53 100644 --- a/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt @@ -48,9 +48,9 @@ class DetailCallLogFragment : GenericFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val callLogGroup = sharedViewModel.selectedCallLogGroup.value callLogGroup ?: return diff --git a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt index 5d4fc3269..fc5293c58 100644 --- a/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/history/fragments/MasterCallLogsFragment.kt @@ -71,9 +71,9 @@ class MasterCallLogsFragment : MasterFragment( binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } val identity = arguments?.getString("Identity") ?: "" viewModel = ViewModelProvider(this, AccountSettingsViewModelFactory(identity)).get(AccountSettingsViewModel::class.java) diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt index b4199fe51..9bd0a3c6b 100644 --- a/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt +++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/SettingsFragment.kt @@ -45,9 +45,9 @@ class SettingsFragment : SecureFragment() { binding.lifecycleOwner = this - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } viewModel = ViewModelProvider(this).get(SettingsViewModel::class.java) binding.viewModel = viewModel 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 5dbba0e3b..a787f9912 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 @@ -62,9 +62,9 @@ class SideMenuFragment : GenericFragment() { viewModel = ViewModelProvider(this).get(SideMenuViewModel::class.java) binding.viewModel = viewModel - sharedViewModel = activity?.run { + sharedViewModel = requireActivity().run { ViewModelProvider(this).get(SharedMainViewModel::class.java) - } ?: throw Exception("Invalid Activity") + } sharedViewModel.proxyConfigRemoved.observe(viewLifecycleOwner, { Log.i("[Side Menu] Proxy config removed, update accounts list") @@ -89,6 +89,7 @@ class SideMenuFragment : GenericFragment() { binding.setAssistantClickListener { sharedViewModel.toggleDrawerEvent.value = Event(true) startActivity(Intent(context, AssistantActivity::class.java)) + requireActivity().overridePendingTransition(R.anim.enter_right, R.anim.exit_left) } binding.setSettingsClickListener {