From 67015d7294e7553514a37a79e49c9e35f7e1ce4f Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Mon, 17 May 2021 17:39:01 +0200
Subject: [PATCH] Improve wording for received setup message notification

---
 .../briar/android/conversation/ConversationVisitor.java       | 4 ++--
 briar-android/src/main/res/values/strings.xml                 | 4 ++--
 2 files changed, 4 insertions(+), 4 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 e2c31da0d..38070dbd2 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
@@ -310,11 +310,11 @@ class ConversationVisitor implements
 	@Override
 	public ConversationItem visitRemoteWipeMessage(RemoteWipeMessageHeader r) {
 		if (r.isLocal()) {
-			String text = ctx.getString(R.string.remote_wipe_setup_sent);
+			String text = ctx.getString(R.string.remote_wipe_setup_sent, contactName.getValue());
 			return new ConversationNoticeItem(
 					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
-			String text = ctx.getString(R.string.remote_wipe_setup_received);
+			String text = ctx.getString(R.string.remote_wipe_setup_received, contactName.getValue());
 			return new ConversationNoticeItem(
 					R.layout.list_item_conversation_notice_in, text, r);
 		}
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 27a465f33..db926f0d1 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -740,8 +740,8 @@
 	<string name="title_select_wipers">Select Trusted Contacts</string>
 
 	<!-- conversation -->
-	<string name="remote_wipe_setup_received">You have been added a remote wiper.</string>
-	<string name="remote_wipe_setup_sent">You have added this contact as a remote wiper.</string>
+	<string name="remote_wipe_setup_received">%1$s has added you as a remote wiper.</string>
+	<string name="remote_wipe_setup_sent">You have added %1$s as a remote wiper.</string>
 	<string name="activity_name_remote_wipe">Remote Wipe</string>
 	<string name="assigned_wipers">Your assigned trusted wipers</string>
 	<string name="activate_remote_wipe">Activate remote wipe</string>