Compare commits

...

3 Commits

Author SHA1 Message Date
Greyson Parrelli
9e98588401 Bump version to 4.59.11 2020-05-20 14:59:32 -04:00
Jim Gustafson
eb78a2e638 Update to ringrtc v1.3.4 2020-05-20 11:52:53 -07:00
Greyson Parrelli
8ca9cfbd8c Revert "Check to see if FCM is available at app launch."
This reverts commit eea7174f1d.
2020-05-20 14:25:34 -04:00
3 changed files with 9 additions and 27 deletions

View File

@@ -81,14 +81,14 @@ protobuf {
} }
def canonicalVersionCode = 630 def canonicalVersionCode = 630
def canonicalVersionName = "4.59.10" def canonicalVersionName = "4.59.11"
def postFixSize = 10 def postFixSize = 10
def abiPostFix = ['universal' : 0, def abiPostFix = ['universal' : 5,
'armeabi-v7a' : 1, 'armeabi-v7a' : 6,
'arm64-v8a' : 2, 'arm64-v8a' : 7,
'x86' : 3, 'x86' : 8,
'x86_64' : 4] 'x86_64' : 9]
android { android {
flavorDimensions "none" flavorDimensions "none"
@@ -297,7 +297,7 @@ dependencies {
implementation 'org.signal:argon2:13.1@aar' implementation 'org.signal:argon2:13.1@aar'
implementation 'org.signal:ringrtc-android:1.3.2' implementation 'org.signal:ringrtc-android:1.3.4'
implementation "me.leolin:ShortcutBadger:1.1.16" implementation "me.leolin:ShortcutBadger:1.1.16"
implementation 'se.emilsjolander:stickylistheaders:2.7.0' implementation 'se.emilsjolander:stickylistheaders:2.7.0'

View File

@@ -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)));

View File

@@ -363,8 +363,8 @@ dependencyVerification {
['org.signal:argon2:13.1', ['org.signal:argon2:13.1',
'0f686ccff0d4842bfcc74d92e8dc780a5f159b9376e37a1189fabbcdac458bef'], '0f686ccff0d4842bfcc74d92e8dc780a5f159b9376e37a1189fabbcdac458bef'],
['org.signal:ringrtc-android:1.3.2', ['org.signal:ringrtc-android:1.3.4',
'f59abe9f33a835cf2ab00953994fe5de477cc4107caec3fe2b2bb778325b6384'], '2b68de70567e7743fcdb008abd662d5d9ff78408ecc2fa3b708ce413d17e5820'],
['org.signal:signal-metadata-java:0.1.2', ['org.signal:signal-metadata-java:0.1.2',
'6aaeb6a33bf3161a3e6ac9db7678277f7a4cf5a2c96b84342e4007ee49bab1bd'], '6aaeb6a33bf3161a3e6ac9db7678277f7a4cf5a2c96b84342e4007ee49bab1bd'],