Fix callback when AppType is OTHER

javiersantos · Feb 25, 2018 · ebbd5d2 · ebbd5d2
1 parent c324a2e
commit ebbd5d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java b/library/src/main/java/com/github/javiersantos/piracychecker/LibraryUtils.java
@@ -88,7 +88,7 @@ static boolean verifyInstallerId(Context context, List<InstallerID> installerID)
     @SuppressLint("SdCardPath")
     static PirateApp getPirateApp(Context context, boolean lpf, boolean stores, boolean folders,
                                   ArrayList<PirateApp> extraApps) {
-        if (!lpf && !stores) return null;
+        if (!lpf && !stores && extraApps.isEmpty()) return null;
         for (PirateApp app : getApps(extraApps)) {
             if ((lpf && app.getType() == AppType.PIRATE) || (stores && app.getType() == AppType.STORE) || app.getType() == AppType.OTHER) {
                 String pack = app.getPackage();

diff --git a/library/src/main/java/com/github/javiersantos/piracychecker/PiracyChecker.java b/library/src/main/java/com/github/javiersantos/piracychecker/PiracyChecker.java
@@ -64,7 +64,7 @@ public class PiracyChecker {
     private String signature;
     private List<InstallerID> installerIDs;
     private PiracyCheckerCallback callback;
-    private ArrayList<PirateApp> extraApps = new ArrayList<>();
+    private ArrayList<PirateApp> extraApps;
 
     // LVL
     private LibraryChecker libraryLVLChecker;
@@ -82,6 +82,7 @@ public PiracyChecker(Context context, String title, String description) {
         this.unlicensedDialogDescription = description;
         this.display = Display.DIALOG;
         this.installerIDs = new ArrayList<>();
+        this.extraApps = new ArrayList<>();
         this.colorPrimary = R.color.colorPrimary;
         this.colorPrimaryDark = R.color.colorPrimaryDark;
     }
@@ -390,9 +391,9 @@ private void doExtraVerification(PiracyCheckerCallback verifyCallback,
                     preferences.edit().putBoolean(preferenceSaveResult, false).apply();
                 if (preferences != null && blockUnauthorized && app.getType() == AppType.PIRATE)
                     preferences.edit().putBoolean(preferenceBlockUnauthorized, true).apply();
-                verifyCallback.dontAllow(app.getType() == AppType.PIRATE
-                                         ? PiracyCheckerError.PIRATE_APP_INSTALLED
-                                         : PiracyCheckerError.THIRD_PARTY_STORE_INSTALLED, app);
+                verifyCallback.dontAllow(app.getType() == AppType.STORE
+                                         ? PiracyCheckerError.THIRD_PARTY_STORE_INSTALLED
+                                         : PiracyCheckerError.PIRATE_APP_INSTALLED, app);
             } else {
                 if (preferences != null && saveToSharedPreferences)
                     preferences.edit().putBoolean(preferenceSaveResult, true).apply();
@@ -404,9 +405,9 @@ private void doExtraVerification(PiracyCheckerCallback verifyCallback,
                     preferences.edit().putBoolean(preferenceSaveResult, false).apply();
                 if (preferences != null && blockUnauthorized && app.getType() == AppType.PIRATE)
                     preferences.edit().putBoolean(preferenceBlockUnauthorized, true).apply();
-                verifyCallback.dontAllow(app.getType() == AppType.PIRATE
-                                         ? PiracyCheckerError.PIRATE_APP_INSTALLED
-                                         : PiracyCheckerError.THIRD_PARTY_STORE_INSTALLED, app);
+                verifyCallback.dontAllow(app.getType() == AppType.STORE
+                                         ? PiracyCheckerError.THIRD_PARTY_STORE_INSTALLED
+                                         : PiracyCheckerError.PIRATE_APP_INSTALLED, app);
             } else {
                 if (preferences != null && saveToSharedPreferences)
                     preferences.edit().putBoolean(preferenceSaveResult, false).apply();