Merge pull request #96 from hansemannn/shared

Android: use SharedPrefs for lastData

Author: m1ga

README.md

@@ -193,7 +193,7 @@ Supported notification fields:
 * "sound" => "string" (e.g. "notification.mp3" will play /platform/android/res/raw/notification.mp3)
 
 ### Android: Note about custom sounds
-To use a custom sound > Android O you need to create a second channel. The default channel will always use the default notification sound on the device! 
+To use a custom sound > Android O you need to create a second channel. The default channel will always use the default notification sound on the device!
 
 ### Android: Note for switching between v<=v2.0.2 and >=v2.0.3 if you use notification channels with custom sounds
 With versions prior to 2.0.3 of this module, FirebaseCloudMessaging.createNotificationChannel would create the notification sound uri using the resource id of the sound file in the `res/raw` directory. However, as described in this [android issue](https://issuetracker.google.com/issues/131303134), those resource ids can change to reference different files (or no file) between app versions, and  that happens the notification channel may play a different or no sound than originally intended.
@@ -261,7 +261,7 @@ so receive the `gcm.message_id` key from the notification payload instead.
 `apnsToken` (String, set) (iOS only)
 
 `lastData` (Object) (Android only)
-The propery `lastData` will contain the data part when you send a notification push message (so both nodes are visible inside the push payload).
+The propery `lastData` will contain the data part when you send a notification push message (so both nodes are visible inside the push payload). Read before calling `registerForPushNotifications()`.
 
 #### Events
 
@@ -331,10 +331,16 @@ if (OS_ANDROID) {
         showBadge: true
     });
     // if you use a custom id you have to set the same to the `channelId` in you php send script!
-    
+
     fcm.notificationChannel = channel;
 }
 
+
+if (OS_ANDROID){
+    // display last data:
+    Ti.API.info("Last data: " + fcm.lastData);
+}
+
 // Register the device with the FCM service.
 fcm.registerForPushNotifications();
 
@@ -347,11 +353,6 @@ if (fcm.fcmToken) {
 
 // Subscribe to a topic.
 fcm.subscribeToTopic('testTopic');
-
-if (OS_ANDROID){
-    // display last data:
-    Ti.API.info("Last data: " + fcm.lastData);
-}
 ```
 
 ## Send FCM messages with PHP

android/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.3
+version: 2.0.4
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86
 description: titanium-firebase-cloud-messaging

android/src/firebase/cloudmessaging/CloudMessagingModule.java

@@ -83,6 +83,16 @@ private KrollDict getLastData()
 					data.put("inBackground", true);
 				}
 			}
+
+			if (data.get("message") == null) {
+				SharedPreferences preferences =
+					PreferenceManager.getDefaultSharedPreferences(Utils.getApplicationContext());
+				String prefMessage = preferences.getString("titanium.firebase.cloudmessaging.message", null);
+				if (prefMessage != null) {
+					data.put("message", new KrollDict(new JSONObject(prefMessage)));
+				}
+				preferences.edit().clear().commit();
+			}
 		} catch (Exception ex) {
 			Log.e(LCAT, "getLastData" + ex);
 		}
@@ -334,5 +344,8 @@ public void parseBootIntent()
 		} catch (Exception ex) {
 			Log.e(LCAT, "parseBootIntent" + ex);
 		}
+
+		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(Utils.getApplicationContext());
+		preferences.edit().clear().commit();
 	}
 }

android/src/firebase/cloudmessaging/TiFirebaseMessagingService.java

@@ -5,11 +5,13 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import com.google.firebase.messaging.FirebaseMessagingService;
@@ -150,6 +152,11 @@ private Boolean showNotification(RemoteMessage remoteMessage)
 			builder_defaults |= Notification.DEFAULT_SOUND;
 		}
 
+		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+		SharedPreferences.Editor editor = preferences.edit();
+		editor.putString("titanium.firebase.cloudmessaging.message", jsonData.toString());
+		editor.commit();
+
 		if (!showNotification) {
 			// hidden notification - still send broadcast with data for next app start
 			Intent i = new Intent();