Skip to content

Commit 54d58e2

Browse files
committed
Fix default values when no TTL and sentTime is available
* HMS notification TTL and sentTime is coming with no value * Notification is not being displayed due to missing data * Add default values
1 parent 570bf3d commit 54d58e2

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalHmsEventBridge.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,14 @@ public static void onMessageReceived(@NonNull Context context, @NonNull RemoteMe
5353
String data = message.getData();
5454
try {
5555
JSONObject messageDataJSON = new JSONObject(message.getData());
56-
messageDataJSON.put(HMS_TTL_KEY, message.getTtl());
57-
messageDataJSON.put(HMS_SENT_TIME_KEY, message.getSentTime());
56+
if (message.getTtl() == 0)
57+
messageDataJSON.put(HMS_TTL_KEY, OSNotificationRestoreWorkManager.DEFAULT_TTL_IF_NOT_IN_PAYLOAD);
58+
else
59+
messageDataJSON.put(HMS_TTL_KEY, message.getTtl());
60+
if (message.getSentTime() == 0)
61+
messageDataJSON.put(HMS_SENT_TIME_KEY, OneSignal.getTime().getCurrentTimeMillis());
62+
else
63+
messageDataJSON.put(HMS_SENT_TIME_KEY, message.getSentTime());
5864
data = messageDataJSON.toString();
5965
} catch (JSONException e) {
6066
OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "OneSignalHmsEventBridge error when trying to create RemoteMessage data JSON");

0 commit comments

Comments
 (0)