From f199f902b14f8435e2103c45f99aa8be01f8b070 Mon Sep 17 00:00:00 2001 From: delthas Date: Sun, 19 Jul 2020 18:01:45 +0200 Subject: [PATCH] Fix GCM heartbeat interval for roaming connections with manual interval When using GCM on a roaming connection, the heartbeat interval is set to: `networkRoaming * 6000`. It should instead be `networkRoaming * 60000` because we're converting from a number of minutes (stored in the properties) to a number of milliseconds, like it's done for regular mobile and wifi connections. --- .../src/main/java/org/microg/gms/gcm/GcmPrefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java index e4051f47..4bfe71d5 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java @@ -115,7 +115,7 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe public int getHeartbeatMsFor(String pref, boolean rawRoaming) { if (PREF_NETWORK_ROAMING.equals(pref) && (rawRoaming || networkRoaming != 0)) { - return networkRoaming * 6000; + return networkRoaming * 60000; } else if (PREF_NETWORK_MOBILE.equals(pref)) { if (networkMobile != 0) return networkMobile * 60000; else return learntMobile;