diff --git a/app/build.gradle b/app/build.gradle index 499108be3..810b662c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -132,13 +132,13 @@ android { } dependencies { - implementation "androidx.activity:activity-ktx:1.8.2" + implementation "androidx.activity:activity:1.9.0" implementation "androidx.annotation:annotation:1.7.1" implementation "androidx.appcompat:appcompat:1.7.0-alpha03" implementation "androidx.constraintlayout:constraintlayout:2.1.4" - implementation "androidx.core:core-ktx:1.12.0" + implementation "androidx.core:core-ktx:1.13.0" implementation 'androidx.core:core-splashscreen:1.0.1' - implementation "androidx.core:core-telecom:1.0.0-alpha02" + implementation "androidx.core:core-telecom:1.0.0-alpha03" implementation "androidx.media:media:1.7.0" implementation "androidx.fragment:fragment-ktx:1.6.2" implementation "androidx.recyclerview:recyclerview:1.3.2" diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt index bab46038e..91e6684f2 100644 --- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt +++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt @@ -281,14 +281,14 @@ class CallActivity : GenericActivity() { } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - if (intent?.extras?.getBoolean("ActiveCall", false) == true) { + if (intent.extras?.getBoolean("ActiveCall", false) == true) { navigateToActiveCall( callViewModel.conferenceModel.isCurrentCallInConference.value == false ) - } else if (intent?.extras?.getBoolean("IncomingCall", false) == true) { + } else if (intent.extras?.getBoolean("IncomingCall", false) == true) { val action = IncomingCallFragmentDirections.actionGlobalIncomingCallFragment() findNavController(R.id.call_nav_container).navigate(action) } diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt index f376bc7b8..0eea7aaeb 100644 --- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt @@ -258,12 +258,9 @@ class MainActivity : GenericActivity() { viewModel.checkForNewAccount() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) - - if (intent != null) { - handleIntent(intent, true) - } + handleIntent(intent, true) } @SuppressLint("RtlHardcoded")