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

Exclude the user's own number from notifyNewUsers

Browse Source 
Closes #5229
// FREEBIE
This commit is contained in:
haffenloher
2016-02-14 14:58:39 +01:00
committed by Moxie Marlinspike
parent 156c5c6e09
commit 72064d8827
4 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@@ -1189,17 +1189,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private boolean isSelfConversation() {
try {
if (!TextSecurePreferences.isPushRegistered(this)) return false;
if (!recipients.isSingleRecipient()) return false;
if (recipients.getPrimaryRecipient().isGroupRecipient()) return false;
if (!TextSecurePreferences.isPushRegistered(this)) return false;
if (!recipients.isSingleRecipient()) return false;
if (recipients.getPrimaryRecipient().isGroupRecipient()) return false;
return Util.canonicalizeNumber(this, recipients.getPrimaryRecipient().getNumber())
.equals(TextSecurePreferences.getLocalNumber(this));
} catch (InvalidNumberException e) {
Log.w(TAG, e);
return false;
}
return Util.isOwnNumber(this, recipients.getPrimaryRecipient().getNumber());
}
private boolean isGroupConversation() {