From a03953563f783840ea91b0f6ddefaa54bd6d8cbd Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 25 Jun 2020 16:02:52 +0100
Subject: [PATCH] Show appropriate text for answered introduction requests.

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

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 3d4080f03..46468c030 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
@@ -230,7 +230,11 @@ class ConversationVisitor implements
 					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
-			if (r.isContact()) {
+			if (r.wasAnswered()) {
+				text = ctx.getString(
+						R.string.introduction_request_answered_received,
+						contactName.getValue(), name);
+			} else if (r.isContact()) {
 				text = ctx.getString(
 						R.string.introduction_request_exists_received,
 						contactName.getValue(), name);
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index e4f64f7a8..482b5ce1a 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -258,6 +258,7 @@
 	<string name="introduction_request_sent">You have asked to introduce %1$s to %2$s.</string>
 	<string name="introduction_request_received">%1$s has asked to introduce you to %2$s. Do you want to add %2$s to your contact list?</string>
 	<string name="introduction_request_exists_received">%1$s has asked to introduce you to %2$s, but %2$s is already in your contact list. Since %1$s might not know that, you can still respond:</string>
+	<string name="introduction_request_answered_received">%1$s has asked to introduce you to %2$s.</string>
 	<string name="introduction_response_accepted_sent">You accepted the introduction to %1$s.</string>
 	<string name="introduction_response_accepted_sent_info">Before %1$s gets added to your contacts, they need to accept the introduction as well. This might take some time.</string>
 	<string name="introduction_response_declined_sent">You declined the introduction to %1$s.</string>