[messaging] More robust context handling

Author: Artem

sdk-messaging/src/main/java/ly/count/android/sdk/messaging/CountlyMessaging.java

@@ -317,10 +317,19 @@ protected static String getAppTitle(Context context) {
     }
 
     public static void recordMessageAction(Context context, String messageId) {
-        CountlyMessaging.context = context;
+        if (CountlyMessaging.context == null) {
+            CountlyMessaging.context = context;
+        }
         recordMessageAction(messageId);
     }
 
+    public static void recordMessageAction(Context context, String messageId, int btnIndex) {
+        if (CountlyMessaging.context == null) {
+            CountlyMessaging.context = context;
+        }
+        recordMessageAction(messageId, btnIndex);
+    }
+
     public static void recordMessageAction(String messageId) {
         if (!Countly.sharedInstance().isInitialized()) {
             CountlyMessaging.initCountly(getContext());

sdk-messaging/src/main/java/ly/count/android/sdk/messaging/ProxyActivity.java

@@ -104,7 +104,7 @@ public void onCancel(DialogInterface dialog) {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     //record server side that the message was received
-                                    CountlyMessaging.recordMessageAction(msg.getId(), 0);
+                                    CountlyMessaging.recordMessageAction(ProxyActivity.this, msg.getId(), 0);
                                     finish();
                                     Intent activityIntent = msg.getIntent(ProxyActivity.this, CountlyMessaging.getActivityClass(ProxyActivity.this));
                                     addExtrasToIntent(activityIntent, addMetadata, 1, msg.getLink(), msg.getTitle(), msg.getMessage());
@@ -124,7 +124,7 @@ public void onClick(DialogInterface dialog, int which) {
                             addButtons(builder, msg, addMetadata);
                         } else {
                             //record server side that the message was received
-                            CountlyMessaging.recordMessageAction(msg.getId());
+                            CountlyMessaging.recordMessageAction(ProxyActivity.this, msg.getId());
                         }
                         builder.setMessage(msg.getNotificationMessage());
                         builder.setCancelable(true);
@@ -154,7 +154,7 @@ public void onCancel(DialogInterface dialog) {
 
                     //first one did not work, try another
                     if (extras.containsKey(CountlyMessaging.EXTRA_ACTION_INDEX)) {
-                        CountlyMessaging.recordMessageAction(msg.getId(), extras.getInt(CountlyMessaging.EXTRA_ACTION_INDEX));
+                        CountlyMessaging.recordMessageAction(ProxyActivity.this, msg.getId(), extras.getInt(CountlyMessaging.EXTRA_ACTION_INDEX));
                         for (Message.Button button : msg.getButtons()) {
                             if (button.index == extras.getInt(CountlyMessaging.EXTRA_ACTION_INDEX)) {
                                 Intent targetIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(button.link));
@@ -166,7 +166,7 @@ public void onCancel(DialogInterface dialog) {
                             }
                         }
                     } else {
-                        CountlyMessaging.recordMessageAction(msg.getId(), 0);
+                        CountlyMessaging.recordMessageAction(ProxyActivity.this, msg.getId(), 0);
                         if (msg.hasLink()) {
                             Intent targetIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(msg.getLink()));
                             addExtrasToIntent(targetIntent, addMetadata, 0, msg.getLink(), msg.getTitle(), msg.getMessage());
@@ -188,7 +188,7 @@ private void addButtons(final AlertDialog.Builder builder, final Message msg, fi
             DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    CountlyMessaging.recordMessageAction(msg.getId(), which == DialogInterface.BUTTON_POSITIVE ? 1 : 2);
+                    CountlyMessaging.recordMessageAction(ProxyActivity.this, msg.getId(), which == DialogInterface.BUTTON_POSITIVE ? 1 : 2);
                     //todo add extra's here
                     //
                     String buttonLink = msg.getButtons().get(which == DialogInterface.BUTTON_POSITIVE ? 0 : 1).link;