From 7fd3bfa30c9df973386a7d2661c844d648922a68 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 12 May 2020 15:50:27 -0400 Subject: [PATCH] Revert "Check to see if FCM is available at app launch." This reverts commit eea7174f1de6a6d8a2e67dfd788524189b71f51c. --- .../securesms/ApplicationContext.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 7d57618918..2d7decbdda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob; import org.thoughtcrime.securesms.jobs.FcmRefreshJob; import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob; import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob; -import org.thoughtcrime.securesms.jobs.RefreshAttributesJob; import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob; import org.thoughtcrime.securesms.logging.AndroidLogger; import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger; @@ -69,7 +68,6 @@ import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener; import org.thoughtcrime.securesms.service.UpdateApkRefreshListener; import org.thoughtcrime.securesms.storage.StorageSyncHelper; import org.thoughtcrime.securesms.util.FeatureFlags; -import org.thoughtcrime.securesms.util.PlayServicesUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper; @@ -130,7 +128,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi initializePendingMessages(); initializeBlobProvider(); initializeCleanup(); - initializePlayServicesCheck(); FeatureFlags.init(); NotificationChannels.create(this); @@ -380,21 +377,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi }); } - private void initializePlayServicesCheck() { - if (TextSecurePreferences.isFcmDisabled(this)) { - PlayServicesUtil.PlayServicesStatus status = PlayServicesUtil.getPlayServicesStatus(this); - - if (status == PlayServicesUtil.PlayServicesStatus.SUCCESS) { - Log.i(TAG, "Play Services are newly-available. Updating to use FCM."); - - TextSecurePreferences.setFcmDisabled(this, false); - ApplicationDependencies.getJobManager().startChain(new FcmRefreshJob()) - .then(new RefreshAttributesJob()) - .enqueue(); - } - } - } - @Override protected void attachBaseContext(Context base) { super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));