From f125b54b40ceb58c3f930c6ddda756a0a2e3ccdb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 22 Aug 2022 09:53:34 +0200
Subject: [PATCH] Bumped dependencies & added missing deprecated annotations

---
 app/build.gradle                                       | 10 +++++-----
 .../assistant/fragments/AbstractPhoneFragment.kt       |  1 +
 .../fragments/EchoCancellerCalibrationFragment.kt      |  1 +
 .../activities/assistant/fragments/QrCodeFragment.kt   |  1 +
 .../assistant/viewmodels/AccountLoginViewModel.kt      |  1 +
 .../assistant/viewmodels/GenericLoginViewModel.kt      |  1 +
 .../main/chat/fragments/ChatRoomCreationFragment.kt    |  1 +
 .../main/chat/fragments/DetailChatRoomFragment.kt      |  2 ++
 .../ConferenceSchedulingParticipantsListFragment.kt    |  1 +
 .../fragments/ConferenceWaitingRoomFragment.kt         |  1 +
 .../main/contact/fragments/ContactEditorFragment.kt    |  2 ++
 .../main/contact/fragments/MasterContactsFragment.kt   |  1 +
 .../activities/main/dialer/fragments/DialerFragment.kt |  1 +
 .../main/settings/fragments/AudioSettingsFragment.kt   |  1 +
 .../main/settings/fragments/CallSettingsFragment.kt    |  2 ++
 .../settings/fragments/ContactsSettingsFragment.kt     |  1 +
 .../main/settings/fragments/VideoSettingsFragment.kt   |  1 +
 .../main/sidemenu/fragments/SideMenuFragment.kt        |  1 +
 .../linphone/activities/voip/fragments/ChatFragment.kt |  2 ++
 .../fragments/ConferenceAddParticipantsFragment.kt     |  1 +
 .../org/linphone/compatibility/PhoneStateListener.kt   |  1 +
 build.gradle                                           |  2 +-
 22 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 849c3e458..5d0ef437b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -204,10 +204,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.0-alpha05'
