#1649 fix: show verification error if there is a network error when fetching purchases

sds100 · sds100 · commit 542045fa6388 · 2025-04-27T13:22:59.000+02:00
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/DisplayKeyMapUseCase.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/DisplayKeyMapUseCase.kt
@@ -76,10 +76,11 @@ class DisplayKeyMapUseCaseImpl(
      * This waits for the purchases to be processed with a timeout so the UI doesn't
      * say there are no purchases while it is loading.
      */
-    private val purchasesFlow: Flow<State<Set<ProductId>>> = callbackFlow {
+    private val purchasesFlow: Flow<State<Result<Set<ProductId>>>> = callbackFlow {
         try {
             val value = withTimeout(5000L) {
-                purchasingManager.purchases.filterIsInstance<State.Data<Set<ProductId>>>().first()
+                purchasingManager.purchases.filterIsInstance<State.Data<Result<Set<ProductId>>>>()
+                    .first()
             }
 
             send(value)
@@ -103,7 +104,7 @@ class DisplayKeyMapUseCaseImpl(
             isKeyMapperImeChosen = keyMapperImeHelper.isCompatibleImeChosen(),
             isDndAccessGranted = permissionAdapter.isGranted(Permission.ACCESS_NOTIFICATION_POLICY),
             isRootGranted = permissionAdapter.isGranted(Permission.ROOT),
-            purchases = purchases.dataOrNull() ?: emptySet(),
+            purchases = purchases.dataOrNull() ?: Success(emptySet()),
             showDpadImeSetupError = showDpadImeSetupError,
         )
     }
@@ -150,6 +151,8 @@ class DisplayKeyMapUseCaseImpl(
                     ProductId.FLOATING_BUTTONS,
                 ),
             )
+
+            TriggerError.PURCHASE_VERIFICATION_FAILED -> purchasingManager.refresh()
         }
     }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListScreen.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListScreen.kt
