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

Fix issue with Signal join notifications.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-01-11 20:35:49 -05:00
parent 1f95df60d4
commit f012a41345
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
View File

@@ -252,6 +252,8 @@ public class DirectoryHelper {
stopwatch.split("handle-unlisted"); stopwatch.split("handle-unlisted");
Set<RecipientId> preExistingRegisteredUsers = new HashSet<>(recipientDatabase.getRegistered());
recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds); recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds);
stopwatch.split("update-registered"); stopwatch.split("update-registered");
@@ -265,14 +267,13 @@ public class DirectoryHelper {
} }
if (TextSecurePreferences.hasSuccessfullyRetrievedDirectory(context) && notifyOfNewUsers) { if (TextSecurePreferences.hasSuccessfullyRetrievedDirectory(context) && notifyOfNewUsers) {
Set<RecipientId> existingSignalIds = new HashSet<>(recipientDatabase.getRegistered()); Set<RecipientId> systemContacts = new HashSet<>(recipientDatabase.getSystemContacts());
Set<RecipientId> existingSystemIds = new HashSet<>(recipientDatabase.getSystemContacts()); Set<RecipientId> newlyRegisteredSystemContacts = new HashSet<>(activeIds);
Set<RecipientId> newlyActiveIds = new HashSet<>(activeIds);
newlyActiveIds.removeAll(existingSignalIds); newlyRegisteredSystemContacts.removeAll(preExistingRegisteredUsers);
newlyActiveIds.retainAll(existingSystemIds); newlyRegisteredSystemContacts.retainAll(systemContacts);
notifyNewUsers(context, newlyActiveIds); notifyNewUsers(context, newlyRegisteredSystemContacts);
} else { } else {
TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true); TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true);
} }