TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-19 02:48:27 +00: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
Show Stats 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() { private boolean isSelfConversation() {
try { if (!TextSecurePreferences.isPushRegistered(this)) return false;
if (!TextSecurePreferences.isPushRegistered(this)) return false; if (!recipients.isSingleRecipient()) return false;
if (!recipients.isSingleRecipient()) return false; if (recipients.getPrimaryRecipient().isGroupRecipient()) return false;
if (recipients.getPrimaryRecipient().isGroupRecipient()) return false;
return Util.canonicalizeNumber(this, recipients.getPrimaryRecipient().getNumber()) return Util.isOwnNumber(this, recipients.getPrimaryRecipient().getNumber());
.equals(TextSecurePreferences.getLocalNumber(this));
} catch (InvalidNumberException e) {
Log.w(TAG, e);
return false;
}
} }
private boolean isGroupConversation() { private boolean isGroupConversation() {

28
src/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@ -255,25 +255,19 @@ public class MessageSender {
} }
private static boolean isSelfSend(Context context, Recipients recipients) { private static boolean isSelfSend(Context context, Recipients recipients) {
try { if (!TextSecurePreferences.isPushRegistered(context)) {
if (!TextSecurePreferences.isPushRegistered(context)) {
return false;
}
if (!recipients.isSingleRecipient()) {
return false;
}
if (recipients.isGroupRecipient()) {
return false;
}
String e164number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber());
return TextSecurePreferences.getLocalNumber(context).equals(e164number);
} catch (InvalidNumberException e) {
Log.w("MessageSender", e);
return false; return false;
} }
if (!recipients.isSingleRecipient()) {
return false;
}
if (recipients.isGroupRecipient()) {
return false;
}
return Util.isOwnNumber(context, recipients.getPrimaryRecipient().getNumber());
} }
private static boolean isPushDestination(Context context, String destination) { private static boolean isPushDestination(Context context, String destination) {

2
src/org/thoughtcrime/securesms/util/DirectoryHelper.java
View File

@ -216,7 +216,7 @@ public class DirectoryHelper {
if (!TextSecurePreferences.isNewContactsNotificationEnabled(context)) return; if (!TextSecurePreferences.isNewContactsNotificationEnabled(context)) return;
for (String newUser : newUsers) { for (String newUser : newUsers) {
if (!SessionUtil.hasSession(context, masterSecret, newUser)) { if (!SessionUtil.hasSession(context, masterSecret, newUser) && !Util.isOwnNumber(context, newUser)) {
IncomingJoinedMessage message = new IncomingJoinedMessage(newUser); IncomingJoinedMessage message = new IncomingJoinedMessage(newUser);
Pair<Long, Long> smsAndThreadId = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message); Pair<Long, Long> smsAndThreadId = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);

10
src/org/thoughtcrime/securesms/util/Util.java
View File

@ -184,6 +184,16 @@ public class Util {
else return canonicalizeNumber(context, number); else return canonicalizeNumber(context, number);
} }
public static boolean isOwnNumber(Context context, String number) {
try {
String e164number = canonicalizeNumber(context, number);
return TextSecurePreferences.getLocalNumber(context).equals(e164number);
} catch (InvalidNumberException e) {
Log.w(TAG, e);
}
return false;
}
public static byte[] readFully(InputStream in) throws IOException { public static byte[] readFully(InputStream in) throws IOException {
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];