Implement null check for GcmReceiverUIForeground

VictorAlbertos · Apr 21, 2016 · 54fefb6 · 54fefb6
1 parent be55aaa
commit 54fefb6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Add RxGcm dependency and Google Services plugin to project level build.gradle.
 apply plugin: 'com.google.gms.google-services'
 
 dependencies {
-    compile 'com.github.VictorAlbertos:RxGcm:0.2.1'
+    compile 'com.github.VictorAlbertos:RxGcm:0.2.2'
     compile 'io.reactivex:rxjava:1.1.0'
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -35,6 +35,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        targetCompatibility 1.8
+        sourceCompatibility 1.8
+    }
 }
 
 dependencies {

diff --git a/rx_gcm/src/main/java/rx_gcm/internal/GetGcmReceiversUIForeground.java b/rx_gcm/src/main/java/rx_gcm/internal/GetGcmReceiversUIForeground.java
@@ -54,10 +54,12 @@ Wrapper retrieve(String screenName, Activity activity){
                 if(fragment != null && isVisible(fragment) && fragment instanceof GcmReceiverUIForeground) {
                     GcmReceiverUIForeground gcmReceiverUIForeground = (GcmReceiverUIForeground) fragment;
 
-                    boolean targetScreen = gcmReceiverUIForeground.target().equals(screenName);
-                    receiverCandidate = new Wrapper(gcmReceiverUIForeground, targetScreen);
+                    String target = gcmReceiverUIForeground.target() != null ? gcmReceiverUIForeground.target() : "";
 
-                    if (targetScreen) return receiverCandidate;
+                    boolean isTargetScreen = target.equals(screenName);
+                    receiverCandidate = new Wrapper(gcmReceiverUIForeground, isTargetScreen);
+
+                    if (isTargetScreen) return receiverCandidate;
                 }
             }
         }

diff --git a/rx_gcm/src/main/java/rx_gcm/internal/RxGcm.java b/rx_gcm/src/main/java/rx_gcm/internal/RxGcm.java
@@ -211,6 +211,7 @@ private void notifyGcmReceiverForegroundMessage(Message message) {
         }
 
         final GetGcmReceiversUIForeground.Wrapper wrapperGcmReceiverUIForeground = getGcmReceiversUIForeground.retrieve(message.target(), activitiesLifecycle.getLiveActivityOrNull());
+        if (wrapperGcmReceiverUIForeground == null) return;
 
         if (wrapperGcmReceiverUIForeground.isTargetScreen()) {
             Observable.just(message).observeOn(mainThreadScheduler)