TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-30 14:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lets limit GCM refresh to every 6hrs, and only retry once

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-03-17 10:28:06 -07:00
parent deb96646a3
commit 0d11b3dd26
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/ApplicationContext.java
View File

@ -48,6 +48,8 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirementProvider;
import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider; import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
import org.whispersystems.libsignal.util.AndroidSignalProtocolLogger; import org.whispersystems.libsignal.util.AndroidSignalProtocolLogger;
import java.util.concurrent.TimeUnit;
import dagger.ObjectGraph; import dagger.ObjectGraph;
/** /**
@ -138,7 +140,11 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
private void initializeGcmCheck() { private void initializeGcmCheck() {
if (TextSecurePreferences.isPushRegistered(this)) { if (TextSecurePreferences.isPushRegistered(this)) {
this.jobManager.add(new GcmRefreshJob(this)); long nextSetTime = TextSecurePreferences.getGcmRegistrationIdLastSetTime(this) + TimeUnit.HOURS.toMillis(6);
if (TextSecurePreferences.getGcmRegistrationId(this) == null || nextSetTime <= System.currentTimeMillis()) {
this.jobManager.add(new GcmRefreshJob(this));
}
} }
} }

6
src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
View File

@ -49,7 +49,10 @@ public class GcmRefreshJob extends ContextJob implements InjectableType {
@Inject transient SignalServiceAccountManager textSecureAccountManager; @Inject transient SignalServiceAccountManager textSecureAccountManager;
public GcmRefreshJob(Context context) { public GcmRefreshJob(Context context) {
super(context, JobParameters.newBuilder().withRequirement(new NetworkRequirement(context)).create()); super(context, JobParameters.newBuilder()
.withRequirement(new NetworkRequirement(context))
.withRetryCount(1)
.create());
} }
@Override @Override
@ -69,6 +72,7 @@ public class GcmRefreshJob extends ContextJob implements InjectableType {
textSecureAccountManager.setGcmId(Optional.of(gcmId)); textSecureAccountManager.setGcmId(Optional.of(gcmId));
TextSecurePreferences.setGcmRegistrationId(context, gcmId); TextSecurePreferences.setGcmRegistrationId(context, gcmId);
TextSecurePreferences.setGcmRegistrationIdLastSetTime(context, System.currentTimeMillis());
TextSecurePreferences.setWebsocketRegistered(context, true); TextSecurePreferences.setWebsocketRegistered(context, true);
} }
} }

9
src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@ -87,6 +87,7 @@ public class TextSecurePreferences {
private static final String GCM_DISABLED_PREF = "pref_gcm_disabled"; private static final String GCM_DISABLED_PREF = "pref_gcm_disabled";
private static final String GCM_REGISTRATION_ID_PREF = "pref_gcm_registration_id"; private static final String GCM_REGISTRATION_ID_PREF = "pref_gcm_registration_id";
private static final String GCM_REGISTRATION_ID_VERSION_PREF = "pref_gcm_registration_id_version"; private static final String GCM_REGISTRATION_ID_VERSION_PREF = "pref_gcm_registration_id_version";
private static final String GCM_REGISTRATION_ID_TIME_PREF = "pref_gcm_registration_id_last_set_time";
private static final String WEBSOCKET_REGISTERED_PREF = "pref_websocket_registered"; private static final String WEBSOCKET_REGISTERED_PREF = "pref_websocket_registered";
private static final String RATING_LATER_PREF = "pref_rating_later"; private static final String RATING_LATER_PREF = "pref_rating_later";
private static final String RATING_ENABLED_PREF = "pref_rating_enabled"; private static final String RATING_ENABLED_PREF = "pref_rating_enabled";
@ -231,6 +232,14 @@ public class TextSecurePreferences {
} }
} }
public static long getGcmRegistrationIdLastSetTime(Context context) {
return getLongPreference(context, GCM_REGISTRATION_ID_TIME_PREF, 0);
}
public static void setGcmRegistrationIdLastSetTime(Context context, long timestamp) {
setLongPreference(context, GCM_REGISTRATION_ID_TIME_PREF, timestamp);
}
public static boolean isSmsEnabled(Context context) { public static boolean isSmsEnabled(Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
return Util.isDefaultSmsProvider(context); return Util.isDefaultSmsProvider(context);