From d42c25ebf75d5b45d275f2c41049b34cadf15abc Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Tue, 25 May 2021 12:55:26 +0200
Subject: [PATCH] Move remote wipe MessageType enum to briar-api

---
 .../briarproject/briar/api}/remotewipe/MessageType.java   | 8 ++++----
 .../briar/api/remotewipe/RemoteWipeMessageHeader.java     | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)
 rename {briar-core/src/main/java/org/briarproject/briar => briar-api/src/main/java/org/briarproject/briar/api}/remotewipe/MessageType.java (74%)

diff --git a/briar-core/src/main/java/org/briarproject/briar/remotewipe/MessageType.java b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java
similarity index 74%
rename from briar-core/src/main/java/org/briarproject/briar/remotewipe/MessageType.java
rename to briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java
index dafc0c8e5..46ccd1f6a 100644
--- a/briar-core/src/main/java/org/briarproject/briar/remotewipe/MessageType.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/MessageType.java
@@ -1,4 +1,4 @@
-package org.briarproject.briar.remotewipe;
+package org.briarproject.briar.api.remotewipe;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -7,7 +7,7 @@ import javax.annotation.concurrent.Immutable;
 
 @Immutable
 @NotNullByDefault
-enum MessageType {
+public enum MessageType {
 
 	SETUP(0), WIPE(1);
 
@@ -17,11 +17,11 @@ enum MessageType {
 		this.value = value;
 	}
 
-	int getValue() {
+	public int getValue() {
 		return value;
 	}
 
-	static MessageType fromValue(int value) throws
+	public static MessageType fromValue(int value) throws
 			FormatException {
 		for (MessageType m : values()) if (m.value == value) return m;
 		throw new FormatException();
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeMessageHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeMessageHeader.java
index efc2d6aae..2e7c1d010 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeMessageHeader.java
@@ -16,18 +16,24 @@ import javax.annotation.concurrent.Immutable;
 public class RemoteWipeMessageHeader extends ConversationMessageHeader {
 
 	private final List<AttachmentHeader> attachmentHeaders;
+	private final MessageType type;
 
 	public RemoteWipeMessageHeader(MessageId id, GroupId groupId, long timestamp,
 			boolean local, boolean read, boolean sent, boolean seen,
-			List<AttachmentHeader> headers) {
+			List<AttachmentHeader> headers, MessageType type) {
 		super(id, groupId, timestamp, local, read, sent, seen);
 		this.attachmentHeaders = headers;
+		this.type = type;
 	}
 
 	public List<AttachmentHeader> getAttachmentHeaders() {
 		return attachmentHeaders;
 	}
 
+	public MessageType getMessageType() {
+		return type;
+	}
+
 	@Override
 	public <T> T accept(ConversationMessageVisitor<T> v) {
 		return v.visitRemoteWipeMessage(this);