Merge pull request martincik#33 from bourgois/fix-issue-32

Fix issue martincik#32 Activity Null error
Voxist · Aug 23, 2016 · 25f65e1 · 25f65e1
2 parents e2d5cca + 224a447
commit 25f65e1
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/android/src/main/java/com/slowpath/hockeyapp/RNHockeyAppModule.java b/android/src/main/java/com/slowpath/hockeyapp/RNHockeyAppModule.java
@@ -72,7 +72,11 @@ public void configure(String token, Boolean autoSend, int apiAuthType, String se
   public void start() {
 
     Activity currentActivity = getCurrentActivity();
-
+    if (currentActivity == null) {
+        // The currentActivity can be null if it is backgrounded / destroyed, so we simply
+        // no-op to prevent any null pointer exceptions.
+        return;
+    }
     if (_initialized) {
       FeedbackManager.register(currentActivity, _token, null);
 
@@ -112,6 +116,11 @@ public void start() {
   @ReactMethod
   public void checkForUpdate() {
     Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null) {
+        // The currentActivity can be null if it is backgrounded / destroyed, so we simply
+        // no-op to prevent any null pointer exceptions.
+        return;
+    }
     if (_initialized) {
       UpdateManager.register(currentActivity, _token);
     }
@@ -120,6 +129,11 @@ public void checkForUpdate() {
   @ReactMethod
   public void feedback() {
     Activity currentActivity = getCurrentActivity();
+    if (currentActivity == null) {
+        // The currentActivity can be null if it is backgrounded / destroyed, so we simply
+        // no-op to prevent any null pointer exceptions.
+        return;
+    }
     if (_initialized) {
       currentActivity.runOnUiThread(new Runnable() {
         private Activity currentActivity;