Fix assist structure for old device

This commit is contained in:
J-Jamet
2019-08-06 19:23:20 +02:00
parent a50626dafb
commit 0c8fdca6f3

View File

@@ -26,14 +26,14 @@ object EntrySelectionHelper {
standardAction: () -> Unit, standardAction: () -> Unit,
keyboardAction: () -> Unit, keyboardAction: () -> Unit,
autofillAction: (assistStructure: AssistStructure) -> Unit) { autofillAction: (assistStructure: AssistStructure) -> Unit) {
var assistStructure: AssistStructure? = null var assistStructureInit = false
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
assistStructure = AutofillHelper.retrieveAssistStructure(intent) AutofillHelper.retrieveAssistStructure(intent)?.let { assistStructure ->
assistStructure?.let {
autofillAction.invoke(assistStructure) autofillAction.invoke(assistStructure)
assistStructureInit = true
} }
} }
if (assistStructure == null) { if (!assistStructureInit) {
if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) { if (intent.getBooleanExtra(EXTRA_ENTRY_SELECTION_MODE, DEFAULT_ENTRY_SELECTION_MODE)) {
intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE) intent.removeExtra(EXTRA_ENTRY_SELECTION_MODE)
keyboardAction.invoke() keyboardAction.invoke()