From 3a66fef2030be00615e47a725cdf375e96ad3093 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 21 May 2018 20:54:46 +0200 Subject: migrate to fcm library --- .../pixart/messenger/services/XmppConnectionService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/de/pixart/messenger/services/XmppConnectionService.java') diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index e2e2e4bc8..ca07069b0 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -160,8 +160,8 @@ public class XmppConnectionService extends Service { public static final String ACTION_TRY_AGAIN = "try_again"; public static final String ACTION_DISMISS_ERROR_NOTIFICATIONS = "dismiss_error"; public static final String ACTION_IDLE_PING = "idle_ping"; - public static final String ACTION_GCM_TOKEN_REFRESH = "gcm_token_refresh"; - public static final String ACTION_GCM_MESSAGE_RECEIVED = "gcm_message_received"; + public static final String ACTION_FCM_TOKEN_REFRESH = "fcm_token_refresh"; + public static final String ACTION_FCM_MESSAGE_RECEIVED = "fcm_message_received"; private static final String ACTION_MERGE_PHONE_CONTACTS = "merge_phone_contacts"; static { @@ -663,17 +663,17 @@ public class XmppConnectionService extends Service { refreshAllPresences(); } break; - case ACTION_GCM_TOKEN_REFRESH: - refreshAllGcmTokens(); + case ACTION_FCM_TOKEN_REFRESH: + refreshAllFcmTokens(); break; case ACTION_IDLE_PING: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { scheduleNextIdlePing(); } break; - case ACTION_GCM_MESSAGE_RECEIVED: - Log.d(Config.LOGTAG, "gcm push message arrived in service. extras=" + intent.getExtras()); + case ACTION_FCM_MESSAGE_RECEIVED: pushedAccountHash = intent.getStringExtra("account"); + Log.d(Config.LOGTAG, "push message arrived in service. account=" + pushedAccountHash); break; case Intent.ACTION_SEND: Uri uri = intent.getData(); @@ -3759,7 +3759,7 @@ public class XmppConnectionService extends Service { } } - private void refreshAllGcmTokens() { + private void refreshAllFcmTokens() { for (Account account : getAccounts()) { if (account.isOnlineAndConnected() && mPushManagementService.available(account)) { mPushManagementService.registerPushTokenOnServer(account); -- cgit v1.2.3