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

Fix contact sync caused decryption lock to never release.

Browse Source 
Fix message
This commit is contained in:
Mikunj Varsani 2019-11-13 09:47:27 +11:00
parent 7c4e7f261d
commit 5c1ec4c06d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@ -14,6 +14,7 @@ import android.util.Pair;
import com.annimon.stream.Collectors; import com.annimon.stream.Collectors;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import com.google.android.gms.common.util.IOUtils;
import org.signal.libsignal.metadata.InvalidMetadataMessageException; import org.signal.libsignal.metadata.InvalidMetadataMessageException;
import org.signal.libsignal.metadata.InvalidMetadataVersionException; import org.signal.libsignal.metadata.InvalidMetadataVersionException;
@ -139,6 +140,7 @@ import org.whispersystems.signalservice.loki.messaging.LokiThreadSessionResetSta
import org.whispersystems.signalservice.loki.utilities.PromiseUtil; import org.whispersystems.signalservice.loki.utilities.PromiseUtil;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
@ -649,10 +651,12 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
private void handleSynchronizeContactMessage(@NonNull ContactsMessage contactsMessage) { private void handleSynchronizeContactMessage(@NonNull ContactsMessage contactsMessage) {
if (contactsMessage.getContactsStream().isStream()) { if (contactsMessage.getContactsStream().isStream()) {
Log.d("Loki", "Received contact sync message"); Log.d("Loki", "Received contact sync message");
try { try {
DeviceContactsInputStream contactsInputStream = new DeviceContactsInputStream(contactsMessage.getContactsStream().asStream().getInputStream()); InputStream in = contactsMessage.getContactsStream().asStream().getInputStream();
DeviceContact deviceContact = contactsInputStream.read(); DeviceContactsInputStream contactsInputStream = new DeviceContactsInputStream(in);
while (deviceContact != null) { List<DeviceContact> devices = contactsInputStream.readAll();
for (DeviceContact deviceContact : devices) {
// Check if we have the contact as a friend and that we're not trying to sync our own device // Check if we have the contact as a friend and that we're not trying to sync our own device
Address address = Address.fromSerialized(deviceContact.getNumber()); Address address = Address.fromSerialized(deviceContact.getNumber());
if (!address.isPhone() || address.toPhoneString().equalsIgnoreCase(TextSecurePreferences.getLocalNumber(context))) { continue; } if (!address.isPhone() || address.toPhoneString().equalsIgnoreCase(TextSecurePreferences.getLocalNumber(context))) { continue; }
@ -676,17 +680,11 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
// TODO: Handle blocked - If user is not blocked then we should do the friend request logic otherwise add them to our block list // TODO: Handle blocked - If user is not blocked then we should do the friend request logic otherwise add them to our block list
// TODO: Handle expiration timer - Update expiration timer? // TODO: Handle expiration timer - Update expiration timer?
// TODO: Handle avatar - Download and set avatar? // TODO: Handle avatar - Download and set avatar?
// Read the next contact
deviceContact = contactsInputStream.read();
} }
} catch (IOException e) {
// Exception is thrown when we don't have any more contacts to read from
} catch (Exception e) { } catch (Exception e) {
Log.d("Loki", "Failed to sync contact: " + e.getMessage()); Log.d("Loki", "Failed to sync contact: " + e);
} }
} }
} }
private void handleSynchronizeSentMessage(@NonNull SignalServiceContent content, private void handleSynchronizeSentMessage(@NonNull SignalServiceContent content,

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

@ -115,7 +115,7 @@ public class MessageSender {
if (friendRequestStatus == LokiThreadFriendRequestStatus.FRIENDS || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_RECEIVED) { if (friendRequestStatus == LokiThreadFriendRequestStatus.FRIENDS || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_RECEIVED) {
sendBackgroundMessage(context, device); sendBackgroundMessage(context, device);
} else if (friendRequestStatus == LokiThreadFriendRequestStatus.NONE || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_EXPIRED) { } else if (friendRequestStatus == LokiThreadFriendRequestStatus.NONE || friendRequestStatus == LokiThreadFriendRequestStatus.REQUEST_EXPIRED) {
sendBackgroundFriendRequest(context, device, "This is a friend request from android! please replace this message in the future"); sendBackgroundFriendRequest(context, device, "Accept this friend request to enable messages to be synced across devices");
} }
} }
}); });