Bumped dependencies & added missing deprecated annotations

2022-08-22 09:53:34 +02:00 · 2022-08-22 09:53:34 +02:00 · f125b54b40
commit f125b54b40
parent 4ec5e2452a
22 changed files with 30 additions and 6 deletions
--- 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'
--- 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>,
--- 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>,
--- 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>,
--- 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,
--- 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,
--- 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>,
--- 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 {
--- 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>,
--- 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>,
--- 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 {
--- 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>,
--- 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>,
--- 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>,
--- 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>,
--- 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>,
--- 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>,
--- 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 {
--- 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>,
--- 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>,
--- 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 -> {
--- 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"