-    implementation 'androidx.core:core-ktx:1.9.0-alpha05'
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
-    implementation 'androidx.fragment:fragment-ktx:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0-beta01'
+    implementation 'androidx.core:core-ktx:1.9.0-beta01'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.2'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
     implementation 'androidx.media:media:1.6.0'
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
@@ -220,7 +220,7 @@ dependencies {
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha03'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta01'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-beta02'
 
     // https://github.com/material-components/material-components-android/blob/master/LICENSE Apache v2.0
     implementation 'com.google.android.material:material:1.6.1'
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
index 477e5bbf5..1693c0ce4 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AbstractPhoneFragment.kt
@@ -38,6 +38,7 @@ abstract class AbstractPhoneFragment<T : ViewDataBinding> : GenericFragment<T>()
 
     abstract val viewModel: AbstractPhoneViewModel
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt
index 626e35017..1449eddcd 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/EchoCancellerCalibrationFragment.kt
@@ -63,6 +63,7 @@ class EchoCancellerCalibrationFragment : GenericFragment<AssistantEchoCancellerC
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
index 0d9830f00..420669552 100644
--- a/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/fragments/QrCodeFragment.kt
@@ -87,6 +87,7 @@ class QrCodeFragment : GenericFragment<AssistantQrCodeFragmentBinding>() {
         super.onPause()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
index 5065f10d3..85145717d 100644
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AccountLoginViewModel.kt
@@ -87,6 +87,7 @@ class AccountLoginViewModel(accountCreator: AccountCreator) : AbstractPhoneViewM
     private var proxyConfigToCheck: ProxyConfig? = null
 
     private val coreListener = object : CoreListenerStub() {
+        @Deprecated("Deprecated in Java")
         override fun onRegistrationStateChanged(
             core: Core,
             cfg: ProxyConfig,
diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt
index 81fc5d5d3..3b1129cd3 100644
--- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/GenericLoginViewModel.kt
@@ -65,6 +65,7 @@ class GenericLoginViewModel(private val accountCreator: AccountCreator) : ViewMo
     private var proxyConfigToCheck: ProxyConfig? = null
 
     private val coreListener = object : CoreListenerStub() {
+        @Deprecated("Deprecated in Java")
         override fun onRegistrationStateChanged(
             core: Core,
             cfg: ProxyConfig,
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 1de8aef02..4e252fdfd 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
@@ -154,6 +154,7 @@ class ChatRoomCreationFragment : SecureFragment<ChatRoomCreationFragmentBinding>
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
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 ba6719c83..3debf0c43 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
@@ -702,6 +702,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         sharedViewModel.refreshChatRoomInListEvent.value = Event(true)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
@@ -793,6 +794,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
         super.onPause()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt
index 87b3c0a85..9bb1130ab 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceSchedulingParticipantsListFragment.kt
@@ -98,6 +98,7 @@ class ConferenceSchedulingParticipantsListFragment : GenericFragment<ConferenceS
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
index af5883fc6..a7cd3ae31 100644
--- a/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
@@ -158,6 +158,7 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
index 2dee3d6fc..1f2efd3f8 100644
--- a/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/contact/fragments/ContactEditorFragment.kt
@@ -103,6 +103,7 @@ class ContactEditorFragment : GenericFragment<ContactEditorFragmentBinding>(), S
         saveContact()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
@@ -120,6 +121,7 @@ class ContactEditorFragment : GenericFragment<ContactEditorFragmentBinding>(), S
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
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 9efd73c53..9febf3fd8 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
@@ -338,6 +338,7 @@ class MasterContactsFragment : MasterFragment<ContactMasterFragmentBinding, Cont
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
index 983f52c3e..46db74180 100644
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
@@ -208,6 +208,7 @@ class DialerFragment : SecureFragment<DialerFragmentBinding>() {
         viewModel.enteredUri.value = sharedViewModel.dialerUri
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt
index c2b35b3a5..ae911dbc2 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/AudioSettingsFragment.kt
@@ -75,6 +75,7 @@ class AudioSettingsFragment : GenericSettingFragment<SettingsAudioFragmentBindin
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
index 0dbd881de..7860790c3 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
@@ -130,6 +130,7 @@ class CallSettingsFragment : GenericSettingFragment<SettingsCallFragmentBinding>
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -162,6 +163,7 @@ class CallSettingsFragment : GenericSettingFragment<SettingsCallFragmentBinding>
         corePreferences.useTelecomManager = enabled
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt
index 152d2ca15..3cdf89a38 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/ContactsSettingsFragment.kt
@@ -94,6 +94,7 @@ class ContactsSettingsFragment : GenericSettingFragment<SettingsContactsFragment
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
index b9568a23e..498bf8f76 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
@@ -57,6 +57,7 @@ class VideoSettingsFragment : GenericSettingFragment<SettingsVideoFragmentBindin
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
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 7dfcea203..b9449e764 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
@@ -124,6 +124,7 @@ class SideMenuFragment : GenericFragment<SideMenuFragmentBinding>() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
index 987f93523..32540c3f2 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
@@ -179,6 +179,7 @@ class ChatFragment : GenericFragment<VoipChatFragmentBinding>() {
         super.onPause()
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
@@ -194,6 +195,7 @@ class ChatFragment : GenericFragment<VoipChatFragmentBinding>() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt
index 8e84b8b8c..f906cbc07 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ConferenceAddParticipantsFragment.kt
@@ -110,6 +110,7 @@ class ConferenceAddParticipantsFragment : GenericFragment<VoipConferenceParticip
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
diff --git a/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt b/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt
index 59c15ffb6..d5ca88920 100644
--- a/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt
+++ b/app/src/main/java/org/linphone/compatibility/PhoneStateListener.kt
@@ -26,6 +26,7 @@ import org.linphone.core.tools.Log
 class PhoneStateListener(private val telephonyManager: TelephonyManager) : PhoneStateInterface {
     private var gsmCallActive = false
     private val phoneStateListener = object : PhoneStateListener() {
+        @Deprecated("Deprecated in Java")
         override fun onCallStateChanged(state: Int, phoneNumber: String?) {
             gsmCallActive = when (state) {
                 TelephonyManager.CALL_STATE_OFFHOOK -> {
diff --git a/build.gradle b/build.gradle
index 2f88cd863..c879d1eab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         } // for com.github.chrisbanes:PhotoView
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath 'com.google.gms:google-services:4.3.13'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"