diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java index ea057fd..748fc27 100644 --- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java +++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java @@ -6,14 +6,22 @@ import android.widget.Toast; import com.blackforestbytes.simplecloudnotifier.SCNApp; import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple4; import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple5; +import com.blackforestbytes.simplecloudnotifier.lib.string.Str; import com.blackforestbytes.simplecloudnotifier.model.CMessage; import com.blackforestbytes.simplecloudnotifier.model.CMessageList; +import com.blackforestbytes.simplecloudnotifier.model.LogLevel; import com.blackforestbytes.simplecloudnotifier.model.PriorityEnum; +import com.blackforestbytes.simplecloudnotifier.model.QueryLog; import com.blackforestbytes.simplecloudnotifier.model.SCNSettings; import com.blackforestbytes.simplecloudnotifier.model.ServerCommunication; +import com.blackforestbytes.simplecloudnotifier.model.SingleQuery; +import com.google.android.gms.common.util.JsonUtils; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; +import org.joda.time.Instant; +import org.json.JSONObject; + public class FBMService extends FirebaseMessagingService { @Override @@ -42,6 +50,10 @@ public class FBMService extends FirebaseMessagingService long scn_id = Long.parseLong(remoteMessage.getData().get("scn_msg_id")); boolean trimmed = Boolean.parseBoolean(remoteMessage.getData().get("trimmed")); + + SingleQuery q = new SingleQuery(LogLevel.INFO, Instant.now(), "FBM", Str.Empty, new JSONObject(remoteMessage.getData()).toString(), 0, "SUCCESS"); + QueryLog.instance().add(q); + if (trimmed) { ServerCommunication.expand(SCNSettings.inst().user_id, SCNSettings.inst().user_key, scn_id, null, (i1, i2, i3, i4, i5) -> recieveData(i4, i1, i2, i3, i5, false));