TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 12:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include better defaults for ConversationActivity.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-17 09:04:37 -04:00
parent 67f5605bc4
commit feccee557e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -373,7 +373,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
initializeLinkPreviewObserver(); initializeLinkPreviewObserver();
initializeSearchObserver(); initializeSearchObserver();
initializeStickerObserver(); initializeStickerObserver();
initializeSecurity(false, isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() { initializeSecurity(recipient.get().isRegistered(), isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
initializeProfiles(); initializeProfiles();
@ -428,7 +428,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
setIntent(intent); setIntent(intent);
initializeResources(); initializeResources();
initializeSecurity(false, isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() { initializeSecurity(recipient.get().isRegistered(), isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {
@Override @Override
public void onSuccess(Boolean result) { public void onSuccess(Boolean result) {
initializeDraft(); initializeDraft();

4
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@ -358,6 +358,10 @@ public class Recipient {
return registered; return registered;
} }
public boolean isRegistered() {
return registered == RegisteredState.REGISTERED || isPushGroup();
}
public @Nullable String getNotificationChannel() { public @Nullable String getNotificationChannel() {
return !NotificationChannels.supported() ? null : notificationChannel; return !NotificationChannels.supported() ? null : notificationChannel;
} }