Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-24 16:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Confirm messages method in remote wipe manager

Browse Source
This commit is contained in:
ameba23
2022-02-24 13:01:39 +01:00
parent d84d638f7c
commit a665179377
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
View File

@@ -14,6 +14,8 @@ import org.briarproject.bramble.api.data.MetadataParser;
import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.event.EventListener;
import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.sync.Group; import org.briarproject.bramble.api.sync.Group;
@@ -48,7 +50,6 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING;
import static org.briarproject.briar.api.remotewipe.MessageType.CONFIRM; import static org.briarproject.briar.api.remotewipe.MessageType.CONFIRM;
import static org.briarproject.briar.api.remotewipe.MessageType.REVOKE; import static org.briarproject.briar.api.remotewipe.MessageType.REVOKE;
import static org.briarproject.briar.api.remotewipe.MessageType.SETUP; import static org.briarproject.briar.api.remotewipe.MessageType.SETUP;
@@ -197,15 +198,12 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
LOG.warning("Threshold number of remote wipe signals reached - panic!"); LOG.warning("Threshold number of remote wipe signals reached - panic!");
// Send a CONFIRM message to each wiper // Send a CONFIRM message to each wiper
sendConfirmMessages(txn); // sendConfirmMessages(txn);
if (observer != null) { if (observer != null) {
observer.onPanic(); observer.onPanic();
} }
txn.attach(new RemoteWipeActivatedEvent()); txn.attach(new RemoteWipeActivatedEvent());
// we could here clear the metadata to allow us to send
// the wipe messages several times when testing
} else { } else {
BdfList newReceivedWipeMessage = new BdfList(); BdfList newReceivedWipeMessage = new BdfList();
newReceivedWipeMessage.add(contactId.getInt()); newReceivedWipeMessage.add(contactId.getInt());
@@ -329,31 +327,36 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
messageTracker.trackOutgoingMessage(txn, m); messageTracker.trackOutgoingMessage(txn, m);
} }
private void sendConfirmMessages(Transaction txn) public void sendConfirmMessages(Transaction txn)
throws DbException, FormatException { throws DbException, FormatException {
List<ContactId> wipers = getWiperContactIds(txn); List<ContactId> wipers = getWiperContactIds(txn);
List<MessageId> confirmMessages = new ArrayList<>();
for (ContactId c : wipers) { for (ContactId c : wipers) {
Contact contact = contactManager.getContact(txn, c); Contact contact = contactManager.getContact(txn, c);
confirmMessages.add(sendConfirmMessage(txn, contact)); sendConfirmMessage(txn, contact);
} }
boolean allSent = true; // boolean allSent = true;
do { // do {
for (MessageId confirmMessage: confirmMessages) { // for (MessageId confirmMessage: confirmMessages) {
if (db.getMessageState(txn, confirmMessage) == PENDING) allSent = false; // if (db.getMessageState(txn, confirmMessage) == PENDING) allSent = false;
// }
// if (!allSent) {
// try {
// Thread.sleep(100);
// } catch (InterruptedException e) {
// allSent = true;
// }
// }
// } while(allSent == false);
} }
if (!allSent) {
public void sleep() {
try { try {
Thread.sleep(100); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException ignored) {}
allSent = true;
}
}
} while(allSent == false);
} }
private MessageId sendConfirmMessage(Transaction txn, Contact contact) private void sendConfirmMessage(Transaction txn, Contact contact)
throws DbException, FormatException { throws DbException, FormatException {
Group group = getContactGroup(contact); Group group = getContactGroup(contact);
GroupId g = group.getId(); GroupId g = group.getId();
@@ -372,15 +375,15 @@ public class RemoteWipeManagerImpl extends ConversationClientImpl
messageTracker.trackOutgoingMessage(txn, m); messageTracker.trackOutgoingMessage(txn, m);
// Find the id of this message // Find the id of this message
List<MessageId> messageIds = (List<MessageId>) db.getMessageIds(txn, g); // List<MessageId> messageIds = (List<MessageId>) db.getMessageIds(txn, g);
Message newestMsg = null; // Message newestMsg = null;
for (MessageId id : messageIds) { // for (MessageId id : messageIds) {
Message msg = db.getMessage(txn, id); // Message msg = db.getMessage(txn, id);
if (newestMsg == null || msg.getTimestamp() > newestMsg.getTimestamp()) { // if (newestMsg == null || msg.getTimestamp() > newestMsg.getTimestamp()) {
newestMsg = msg; // newestMsg = msg;
} // }
} // }
return newestMsg.getId(); // return newestMsg.getId();
} }
public void wipe(Transaction txn, Contact contact) public void wipe(Transaction txn, Contact contact)