[SDK-747] : Null checks added for application and context in push service (#75)

* Null checks added for application and context in push service

* Changes in messaging service

* SDK version updated

* Change linebreak to LF

Author: ijunaid

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 20.11.15
+* Adding a mitigation when app is killed and received push notifications.
+* Underlying android SDK version is 20.11.12
+* Underlying iOS SDK version is 20.11.3
+
 ## 20.11.14
 * Fixed a bug that threw an exception when logging a warning for "setUserData".
 * Underlying android SDK version is 20.11.12

CountlyReactNative.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '20.11.14'
+  s.version = '20.11.15'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE

android/src/main/java/ly/count/android/sdk/react/CountlyMessagingService.java

@@ -1,5 +1,7 @@
 package ly.count.android.sdk.react;
 
+import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
@@ -25,19 +27,27 @@ public void onNewToken(String token) {
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
+        if(Countly.sharedInstance().isLoggingEnabled()) {
+            Log.d(Countly.TAG, "[CountlyMessagingService] got new message: " + remoteMessage.getData().toString());
+        }
+        CountlyReactNative.onNotification(remoteMessage.getData());
+
 
         if(!Countly.sharedInstance().isInitialized()) {
             int mode = CountlyPush.getLastMessagingMethod(this);
-            if(mode == 0) {
-                CountlyPush.init(getApplication(), Countly.CountlyMessagingMode.TEST);
-            } else if(mode == 1) {
-                CountlyPush.init(getApplication(), Countly.CountlyMessagingMode.PRODUCTION);
+            Application application = getApplication();
+            if(application == null){
+                Log.d(Countly.TAG, "[CountlyMessagingService] getApplication() returns null: application must be non-null to init CountlyPush");
+            }
+            else {
+                if(mode == 0) {
+                    CountlyPush.init(application, Countly.CountlyMessagingMode.TEST);
+                } else if(mode == 1) {
+                    CountlyPush.init(application, Countly.CountlyMessagingMode.PRODUCTION);
+                }
             }
         }
 
-        if(Countly.sharedInstance().isLoggingEnabled()) {
-            Log.d(Countly.TAG, "[CountlyMessagingService] got new message: " + remoteMessage.getData().toString());
-        }
 
         // decode message data and extract meaningful information from it: title, body, badge, etc.
         CountlyPush.Message message = CountlyPush.decodeMessage(remoteMessage.getData());
@@ -47,8 +57,12 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
         //     message.recordAction(getApplicationContext());
         //     return;
         // }
-
-        Boolean result = CountlyPush.displayNotification(getApplicationContext(), message, getApplicationContext().getApplicationInfo().icon, null);
+        Context context = getApplicationContext();
+        if(context == null){
+            Log.d(Countly.TAG, "[CountlyMessagingService] getApplicationContext() returns null: context must be non-null to displayNotification");
+            return;
+        }
+        Boolean result = CountlyPush.displayNotification(context, message, context.getApplicationInfo().icon, null);
         if(Countly.sharedInstance().isLoggingEnabled()) {
             if (result == null) {
                 Log.i(Countly.TAG, "[CountlyMessagingService] Message wasn't sent from Countly server, so it cannot be handled by Countly SDK");
@@ -58,8 +72,6 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
                 Log.i(Countly.TAG, "[CountlyMessagingService] Message wasn't handled by Countly SDK because API level is too low for Notification support or because currentActivity is null (not enough lifecycle method calls)");
             }
         }
-
-        CountlyReactNative.onNotification(remoteMessage.getData());
     }
 
     @Override

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -75,7 +75,7 @@ public String toString(){
 public class CountlyReactNative extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "20.11.14";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "20.11.15";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static CountlyConfig config = new CountlyConfig();

example/install.sh

@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add [email protected].14
+yarn add [email protected].15
 
 cd ./ios
 pod install

ios/src/CountlyReactNative.m

@@ -21,7 +21,7 @@ @interface CountlyFeedbackWidget ()
 + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 @end
 
-NSString* const kCountlyReactNativeSDKVersion = @"20.11.14";
+NSString* const kCountlyReactNativeSDKVersion = @"20.11.15";
 NSString* const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CountlyConfig* config = nil;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "countly-sdk-react-native-bridge",
-  "version": "20.11.14",
+  "version": "20.11.15",
   "author": "Countly <[email protected]> (https://count.ly/)",
   "bugs": {
     "url": "https://github.com/Countly/countly-sdk-react-native-bridge/issues"