@@ -91,7 +91,9 @@ fun KeyMapList(
             Surface(modifier = modifier) {
                 if (listItems.data.isEmpty()) {
                     EmptyKeyMapList(
-                        modifier = Modifier.fillMaxSize().padding(bottom = bottomListPadding),
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(bottom = bottomListPadding),
                     )
                 } else {
                     LoadedKeyMapList(
@@ -487,6 +489,7 @@ private fun getTriggerErrorMessage(error: TriggerError): String {
         TriggerError.DPAD_IME_NOT_SELECTED -> stringResource(R.string.trigger_error_dpad_ime_not_selected)
         TriggerError.FLOATING_BUTTON_DELETED -> stringResource(R.string.trigger_error_floating_button_deleted)
         TriggerError.FLOATING_BUTTONS_NOT_PURCHASED -> stringResource(R.string.trigger_error_floating_buttons_not_purchased)
+        TriggerError.PURCHASE_VERIFICATION_FAILED -> stringResource(R.string.trigger_error_product_verification_failed)
     }
 }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/BaseConfigTriggerViewModel.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/BaseConfigTriggerViewModel.kt
@@ -27,7 +27,9 @@ import io.github.sds100.keymapper.util.Error
 import io.github.sds100.keymapper.util.Result
 import io.github.sds100.keymapper.util.State
 import io.github.sds100.keymapper.util.dataOrNull
+import io.github.sds100.keymapper.util.ifIsData
 import io.github.sds100.keymapper.util.mapData
+import io.github.sds100.keymapper.util.onSuccess
 import io.github.sds100.keymapper.util.ui.CheckBoxListItem
 import io.github.sds100.keymapper.util.ui.DialogResponse
 import io.github.sds100.keymapper.util.ui.LinkType
@@ -93,7 +95,7 @@ abstract class BaseConfigTriggerViewModel(
     private val triggerKeyShortcuts = combine(
         fingerprintGesturesSupported.isSupported,
         purchasingManager.purchases,
-    ) { isFingerprintGesturesSupported, purchases ->
+    ) { isFingerprintGesturesSupported, purchasesState ->
         val newShortcuts = mutableSetOf<ShortcutModel<TriggerKeyShortcut>>()
 
         if (isFingerprintGesturesSupported == true) {
@@ -106,25 +108,27 @@ abstract class BaseConfigTriggerViewModel(
             )
         }
 
-        if (purchases is State.Data) {
-            if (purchases.data.contains(ProductId.ASSISTANT_TRIGGER)) {
-                newShortcuts.add(
-                    ShortcutModel(
-                        icon = ComposeIconInfo.Vector(Icons.Rounded.Assistant),
-                        text = getString(R.string.trigger_key_shortcut_add_assistant),
-                        data = TriggerKeyShortcut.ASSISTANT,
-                    ),
-                )
-            }
+        purchasesState.ifIsData { result ->
+            result.onSuccess { purchases ->
+                if (purchases.contains(ProductId.ASSISTANT_TRIGGER)) {
+                    newShortcuts.add(
+                        ShortcutModel(
+                            icon = ComposeIconInfo.Vector(Icons.Rounded.Assistant),
+                            text = getString(R.string.trigger_key_shortcut_add_assistant),
+                            data = TriggerKeyShortcut.ASSISTANT,
+                        ),
+                    )
+                }
 
-            if (purchases.data.contains(ProductId.FLOATING_BUTTONS)) {
-                newShortcuts.add(
-                    ShortcutModel(
-                        icon = ComposeIconInfo.Vector(Icons.Rounded.BubbleChart),
-                        text = getString(R.string.trigger_key_shortcut_add_floating_button),
-                        data = TriggerKeyShortcut.FLOATING_BUTTON,
-                    ),
-                )
+                if (purchases.contains(ProductId.FLOATING_BUTTONS)) {
+                    newShortcuts.add(
+                        ShortcutModel(
+                            icon = ComposeIconInfo.Vector(Icons.Rounded.BubbleChart),
+                            text = getString(R.string.trigger_key_shortcut_add_floating_button),
+                            data = TriggerKeyShortcut.FLOATING_BUTTON,
+                        ),
+                    )
+                }
             }
         }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerError.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerError.kt
@@ -20,4 +20,6 @@ enum class TriggerError(val isFixable: Boolean) {
     FLOATING_BUTTON_DELETED(isFixable = false),
 
     FLOATING_BUTTONS_NOT_PURCHASED(isFixable = true),
+
+    PURCHASE_VERIFICATION_FAILED(isFixable = true),
 }
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerErrorSnapshot.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerErrorSnapshot.kt
@@ -6,6 +6,10 @@ import io.github.sds100.keymapper.mappings.keymaps.KeyMap
 import io.github.sds100.keymapper.mappings.keymaps.requiresImeKeyEventForwardingInPhoneCall
 import io.github.sds100.keymapper.purchasing.ProductId
 import io.github.sds100.keymapper.system.inputevents.InputEventUtils
+import io.github.sds100.keymapper.util.Error
+import io.github.sds100.keymapper.util.Result
+import io.github.sds100.keymapper.util.onFailure
+import io.github.sds100.keymapper.util.onSuccess
 
 /**
  * Store the data required for determining trigger errors to reduce the number of calls with
@@ -15,7 +19,7 @@ data class TriggerErrorSnapshot(
     val isKeyMapperImeChosen: Boolean,
     val isDndAccessGranted: Boolean,
     val isRootGranted: Boolean,
-    val purchases: Set<ProductId>,
+    val purchases: Result<Set<ProductId>>,
     val showDpadImeSetupError: Boolean,
 ) {
     companion object {
@@ -26,13 +30,21 @@ data class TriggerErrorSnapshot(
     }
 
     fun getTriggerError(keyMap: KeyMap, key: TriggerKey): TriggerError? {
-        if (key is AssistantTriggerKey && !purchases.contains(ProductId.ASSISTANT_TRIGGER)) {
-            return TriggerError.ASSISTANT_TRIGGER_NOT_PURCHASED
+        purchases.onSuccess { purchases ->
+            if (key is AssistantTriggerKey && !purchases.contains(ProductId.ASSISTANT_TRIGGER)) {
+                return TriggerError.ASSISTANT_TRIGGER_NOT_PURCHASED
+            }
+
+            if (key is FloatingButtonKey && !purchases.contains(ProductId.FLOATING_BUTTONS)) {
+                return TriggerError.FLOATING_BUTTONS_NOT_PURCHASED
+            }
+        }.onFailure { error ->
+            if ((key is AssistantTriggerKey || key is FloatingButtonKey) && error == Error.PurchasingError.NetworkError) {
+                return TriggerError.PURCHASE_VERIFICATION_FAILED
+            }
         }
 
-        if (key is FloatingButtonKey && !purchases.contains(ProductId.FLOATING_BUTTONS)) {
-            return TriggerError.FLOATING_BUTTONS_NOT_PURCHASED
-        } else if (key is FloatingButtonKey && key.button == null) {
+        if (key is FloatingButtonKey && key.button == null) {
             return TriggerError.FLOATING_BUTTON_DELETED
         }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKeyListItem.kt b/app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKeyListItem.kt
@@ -259,6 +259,7 @@ private fun getErrorMessage(error: TriggerError): String {
         TriggerError.DPAD_IME_NOT_SELECTED -> stringResource(R.string.trigger_error_dpad_ime_not_selected)
         TriggerError.FLOATING_BUTTON_DELETED -> stringResource(R.string.trigger_error_floating_button_deleted)
         TriggerError.FLOATING_BUTTONS_NOT_PURCHASED -> stringResource(R.string.trigger_error_floating_buttons_not_purchased)
+        TriggerError.PURCHASE_VERIFICATION_FAILED -> stringResource(R.string.trigger_error_product_verification_failed)
     }
 }
 
diff --git a/app/src/main/java/io/github/sds100/keymapper/purchasing/PurchasingManager.kt b/app/src/main/java/io/github/sds100/keymapper/purchasing/PurchasingManager.kt
@@ -7,8 +7,9 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 
 interface PurchasingManager {
     val onCompleteProductPurchase: MutableSharedFlow<ProductId>
-    val purchases: Flow<State<Set<ProductId>>>
+    val purchases: Flow<State<Result<Set<ProductId>>>>
     suspend fun launchPurchasingFlow(product: ProductId): Result<Unit>
     suspend fun getProductPrice(product: ProductId): Result<String>
     suspend fun isPurchased(product: ProductId): Result<Boolean>
+    fun refresh()
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1212,6 +1212,7 @@
     <string name="setup_assistant_trigger_text">You must read the instructions on our website that describe how to set up this trigger. Key Mapper will not guide you.</string>
     <string name="setup_assistant_trigger_read_instructions_button">Read instructions</string>
     <string name="setup_assistant_trigger_select_type_button">Select trigger type</string>
+    <string name="trigger_error_product_verification_failed">Purchase can not be verified. Do you have an internet connection?</string>
 
     <!--  Purchasing  -->
     <string name="unlock_product_button">Unlock (%s)</string>

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,11 @@ class DisplayKeyMapUseCaseImpl(`
`76`	`76`	`* This waits for the purchases to be processed with a timeout so the UI doesn't`
`77`	`77`	`* say there are no purchases while it is loading.`
`78`	`78`	`*/`
`79`		`- private val purchasesFlow: Flow<State<Set<ProductId>>> = callbackFlow {`
	`79`	`+ private val purchasesFlow: Flow<State<Result<Set<ProductId>>>> = callbackFlow {`
`80`	`80`	`try {`
`81`	`81`	`val value = withTimeout(5000L) {`
`82`		`- purchasingManager.purchases.filterIsInstance<State.Data<Set<ProductId>>>().first()`
	`82`	`+ purchasingManager.purchases.filterIsInstance<State.Data<Result<Set<ProductId>>>>()`
	`83`	`+ .first()`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`send(value)`
`@@ -103,7 +104,7 @@ class DisplayKeyMapUseCaseImpl(`
`103`	`104`	`isKeyMapperImeChosen = keyMapperImeHelper.isCompatibleImeChosen(),`
`104`	`105`	`isDndAccessGranted = permissionAdapter.isGranted(Permission.ACCESS_NOTIFICATION_POLICY),`
`105`	`106`	`isRootGranted = permissionAdapter.isGranted(Permission.ROOT),`
`106`		`- purchases = purchases.dataOrNull() ?: emptySet(),`
	`107`	`+ purchases = purchases.dataOrNull() ?: Success(emptySet()),`
`107`	`108`	`showDpadImeSetupError = showDpadImeSetupError,`
`108`	`109`	`)`
`109`	`110`	`}`
`@@ -150,6 +151,8 @@ class DisplayKeyMapUseCaseImpl(`
`150`	`151`	`ProductId.FLOATING_BUTTONS,`
`151`	`152`	`),`
`152`	`153`	`)`
	`154`	`+`
	`155`	`+ TriggerError.PURCHASE_VERIFICATION_FAILED -> purchasingManager.refresh()`
`153`	`156`	`}`
`154`	`157`	`}`
`155`	`158`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,9 @@ fun KeyMapList(`
`91`	`91`	`Surface(modifier = modifier) {`
`92`	`92`	`if (listItems.data.isEmpty()) {`
`93`	`93`	`EmptyKeyMapList(`
`94`		`- modifier = Modifier.fillMaxSize().padding(bottom = bottomListPadding),`
	`94`	`+ modifier = Modifier`
	`95`	`+ .fillMaxSize()`
	`96`	`+ .padding(bottom = bottomListPadding),`
`95`	`97`	`)`
`96`	`98`	`} else {`
`97`	`99`	`LoadedKeyMapList(`
`@@ -487,6 +489,7 @@ private fun getTriggerErrorMessage(error: TriggerError): String {`
`487`	`489`	`TriggerError.DPAD_IME_NOT_SELECTED -> stringResource(R.string.trigger_error_dpad_ime_not_selected)`
`488`	`490`	`TriggerError.FLOATING_BUTTON_DELETED -> stringResource(R.string.trigger_error_floating_button_deleted)`
`489`	`491`	`TriggerError.FLOATING_BUTTONS_NOT_PURCHASED -> stringResource(R.string.trigger_error_floating_buttons_not_purchased)`
	`492`	`+ TriggerError.PURCHASE_VERIFICATION_FAILED -> stringResource(R.string.trigger_error_product_verification_failed)`
`490`	`493`	`}`
`491`	`494`	`}`
`492`	`495`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ enum class TriggerError(val isFixable: Boolean) {`
`20`	`20`	`FLOATING_BUTTON_DELETED(isFixable = false),`
`21`	`21`
`22`	`22`	`FLOATING_BUTTONS_NOT_PURCHASED(isFixable = true),`
	`23`	`+`
	`24`	`+ PURCHASE_VERIFICATION_FAILED(isFixable = true),`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,7 @@ private fun getErrorMessage(error: TriggerError): String {`
`259`	`259`	`TriggerError.DPAD_IME_NOT_SELECTED -> stringResource(R.string.trigger_error_dpad_ime_not_selected)`
`260`	`260`	`TriggerError.FLOATING_BUTTON_DELETED -> stringResource(R.string.trigger_error_floating_button_deleted)`
`261`	`261`	`TriggerError.FLOATING_BUTTONS_NOT_PURCHASED -> stringResource(R.string.trigger_error_floating_buttons_not_purchased)`
	`262`	`+ TriggerError.PURCHASE_VERIFICATION_FAILED -> stringResource(R.string.trigger_error_product_verification_failed)`
`262`	`263`	`}`
`263`	`264`	`}`
`264`	`265`