Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad sync of default timer to linked devices.

Browse Source
This commit is contained in:
Cody Henthorne
2021-06-03 15:16:16 -04:00
parent 262b4e7d62
commit 3a21a2a49e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
View File

@@ -128,6 +128,7 @@ public final class StorageSyncHelper {
.setPreferContactAvatars(SignalStore.settings().isPreferSystemContactPhotos())
.setPayments(SignalStore.paymentsValues().mobileCoinPaymentsEnabled(), Optional.fromNullable(SignalStore.paymentsValues().getPaymentsEntropy()).transform(Entropy::getBytes).orNull())
.setPrimarySendsSms(Util.isDefaultSmsProvider(context))
.setUniversalExpireTimer(SignalStore.settings().getUniversalExpireTimer())
.build();
return SignalStorageRecord.forAccount(account);

2
app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@@ -81,7 +81,7 @@ public final class FeatureFlags {
private static final String MP4_GIF_SEND_SUPPORT = "android.mp4GifSendSupport";
private static final String MEDIA_QUALITY_LEVELS = "android.mediaQuality.levels";
private static final String GROUPS_V2_DESCRIPTION_VERSION = "android.groupsv2.descriptionVersion";
private static final String DEFAULT_MESSAGE_TIMER = "android.defaultMessageTimer";
private static final String DEFAULT_MESSAGE_TIMER = "android.defaultMessageTimer.2";
/**
* We will only store remote values for flags in this set. If you want a flag to be controllable