TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 17:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make blocking take into account multi device

Browse Source
This commit is contained in:
nielsandriesse 2020-07-17 14:56:01 +10:00
parent f97f4d071d
commit 68821b98aa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@ -52,6 +52,7 @@ import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.loki.protocol.multidevice.MultiDeviceProtocol;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -554,7 +555,12 @@ public class Recipient implements RecipientModifiedListener {
} }
public synchronized boolean isBlocked() { public synchronized boolean isBlocked() {
return blocked; String masterPublicKey = MultiDeviceProtocol.shared.getMasterDevice(this.address.serialize());
if (masterPublicKey != null) {
return Recipient.from(context, Address.fromSerialized(masterPublicKey), false).blocked;
} else {
return blocked;
}
} }
public void setBlocked(boolean blocked) { public void setBlocked(boolean blocked) {