From 7659b9decb32058184c8fc8d2fc9ec1c728d37f4 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Thu, 6 May 2021 18:30:51 +0200 Subject: [PATCH] Display message when getting or sending a remote wipe setup message --- .../conversation/ConversationNoticeItem.java | 8 ++++++++ .../android/conversation/ConversationVisitor.java | 14 ++++++++++++++ briar-android/src/main/res/values/strings.xml | 7 +++++++ 3 files changed, 29 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java index 1c14e40a2..476c08b15 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java @@ -3,6 +3,7 @@ package org.briarproject.briar.android.conversation; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationResponse; +import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader; import org.briarproject.briar.api.socialbackup.ShardMessageHeader; import javax.annotation.Nullable; @@ -38,6 +39,13 @@ class ConversationNoticeItem extends ConversationItem { this.msgText = null; } + ConversationNoticeItem(@LayoutRes int layoutRes, String text, + RemoteWipeMessageHeader r) { + super(layoutRes, r); + this.text = text; + this.msgText = null; + } + @Nullable String getMsgText() { return msgText; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java index e83b63053..e2c31da0d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java @@ -16,6 +16,7 @@ import org.briarproject.briar.api.introduction.IntroductionResponse; import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; +import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader; import org.briarproject.briar.api.socialbackup.ShardMessageHeader; import java.util.List; @@ -306,6 +307,19 @@ class ConversationVisitor implements } } + @Override + public ConversationItem visitRemoteWipeMessage(RemoteWipeMessageHeader r) { + if (r.isLocal()) { + String text = ctx.getString(R.string.remote_wipe_setup_sent); + return new ConversationNoticeItem( + R.layout.list_item_conversation_notice_out, text, r); + } else { + String text = ctx.getString(R.string.remote_wipe_setup_received); + return new ConversationNoticeItem( + R.layout.list_item_conversation_notice_in, text, r); + } + } + interface TextCache { @Nullable String getText(MessageId m); diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 169d513f3..dbd7d62a2 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -729,4 +729,11 @@ Create new account or recover existing account Recover Account Help recover account + + + + + You have been added a remote wiper. + You have added this contact as a remote wiper. +