fix for android crash (#35)

* fix for android crash

For some reason, a recent commit removed the check for a null return
from `getCurrentActivity()`. But since `getCurrentActivity()` might return
null, the app will crash with a NullPointerException.

This restores the null check.

It also fixes inconsistent handling of null `tag` argument in both
iOS and Android. This does not affect usage from JS because the JS
interface will not pass null to that argument; however other native
code could still call these methods and pass null for `tag`.

* remove unnecessary parens

---------

Co-authored-by: Marc Shilling <marcshilling@gmail.com>

Author: heath-clink

android/src/main/java/com/marcshilling/idletimer/IdleTimerManager.java

@@ -29,10 +29,12 @@ public String getName() {
     @ReactMethod
     public void setIdleTimerDisabled(final boolean disabled, final String tag) {
         final Activity activity = this.getCurrentActivity();
-        if (disabled) {
-            activate(activity, tag);
-        } else {
-            deactivate(activity, tag);
+        if (activity != null) {
+            if (disabled) {
+                activate(activity, tag);
+            } else {
+                deactivate(activity, tag);
+            }
         }
     }
 
@@ -42,15 +44,15 @@ public static void activate(@NotNull final Activity activity, final String tag)
                 activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             });
         }
-        tags.add((tag == null ? "" : tag));
+        tags.add(tag == null ? "" : tag);
     }
 
     public static void deactivate(@NotNull final Activity activity, final String tag) {
-        if (tags.size() == 1 && tags.contains((tag))) {
+        if (tags.size() == 1 && tags.contains(tag == null ? "" : tag)) {
             activity.runOnUiThread(() -> {
                 activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             });
         }
-        tags.remove((tag == null ? "" : tag));
+        tags.remove(tag == null ? "" : tag);
     }
 }

ios/RNIdleTimer/IdleTimerManager.m

@@ -32,7 +32,7 @@ + (void)activate:(NSString*)tag {
 }
 
 + (void)deactivate:(NSString*)tag {
-    if ([tags count] == 1 && [tags containsObject:tag]) {
+    if ([tags count] == 1 && [tags containsObject:tag ?: @""]) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [UIApplication sharedApplication].idleTimerDisabled = NO;
         });