#1274 feat: show dialog if an error is encountered while purchasing

keymapperorg · Nov 7, 2024 · 5b232f2 · 5b232f2
1 parent 48aac71
commit 5b232f2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/app/src/main/java/io/github/sds100/keymapper/util/ErrorUtils.kt b/app/src/main/java/io/github/sds100/keymapper/util/ErrorUtils.kt
@@ -141,6 +141,12 @@ fun Error.getFullMessage(resourceProvider: ResourceProvider) = when (this) {
     Error.CantDetectKeyEventsInPhoneCall -> resourceProvider.getString(R.string.trigger_error_cant_detect_in_phone_call_explanation)
     Error.GestureStrokeCountTooHigh -> resourceProvider.getString(R.string.trigger_error_gesture_stroke_count_too_high)
     Error.GestureDurationTooHigh -> resourceProvider.getString(R.string.trigger_error_gesture_duration_too_high)
+
+    Error.PurchasingError.Cancelled -> resourceProvider.getString(R.string.purchasing_error_cancelled)
+    Error.PurchasingError.NetworkError -> resourceProvider.getString(R.string.purchasing_error_network)
+    Error.PurchasingError.ProductNotFound -> resourceProvider.getString(R.string.purchasing_error_product_not_found)
+    Error.PurchasingError.StoreProblem -> resourceProvider.getString(R.string.purchasing_error_store_problem)
+    is Error.PurchasingError.Unexpected -> this.message
 }
 
 val Error.isFixable: Boolean

diff --git a/app/src/main/java/io/github/sds100/keymapper/util/Result.kt b/app/src/main/java/io/github/sds100/keymapper/util/Result.kt
@@ -120,6 +120,18 @@ sealed class Error : Result<Nothing>() {
 
     data object ShizukuNotStarted : Error()
     data object CantDetectKeyEventsInPhoneCall : Error()
+
+    sealed class PurchasingError : Error() {
+        data object ProductNotFound : PurchasingError()
+        data object Cancelled : PurchasingError()
+        data object StoreProblem : PurchasingError()
+        data object NetworkError : PurchasingError()
+
+        /**
+         * This handles errors that haven't been
+         */
+        data class Unexpected(val message: String) : PurchasingError()
+    }
 }
 
 inline fun <T> Result<T>.onSuccess(f: (T) -> Unit): Result<T> {
@@ -156,6 +168,15 @@ inline infix fun <T> Result<T>.otherwise(f: (error: Error) -> Result<T>) =
         is Error -> f(this)
     }
 
+inline fun <T, U> Result<T>.resolve(
+    onSuccess: (value: T) -> U,
+    onFailure: (error: Error) -> U,
+) =
+    when (this) {
+        is Success -> onSuccess(this.value)
+        is Error -> onFailure(this)
+    }
+
 inline infix fun <T> Result<T>.valueIfFailure(f: (error: Error) -> T): T =
     when (this) {
         is Success -> this.value

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1382,5 +1382,16 @@
     <string name="advanced_triggers_sheet_text">The developer doesn\'t believe ads are a sustainable or user-friendly form of monetization so these paid triggers help support development ❤️. You will be given priority support as well.</string>
     <string name="assistant_trigger_product_title">Assistant trigger</string>
     <string name="assistant_trigger_product_description">Did you know you can remap your device assistant? Instead of launching Google Assistant or Bixby, your device can perform an action of your choice. It works even when the screen is off!</string>
+
+    <!--  Purchasing  -->
     <string name="unlock_product_button">Unlock (%s)</string>
+    <string name="use_product_button">Use</string>
+    <string name="loading_product_button">Loading…</string>
+    <string name="retry_loading_price_button">Retry fetching price</string>
+    <string name="purchasing_error_cancelled">Purchase cancelled.</string>
+    <string name="purchasing_error_network">Network error encountered. Do you have an internet connection?</string>
+    <string name="purchasing_error_product_not_found">This product was not found.</string>
+    <string name="purchasing_error_store_problem">Google Play encountered an error.</string>
+    <string name="purchasing_error_dialog_title">Something went wrong 😕</string>
+    <string name="purchasing_error_dialog_button_retry">Retry</string>
 </resources>
diff --git a/...pper/actions/GetActionErrorUseCaseTest.kt → ...per/actions/GetActionFailedUseCaseTest.kt b/...pper/actions/GetActionErrorUseCaseTest.kt → ...per/actions/GetActionFailedUseCaseTest.kt
@@ -27,7 +27,7 @@ import org.mockito.kotlin.whenever
 
 @ExperimentalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
-class GetActionErrorUseCaseTest {
+class GetActionFailedUseCaseTest {
 
     private val testDispatcher = StandardTestDispatcher()
     private val testScope = TestScope(testDispatcher)

diff --git a/app/src/test/java/io/github/sds100/keymapper/mappings/keymaps/ConfigTriggerViewModelTest.kt b/app/src/test/java/io/github/sds100/keymapper/mappings/keymaps/ConfigTriggerViewModelTest.kt
@@ -79,6 +79,7 @@ class ConfigTriggerViewModelTest {
                 onBlocking { getTriggerErrors(any()) }.thenReturn(emptyList())
             },
             fakeResourceProvider,
+            purchasingManager = mock(),
         )
     }