rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix switch to previous keyboard deprecation

Browse Source
This commit is contained in:
J-Jamet
2019-09-13 14:39:34 +02:00
parent 9331c281fe
commit 76bb1a369c
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikIME.kt
View File

@@ -27,6 +27,7 @@ import android.inputmethodservice.InputMethodService
import android.inputmethodservice.Keyboard import android.inputmethodservice.Keyboard
import android.inputmethodservice.KeyboardView import android.inputmethodservice.KeyboardView
import android.media.AudioManager import android.media.AudioManager
import android.os.Build
import android.util.Log import android.util.Log
import android.view.* import android.view.*
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
@@ -182,6 +183,24 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
} }
} }
@Suppress("DEPRECATION")
private fun switchToPreviousKeyboard() {
var imeManager: InputMethodManager? = null
try {
imeManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
switchToPreviousInputMethod()
} else {
window.window?.let { window ->
imeManager.switchToLastInputMethod(window.attributes.token)
}
}
} catch (e: Exception) {
Log.e(TAG, "Unable to switch to the previous IME", e)
imeManager?.showInputMethodPicker()
}
}
override fun onKey(primaryCode: Int, keyCodes: IntArray) { override fun onKey(primaryCode: Int, keyCodes: IntArray) {
val inputConnection = currentInputConnection val inputConnection = currentInputConnection
@@ -192,15 +211,7 @@ class MagikIME : InputMethodService(), KeyboardView.OnKeyboardActionListener {
playClick(primaryCode) playClick(primaryCode)
when (primaryCode) { when (primaryCode) {
KEY_BACK_KEYBOARD -> try { KEY_BACK_KEYBOARD -> switchToPreviousKeyboard()
val imeManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
if (window.window != null)
imeManager.switchToLastInputMethod(window.window!!.attributes.token) // TODO Deprecated
} catch (e: Exception) {
Log.e(TAG, "Unable to switch to the previous IME", e)
val imeManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
imeManager.showInputMethodPicker()
}
KEY_CHANGE_KEYBOARD -> { KEY_CHANGE_KEYBOARD -> {
val imeManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager val imeManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager