TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash.

Browse Source
This commit is contained in:
Mikunj 2020-02-04 14:52:25 +11:00
parent b74506ea24
commit a1e98bae75
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
View File

@ -361,8 +361,11 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
} }
// Add secondary devices to the list. We shouldn't add our secondary devices // Add secondary devices to the list. We shouldn't add our secondary devices
for (Address member : memberSet) { try {
Set<Address> originalMemberSet = new HashSet<>(memberSet);
for (Address member : originalMemberSet) {
if (!member.isPhone() || member.serialize().equalsIgnoreCase(localNumber)) { continue; } if (!member.isPhone() || member.serialize().equalsIgnoreCase(localNumber)) { continue; }
try { try {
List<String> secondaryDevices = PromiseUtil.timeout(LokiStorageAPI.shared.getSecondaryDevicePublicKeys(member.serialize()), 5000).get(); List<String> secondaryDevices = PromiseUtil.timeout(LokiStorageAPI.shared.getSecondaryDevicePublicKeys(member.serialize()), 5000).get();
memberSet.addAll(Stream.of(secondaryDevices).map(string -> { memberSet.addAll(Stream.of(secondaryDevices).map(string -> {
@ -373,6 +376,9 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
// Timed out, go to the next member // Timed out, go to the next member
} }
} }
} catch (Exception e) {
Log.e("PushGroupSend", "Error occurred while adding secondary devices: " + e);
}
return new LinkedList<>(memberSet); return new LinkedList<>(memberSet);
} }