fix: ensure we unregister the activity comparing by name

fix: use also onResume/onPause to register/unregister the activity
aitorvs · Feb 28, 2016 · 9967f3c · 9967f3c
1 parent 9e92aa9
commit 9967f3c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/library/src/main/java/com/aitorvs/android/allowme/AllowMe.java b/library/src/main/java/com/aitorvs/android/allowme/AllowMe.java
@@ -64,7 +64,10 @@ public static void registerActivity(@NonNull Activity activity) {
     }
 
     public static void unregisterActivity(@NonNull Activity activity) {
-        if (activity == getInstance().mActivity) {
+        //noinspection ConstantConditions
+        if (getInstance().mActivity == null || activity == null) {
+            Log.w(TAG, "Trying to unregister null activity");
+        }else if (activity.getClass().getName().equals(getInstance().mActivity.getClass().getName())) {
             getInstance().mActivity = null;
         } else {
             Log.w(TAG, "unregisterActivity: Old activity is trying to unregister");
@@ -75,7 +78,7 @@ public static void unregisterActivity(@NonNull Activity activity) {
     private static Activity safeActivity() {
         Activity activity = getInstance().mActivity;
         if (activity == null) {
-            throw new IllegalStateException("Activity not registered");
+            throw new IllegalStateException("Ooops!! Activity not registered (?)");
         }
 
         return activity;

diff --git a/library/src/main/java/com/aitorvs/android/allowme/AllowMeActivity.java b/library/src/main/java/com/aitorvs/android/allowme/AllowMeActivity.java
@@ -30,12 +30,28 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
+        // on visible
         AllowMe.registerActivity(this);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        // on  begin interaction
+        AllowMe.registerActivity(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        // on stop interaction
+        AllowMe.unregisterActivity(this);
+    }
+
     @Override
     protected void onStop() {
         super.onStop();
+        // on invisible
         AllowMe.unregisterActivity(this);
     }