Show additional information on device verification fail

Author: niranjan94

app/build.gradle

@@ -145,6 +145,7 @@ android {
             buildConfigField "Boolean", "EXTENDED_VALIDATION", "true"
         }
         debug {
+            buildConfigField "Boolean", "EXTENDED_VALIDATION", props.getProperty("debugExtendedValidation", "false")
             minifyEnabled props.getProperty("minifyEnabled", "true") == "true"
             shrinkResources props.getProperty("shrinkResources", "true") == "true"
             testProguardFile "test-proguard-rules.pro"

app/src/main/kotlin/com/njlabs/showjava/activities/purchase/PurchaseActivity.kt

@@ -60,11 +60,23 @@ class PurchaseActivity : BaseActivity() {
                     }
                 }
             },
-            { // Do not allow
+            { err, app ->// Do not allow
                 runOnUiThread {
                     isLoading(false)
                     buyButton.visibility = View.GONE
-                    Toast.makeText(context, R.string.deviceVerificationFailed, Toast.LENGTH_SHORT).show()
+                    if (app != null) {
+                        Toast.makeText(
+                            context,
+                            getString(R.string.deviceVerificationFailedPirateApp, "${app.name} (${app.packageName})"),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    } else {
+                        Toast.makeText(
+                            context,
+                            getString(R.string.deviceVerificationFailed, err.name),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
                 }
             },
             { // On Error

app/src/main/kotlin/com/njlabs/showjava/utils/secure/SecureUtils.kt

@@ -26,6 +26,8 @@ import com.android.volley.Response
 import com.android.volley.toolbox.JsonObjectRequest
 import com.github.javiersantos.piracychecker.*
 import com.github.javiersantos.piracychecker.enums.InstallerID
+import com.github.javiersantos.piracychecker.enums.PiracyCheckerError
+import com.github.javiersantos.piracychecker.enums.PirateApp
 import com.njlabs.showjava.BuildConfig
 import com.njlabs.showjava.utils.RequestQueue
 import com.njlabs.showjava.utils.SingletonHolder
@@ -59,7 +61,7 @@ class SecureUtils(val context: Context) {
         return preferences as SecurePreferences
     }
 
-    fun isSafeExtended(allow: (() -> Unit), doNotAllow: (() -> Unit), onError: (() -> Unit)) {
+    fun isSafeExtended(allow: (() -> Unit), doNotAllow: ((PiracyCheckerError, PirateApp?) -> Unit), onError: (() -> Unit)) {
         Timber.d("[pa] isSafeExtended")
         context.piracyChecker {
             enableGooglePlayLicensing(BuildConfig.PLAY_LICENSE_KEY)
@@ -71,7 +73,7 @@ class SecureUtils(val context: Context) {
             callback {
                 doNotAllow { a, b ->
                     Timber.d("[isSafeExtended][doNotAllow] ${a.name} $b")
-                    doNotAllow()
+                    doNotAllow(a, b)
                 }
                 allow { allow() }
                 onError {

app/src/main/res/values/strings.xml

@@ -157,7 +157,14 @@
     <string name="purchaseVerificationFailed">Purchase verification failed. Please try again. If issue persists, drop in an email at me\@niranjan.io</string>
     <string name="purchaseSuccess">Thank you for purchasing Show Java Pro ! :) You are awesome !</string>
     <string name="purchaseInitError">An error occurred while initializing purchase. Please try again later.</string>
-    <string name="deviceVerificationFailed">Device failed the verification for making in-app purchases on Show Java.</string>
+    <string name="deviceVerificationFailed">
+        Device failed the verification for making in-app purchases on Show Java.
+        (<xliff:g example="PIRATE_APP_CHECK" id="errorName">%1$s</xliff:g>)
+    </string>
+    <string name="deviceVerificationFailedPirateApp">
+        You cannot make in-app purchases on Show Java due to the presence of the app <xliff:g example="Lucky Patcher" id="appName">%1$s</xliff:g>
+        which is flagged as one that is used for piracy.
+    </string>
     <string name="adPreferences">Ads Preferences</string>
     <string name="adPreferencesSummary">Change your personalization preferences for Ads</string>
     <string name="initializing">Initializing</string>