From 2d5e0ee840e4f3ccdccb96a108b8213658cb2aab Mon Sep 17 00:00:00 2001 From: ameba23 Date: Mon, 30 Aug 2021 10:46:40 +0200 Subject: [PATCH] Add an additional message type for revoking remote wipe status --- .../org/briarproject/briar/api/remotewipe/MessageEncoder.java | 2 ++ .../java/org/briarproject/briar/api/remotewipe/MessageType.java | 2 +- .../briarproject/briar/api/remotewipe/RemoteWipeConstants.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageEncoder.java b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageEncoder.java index 7fb6c5b2b..f95d44035 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageEncoder.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageEncoder.java @@ -3,5 +3,7 @@ package org.briarproject.briar.api.remotewipe; public interface MessageEncoder { byte[] encodeSetupMessage(); + byte[] encodeRevokeMessage(); + byte[] encodeWipeMessage(); } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java index 46ccd1f6a..581c89640 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java @@ -9,7 +9,7 @@ import javax.annotation.concurrent.Immutable; @NotNullByDefault public enum MessageType { - SETUP(0), WIPE(1); + SETUP(0), WIPE(1), REVOKE(2); private final int value; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeConstants.java b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeConstants.java index 5915bf415..7f88e382c 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeConstants.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeConstants.java @@ -9,6 +9,7 @@ public interface RemoteWipeConstants { String GROUP_KEY_CONTACT_ID = "contactId"; String GROUP_KEY_WIPERS = "wipers"; String GROUP_KEY_RECEIVED_WIPE = "receivedWipe"; + String GROUP_KEY_AM_WIPER = "amWiper"; // Message metadata keys String MSG_KEY_TIMESTAMP = "timestamp";