Merge pull request #174 from TeamAmaze/bugfix/purchase-flow

Fixing purchase flow crash
TeamAmaze · Jul 14, 2024 · 34f554f · 34f554f
2 parents 1eaf9c2 + 9e8746a
commit 34f554f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 40 deletions.
diff --git a/app/src/main/java/com/amaze/fileutilities/PermissionsActivity.kt b/app/src/main/java/com/amaze/fileutilities/PermissionsActivity.kt
@@ -165,29 +165,29 @@ open class PermissionsActivity :
         if (VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             try {
                 isFound = (
-                        ActivityCompat.checkSelfPermission(
-                            this, Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
-                        )
-                                == PackageManager.PERMISSION_GRANTED
-                        ) || (
-                        ActivityCompat.checkSelfPermission(
-                            this, Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
-                        )
+                    ActivityCompat.checkSelfPermission(
+                        this, Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
+                    )
+                        == PackageManager.PERMISSION_GRANTED
+                    ) || (
+                    ActivityCompat.checkSelfPermission(
+                        this, Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
+                    )
 
-                                == PackageManager.PERMISSION_GRANTED
-                        ) || Environment.isExternalStorageManager()
+                        == PackageManager.PERMISSION_GRANTED
+                    ) || Environment.isExternalStorageManager()
             } catch (anfe: ActivityNotFoundException) {
-                log.warn("all files access permission activity missing, fallback to default",anfe)
+                log.warn("all files access permission activity missing, fallback to default", anfe)
             }
         }
         if (!isFound) {
             isFound = (
-                    ActivityCompat.checkSelfPermission(
-                        this,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    )
-                            == PackageManager.PERMISSION_GRANTED
-                    )
+                ActivityCompat.checkSelfPermission(
+                    this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+                )
+                    == PackageManager.PERMISSION_GRANTED
+                )
         }
         return isFound
     }

diff --git a/app/src/main/java/com/amaze/fileutilities/home_page/WelcomePermissionScreen.kt b/app/src/main/java/com/amaze/fileutilities/home_page/WelcomePermissionScreen.kt
@@ -151,29 +151,29 @@ abstract class WelcomePermissionScreen :
         if (VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             try {
                 isFound = (
-                        ActivityCompat.checkSelfPermission(
-                            this, Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
-                        )
-                                == PackageManager.PERMISSION_GRANTED
-                        ) || (
-                        ActivityCompat.checkSelfPermission(
-                            this, Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
-                        )
+                    ActivityCompat.checkSelfPermission(
+                        this, Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION
+                    )
+                        == PackageManager.PERMISSION_GRANTED
+                    ) || (
+                    ActivityCompat.checkSelfPermission(
+                        this, Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION
+                    )
 
-                                == PackageManager.PERMISSION_GRANTED
-                        ) || Environment.isExternalStorageManager()
+                        == PackageManager.PERMISSION_GRANTED
+                    ) || Environment.isExternalStorageManager()
             } catch (anfe: ActivityNotFoundException) {
-                log.warn("all files access permission activity missing, fallback to default",anfe)
+                log.warn("all files access permission activity missing, fallback to default", anfe)
             }
         }
         if (!isFound) {
             isFound = (
-                    ActivityCompat.checkSelfPermission(
-                        this,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    )
-                            == PackageManager.PERMISSION_GRANTED
-                    )
+                ActivityCompat.checkSelfPermission(
+                    this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+                )
+                    == PackageManager.PERMISSION_GRANTED
+                )
         }
         return isFound
     }

diff --git a/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt b/app/src/play/java/com/amaze/fileutilities/home_page/ui/options/Billing.kt
@@ -163,7 +163,11 @@ class Billing(val context: Context, private var uniqueId: String) :
                 response.responseCode,
                 purchases?.size,
             )
-            activity.getString(R.string.operation_failed).let { activity.showToastInCenter(it) }
+            if (::activity.isInitialized && !activity.isFinishing &&
+                !activity.isDestroyed
+            ) {
+                activity.getString(R.string.operation_failed).let { activity.showToastInCenter(it) }
+            }
         }
     }
 
@@ -226,7 +230,9 @@ class Billing(val context: Context, private var uniqueId: String) :
                 } catch (e: Exception) {
                     log.warn("failed to update subscription state for trial validation", e)
                 }
-                if (!activity.isFinishing && !activity.isDestroyed) {
+                if (::activity.isInitialized && !activity.isFinishing &&
+                    !activity.isDestroyed
+                ) {
                     activity.runOnUiThread {
                         purchaseDialog?.dismiss()
                         Utils.buildSubscriptionPurchasedDialog(activity).show()
@@ -241,7 +247,11 @@ class Billing(val context: Context, private var uniqueId: String) :
                     purchaseToken,
                 )
                 activity.getString(R.string.operation_failed).let {
-                    activity.showToastInCenter(it)
+                    if (::activity.isInitialized && !activity.isFinishing &&
+                        !activity.isDestroyed
+                    ) {
+                        activity.showToastInCenter(it)
+                    }
                 }
             }
         }
@@ -486,8 +496,12 @@ class Billing(val context: Context, private var uniqueId: String) :
             val billingFlowParams = BillingFlowParams.newBuilder().setProductDetailsParamsList(
                 listOf(productDetailsParams)
             ).build()
-            activity.let {
-                billingClient.launchBillingFlow(it, billingFlowParams)
+            if (::activity.isInitialized && !activity.isFinishing &&
+                !activity.isDestroyed
+            ) {
+                activity.let {
+                    billingClient.launchBillingFlow(it, billingFlowParams)
+                }
             }
         }
 
@@ -550,7 +564,9 @@ class Billing(val context: Context, private var uniqueId: String) :
      *
      *
      */
-        if (!activity.isFinishing && !activity.isDestroyed) {
+        if (::activity.isInitialized && !activity.isFinishing &&
+            !activity.isDestroyed
+        ) {
             activity.runOnUiThread {
                 val dialogBuilder = AlertDialog.Builder(activity, R.style.Custom_Dialog_Dark)
                     .setTitle(R.string.subscribe)