Remove unused method and add javadoc

appaloosa-store · Jun 3, 2015 · b3b5f45 · b3b5f45
1 parent e270b25
commit b3b5f45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/app/src/main/java/appaloosa_store/com/appaloosa_android_tools/Appaloosa.java b/app/src/main/java/appaloosa_store/com/appaloosa_android_tools/Appaloosa.java
@@ -107,10 +107,16 @@ public static void autoUpdateWithMessage(Activity activity, String title, String
         AppaloosaAutoUpdate.getInstance().autoUpdate(activity, true, title, message);
     }
 
+    /**
+     * This method closes your application.
+     * @param activity The current activity.
+     */
     public static void closeApplication(Activity activity) {
-        Intent intent = new Intent(activity, CloseAndCleanActivity.class)
-                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        activity.startActivity(intent);
+        if (activity != null && !activity.isFinishing()) {
+            Intent intent = new Intent(activity, CloseAndCleanActivity.class)
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            activity.startActivity(intent);
+        }
     }
 
     /**

diff --git a/app/src/main/java/appaloosa_store/com/appaloosa_android_tools/tools/AppaloosaBlacklist.java b/app/src/main/java/appaloosa_store/com/appaloosa_android_tools/tools/AppaloosaBlacklist.java
@@ -10,7 +10,6 @@
 import appaloosa_store.com.appaloosa_android_tools.tools.services.blacklist.CheckBlacklistService;
 
 public class AppaloosaBlacklist {
-    private Activity blacklistActivity;
 
     private static AppaloosaBlacklist instance;
 
@@ -26,13 +25,6 @@ public void checkBlacklist(ApplicationAuthorizationInterface listeningActivity)
             Log.e(Appaloosa.APPALOOSA_LOG_TAG, Appaloosa.getApplicationContext().getString(R.string.not_an_activity));
             return;
         }
-        this.blacklistActivity = (Activity) listeningActivity;
         CheckBlacklistService.checkBlacklist(listeningActivity);
     }
-
-    public void finishActivity() {
-        if(this.blacklistActivity != null) {
-            this.blacklistActivity.finish();
-        }
-    }
 }
diff --git a/...osa_store/com/appaloosa_android_tools/tools/services/blacklist/CheckBlacklistService.java b/...osa_store/com/appaloosa_android_tools/tools/services/blacklist/CheckBlacklistService.java
@@ -17,7 +17,6 @@
 import java.io.OutputStreamWriter;
 
 import appaloosa_store.com.appaloosa_android_tools.Appaloosa;
-import appaloosa_store.com.appaloosa_android_tools.tools.AppaloosaBlacklist;
 import appaloosa_store.com.appaloosa_android_tools.tools.interfaces.ApplicationAuthorizationInterface;
 import appaloosa_store.com.appaloosa_android_tools.tools.models.ApplicationAuthorization;
 
@@ -66,7 +65,6 @@ private static void informActivityItIsNotAllowed(ApplicationAuthorizationInterfa
         authorization.setMessage(Appaloosa.getApplicationContext().getString(R.string.missing_store_params));
 
         authorizationInterface.isNotAuthorized(authorization);
-        AppaloosaBlacklist.getInstance().finishActivity();
     }
 
     private static void informActivityOfAuthorization(ApplicationAuthorizationInterface authorizationInterface,