Merge branch 'develop'

Author: sds100

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [3.2.1](https://github.com/sds100/KeyMapper/releases/tag/v3.2.1)
+
+#### 03 Sept 2025
+
+## Bug fixes
+
+- Do not crash when cancelling purchase
+
 ## [3.2.0](https://github.com/sds100/KeyMapper/releases/tag/v3.2.0)
 
 #### 02 Sept 2025

app/version.properties

@@ -1,3 +1,3 @@
-VERSION_NAME=3.2.0
-VERSION_CODE=131
+VERSION_NAME=3.2.1
+VERSION_CODE=132
 VERSION_NUM=0

base/src/main/java/io/github/sds100/keymapper/base/utils/ErrorUtils.kt

@@ -2,6 +2,8 @@ package io.github.sds100.keymapper.base.utils
 
 import android.content.pm.PackageManager
 import io.github.sds100.keymapper.base.R
+import io.github.sds100.keymapper.base.purchasing.ProductId
+import io.github.sds100.keymapper.base.purchasing.PurchasingError
 import io.github.sds100.keymapper.base.utils.ui.ResourceProvider
 import io.github.sds100.keymapper.common.utils.BuildUtils
 import io.github.sds100.keymapper.common.utils.KMError
@@ -173,6 +175,39 @@ fun KMError.getFullMessage(resourceProvider: ResourceProvider): String {
         KMError.InvalidBackup -> resourceProvider.getString(R.string.error_invalid_backup)
         KMError.MalformedUrl -> resourceProvider.getString(R.string.error_malformed_url)
         KMError.UiElementNotFound -> resourceProvider.getString(R.string.error_ui_element_not_found)
+
+        PurchasingError.PurchasingProcessError.Cancelled -> resourceProvider.getString(
+            R.string.purchasing_error_cancelled,
+        )
+
+        PurchasingError.PurchasingProcessError.NetworkError -> resourceProvider.getString(
+            R.string.purchasing_error_network,
+        )
+
+        PurchasingError.PurchasingProcessError.ProductNotFound -> resourceProvider.getString(
+            R.string.purchasing_error_product_not_found,
+        )
+
+        PurchasingError.PurchasingProcessError.StoreProblem -> resourceProvider.getString(
+            R.string.purchasing_error_store_problem,
+        )
+
+        PurchasingError.PurchasingProcessError.PaymentPending -> resourceProvider.getString(
+            R.string.purchasing_error_payment_pending,
+        )
+
+        PurchasingError.PurchasingProcessError.PurchaseInvalid -> resourceProvider.getString(
+            R.string.purchasing_error_purchase_invalid,
+        )
+
+        is PurchasingError.PurchasingProcessError.Unexpected -> message
+
+        is PurchasingError.ProductNotPurchased -> when (product) {
+            ProductId.ASSISTANT_TRIGGER -> resourceProvider.getString(R.string.purchasing_error_assistant_not_purchased_home_screen)
+            ProductId.FLOATING_BUTTONS -> resourceProvider.getString(R.string.purchasing_error_floating_buttons_not_purchased_home_screen)
+        }
+
+        PurchasingError.PurchasingNotImplemented -> resourceProvider.getString(R.string.purchasing_error_not_implemented)
         else -> throw IllegalArgumentException("Unknown error $this")
     }
 }