Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve clarity around time conversions.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-07-29 16:24:20 -04:00
committed by GitHub
parent 9af966b030
commit d7011e3353
20 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -863,7 +863,7 @@ public class Recipient {
return callVibrate;
}
public int getExpireMessages() {
public int getExpiresInSeconds() {
return expireMessages;
}

2
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
View File

@@ -294,7 +294,7 @@ public class RecipientUtil {
@WorkerThread
public static boolean setAndSendUniversalExpireTimerIfNecessary(@NonNull Context context, @NonNull Recipient recipient, long threadId) {
int defaultTimer = SignalStore.settings().getUniversalExpireTimer();
if (defaultTimer == 0 || recipient.isGroup() || recipient.getExpireMessages() != 0 || !recipient.isRegistered()) {
if (defaultTimer == 0 || recipient.isGroup() || recipient.getExpiresInSeconds() != 0 || !recipient.isRegistered()) {
return false;
}