From a9a7d1839bf01d45dcc637fb5a818186507bf5f7 Mon Sep 17 00:00:00 2001 From: Ahmad Vazirna Date: Tue, 25 Jul 2023 00:02:23 +0200 Subject: [PATCH] Refactor --- .../commcare/heartbeat/HeartbeatRequester.java | 17 +++-------------- .../commcare/utils/FirebaseMessagingUtil.java | 3 ++- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/org/commcare/heartbeat/HeartbeatRequester.java b/app/src/org/commcare/heartbeat/HeartbeatRequester.java index 9f3fc2d8e0..4b87e99935 100644 --- a/app/src/org/commcare/heartbeat/HeartbeatRequester.java +++ b/app/src/org/commcare/heartbeat/HeartbeatRequester.java @@ -19,6 +19,7 @@ import org.commcare.utils.SessionUnavailableException; import org.commcare.utils.StorageUtils; import org.commcare.utils.SyncDetailCalculations; +import org.javarosa.core.model.utils.DateUtils; import org.javarosa.core.services.Logger; import org.json.JSONException; import org.json.JSONObject; @@ -68,13 +69,12 @@ public Multimap getRequestParams() { params.put(CC_VERSION, ReportingUtils.getCommCareVersionString()); params.put(QUARANTINED_FORMS_PARAM, String.valueOf(StorageUtils.getNumQuarantinedForms())); params.put(UNSENT_FORMS_PARAM, String.valueOf(StorageUtils.getNumUnsentForms())); - params.put(LAST_SYNC_TIME_PARAM, convertTimeInMsToISO8601(SyncDetailCalculations.getLastSyncTime())); + params.put(LAST_SYNC_TIME_PARAM, DateUtils.convertTimeInMsToISO8601(SyncDetailCalculations.getLastSyncTime())); params.put(CURRENT_DRIFT, String.valueOf(DriftHelper.getCurrentDrift())); params.put(MAX_DRIFT_SINCE_LAST_HEARTBEAT, String.valueOf(DriftHelper.getMaxDriftSinceLastHeartbeat())); //TODO: Encode the FCM registration token params.put(FCM_TOKEN, FirebaseMessagingUtil.getFCMToken()); - // TODO: Convert the Date to ISO 8601 format - params.put(FCM_TOKEN_TIME, convertTimeInMsToISO8601(FirebaseMessagingUtil.getFCMTokenTime())); + params.put(FCM_TOKEN_TIME, DateUtils.convertTimeInMsToISO8601(FirebaseMessagingUtil.getFCMTokenTime())); return params; } @@ -83,17 +83,6 @@ public AuthInfo getAuth() { return new AuthInfo.CurrentAuth(); } - // TODO: Move this method to DateUtils - private static String convertTimeInMsToISO8601(long ms) { - if (ms == 0) { - return ""; - } else { - DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); - df.setTimeZone(TimeZone.getTimeZone("UTC")); - return df.format(ms); - } - } - @Override public void parseResponse(JSONObject responseAsJson) { if (checkForAppIdMatch(responseAsJson)) { diff --git a/app/src/org/commcare/utils/FirebaseMessagingUtil.java b/app/src/org/commcare/utils/FirebaseMessagingUtil.java index ed9707145d..a37bf4a017 100644 --- a/app/src/org/commcare/utils/FirebaseMessagingUtil.java +++ b/app/src/org/commcare/utils/FirebaseMessagingUtil.java @@ -53,7 +53,8 @@ public static String removeServerUrlFromUserDomain(String userDomain) { } public static void verifyToken() { - if(!BuildConfig.DEBUG) { + // TODO: Enable FCM in debug mode + if(!BuildConfig.DEBUG){ // Retrieve the current Firebase Cloud Messaging (FCM) registration token FirebaseMessaging.getInstance().getToken().addOnCompleteListener(handleFCMTokenRetrieval()); }