mirror of
https://github.com/oxen-io/session-android.git
synced 2025-06-09 11:18:35 +00:00
Revert "Check to see if FCM is available at app launch."
This reverts commit eea7174f1de6a6d8a2e67dfd788524189b71f51c.
This commit is contained in:
parent
07a492a32c
commit
7fd3bfa30c
@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
|
|||||||
import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
|
import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
|
||||||
import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
|
import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
|
||||||
import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
|
import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
|
||||||
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
|
|
||||||
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
|
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
|
||||||
import org.thoughtcrime.securesms.logging.AndroidLogger;
|
import org.thoughtcrime.securesms.logging.AndroidLogger;
|
||||||
import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
|
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.service.UpdateApkRefreshListener;
|
||||||
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
|
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
|
||||||
import org.thoughtcrime.securesms.util.FeatureFlags;
|
import org.thoughtcrime.securesms.util.FeatureFlags;
|
||||||
import org.thoughtcrime.securesms.util.PlayServicesUtil;
|
|
||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
|
import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
|
||||||
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
|
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
|
||||||
@ -130,7 +128,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
|
|||||||
initializePendingMessages();
|
initializePendingMessages();
|
||||||
initializeBlobProvider();
|
initializeBlobProvider();
|
||||||
initializeCleanup();
|
initializeCleanup();
|
||||||
initializePlayServicesCheck();
|
|
||||||
|
|
||||||
FeatureFlags.init();
|
FeatureFlags.init();
|
||||||
NotificationChannels.create(this);
|
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
|
@Override
|
||||||
protected void attachBaseContext(Context base) {
|
protected void attachBaseContext(Context base) {
|
||||||
super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
|
super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user