mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Compile with SDK 37
This commit is contained in:
committed by
Benoit Marty
parent
405fd3ca0d
commit
e54d93cd50
+1
-3
@@ -207,7 +207,6 @@ class WebViewAudioManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
audioManager.mode = AudioManager.MODE_NORMAL
|
audioManager.mode = AudioManager.MODE_NORMAL
|
||||||
|
|
||||||
if (!hasRegisteredCallbacks) {
|
if (!hasRegisteredCallbacks) {
|
||||||
Timber.w("Audio: tried to disable webview in-call audio mode without registering callbacks")
|
Timber.w("Audio: tried to disable webview in-call audio mode without registering callbacks")
|
||||||
return
|
return
|
||||||
@@ -342,6 +341,7 @@ class WebViewAudioManager(
|
|||||||
} else {
|
} else {
|
||||||
// On Android 11 and lower, we don't have the concept of communication devices
|
// 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
|
// We have to call the right methods based on the device type
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
if (device != null) {
|
if (device != null) {
|
||||||
if (device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO && disableBluetoothAudioDevices) {
|
if (device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO && disableBluetoothAudioDevices) {
|
||||||
Timber.w("Bluetooth audio devices are disabled on this Android version")
|
Timber.w("Bluetooth audio devices are disabled on this Android version")
|
||||||
@@ -350,11 +350,9 @@ class WebViewAudioManager(
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
setAudioEnabled(true)
|
setAudioEnabled(true)
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
isSpeakerphoneOn = device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER
|
isSpeakerphoneOn = device.type == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER
|
||||||
isBluetoothScoOn = device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO
|
isBluetoothScoOn = device.type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO
|
||||||
} else {
|
} else {
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
isSpeakerphoneOn = false
|
isSpeakerphoneOn = false
|
||||||
isBluetoothScoOn = false
|
isBluetoothScoOn = false
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -72,6 +72,7 @@ fun View.showKeyboard(andRequestFocus: Boolean = false) {
|
|||||||
windowInsetsController?.show(WindowInsets.Type.ime())
|
windowInsetsController?.show(WindowInsets.Type.ime())
|
||||||
} else {
|
} else {
|
||||||
val imm = context?.getSystemService<InputMethodManager>()
|
val imm = context?.getSystemService<InputMethodManager>()
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
|
imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,14 +61,14 @@ object Versions {
|
|||||||
* Compile SDK version. Must be updated when a new Android version is released.
|
* Compile SDK version. Must be updated when a new Android version is released.
|
||||||
* When updating COMPILE_SDK, please also update BUILD_TOOLS_VERSION.
|
* 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.
|
* Build tools version. Must be kept in sync with COMPILE_SDK.
|
||||||
* The value is used by the release script.
|
* The value is used by the release script.
|
||||||
*/
|
*/
|
||||||
@Suppress("unused")
|
@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.
|
* Target SDK version. Should be kept up to date with COMPILE_SDK.
|
||||||
|
|||||||
Reference in New Issue
Block a user