diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt index 2313028f94..e68e57118b 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/WebViewAudioManager.kt @@ -207,7 +207,6 @@ class WebViewAudioManager( } audioManager.mode = AudioManager.MODE_NORMAL - if (!hasRegisteredCallbacks) { Timber.w("Audio: tried to disable webview in-call audio mode without registering callbacks") return @@ -342,6 +341,7 @@ class WebViewAudioManager( } else { // On Android 11 and lower, we don't have the concept of communication devices // We have to call the right methods based on the device type + @Suppress("DEPRECATION") if (device != null) { if (device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO && disableBluetoothAudioDevices) { Timber.w("Bluetooth audio devices are disabled on this Android version") @@ -350,11 +350,9 @@ class WebViewAudioManager( return } setAudioEnabled(true) - @Suppress("DEPRECATION") isSpeakerphoneOn = device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER isBluetoothScoOn = device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO } else { - @Suppress("DEPRECATION") isSpeakerphoneOn = false isBluetoothScoOn = false } diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt index 5f19cba136..2d63f12f2e 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt @@ -72,6 +72,7 @@ fun View.showKeyboard(andRequestFocus: Boolean = false) { windowInsetsController?.show(WindowInsets.Type.ime()) } else { val imm = context?.getSystemService() + @Suppress("DEPRECATION") imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT) } } diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index 2951850902..d8dbf54903 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -61,14 +61,14 @@ object Versions { * Compile SDK version. Must be updated when a new Android version is released. * When updating COMPILE_SDK, please also update BUILD_TOOLS_VERSION. */ - const val COMPILE_SDK = 36 + const val COMPILE_SDK = 37 /** * Build tools version. Must be kept in sync with COMPILE_SDK. * The value is used by the release script. */ @Suppress("unused") - private const val BUILD_TOOLS_VERSION = "36.0.0" + private const val BUILD_TOOLS_VERSION = "37.0.0" /** * Target SDK version. Should be kept up to date with COMPILE_SDK.