From 03a624ab8fe192c484f01d022d016e860b9795b0 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Tue, 31 Aug 2021 12:59:39 +0200
Subject: [PATCH] Add revoke remote wipe conversation notification on revoke
 received

---
 .../conversation/ConversationVisitor.java     | 24 +++++++++++++++----
 briar-android/src/main/res/values/strings.xml |  1 +
 2 files changed, 20 insertions(+), 5 deletions(-)

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 328127dc7..676e4cbf0 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
@@ -334,11 +334,25 @@ class ConversationVisitor implements
 				return new ConversationNoticeItem(
 						R.layout.list_item_conversation_notice_out, text, r);
 			default: // REVOKE
-				String revokeText = ctx.getString(R.string.remote_wipe_revoke_sent,
-						contactName.getValue()) + " " + UiUtils
-						.formatDateAbsolute(ctx, r.getMessageExpiry());
-				return new ConversationNoticeItem(
-						R.layout.list_item_conversation_notice_out, revokeText, r);
+				if (r.isLocal()) {
+					String revokeText =
+							ctx.getString(R.string.remote_wipe_revoke_sent,
+									contactName.getValue()) + " " + UiUtils
+									.formatDateAbsolute(ctx,
+											r.getMessageExpiry());
+					return new ConversationNoticeItem(
+							R.layout.list_item_conversation_notice_out,
+							revokeText, r);
+				} else {
+					String revokeText =
+							ctx.getString(R.string.remote_wipe_revoke_received,
+									contactName.getValue()) + " " + UiUtils
+									.formatDateAbsolute(ctx,
+											r.getMessageExpiry());
+					return new ConversationNoticeItem(
+							R.layout.list_item_conversation_notice_out,
+							revokeText, r);
+				}
 		}
 	}
 
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 907404d14..4b43cd2b5 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -751,6 +751,7 @@
 	<string name="assigned_wipers">Your assigned trusted wipers</string>
 	<string name="activate_remote_wipe">Activate remote wipe</string>
 	<string name="remote_wipe_revoke_sent">%1$s may no longer activate a remote wipe.</string>
+	<string name="remote_wipe_revoke_received">You can no longer activate a remote wipe for %1$s.</string>
 
 	<!-- activate -->
 	<string name="activity_name_activate_remote_wipe">Activate Remote Wipe</string>