Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate local account data into SignalStore.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-11-17 15:08:28 -05:00
committed by Cody Henthorne
parent 87f175a96b
commit 8aea20f147
87 changed files with 1063 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -1853,7 +1853,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
} else if (ServiceOutageReminder.isEligible(this)) {
ApplicationDependencies.getJobManager().add(new ServiceOutageDetectionJob());
reminderView.get().showReminder(new ServiceOutageReminder(this));
} else if (TextSecurePreferences.isPushRegistered(this) &&
} else if (SignalStore.account().isRegistered() &&
TextSecurePreferences.isShowInviteReminders(this) &&
!isSecureText &&
inviteReminder.isPresent() &&
@@ -2736,14 +2736,6 @@ public class ConversationActivity extends PassphraseRequiredActivity
return record.isPresent() && record.get().isActive();
}
@SuppressWarnings("SimplifiableIfStatement")
private boolean isSelfConversation() {
if (!TextSecurePreferences.isPushRegistered(this)) return false;
if (recipient.get().isGroup()) return false;
return recipient.get().isSelf();
}
private boolean isGroupConversation() {
return getRecipient() != null && getRecipient().isGroup();
}

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
View File

@@ -346,7 +346,7 @@ public final class ConversationUpdateItem extends FrameLayout
int text = 0;
if (Util.hasItems(acis)) {
if (acis.contains(TextSecurePreferences.getLocalAci(getContext()))) {
if (acis.contains(Recipient.self().requireAci())) {
text = R.string.ConversationUpdateItem_return_to_call;
} else if (GroupCallUpdateDetailsUtil.parse(conversationMessage.getMessageRecord().getBody()).getIsCallFull()) {
text = R.string.ConversationUpdateItem_call_is_full;