Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1514-introduction-message' into 'master'

Browse Source 
Fix Introduction Issues

Closes #1516 and #1514

See merge request briar/briar!1067
This commit is contained in:
akwizgran
2019-04-04 16:47:09 +00:00
parent df0d6594b6 d40cfd30a2
commit 652ce4a53d
7 changed files with 89 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
View File

@@ -252,12 +252,12 @@ class ConversationVisitor implements
if (r.isLocal()) {
String text;
if (r.wasAccepted()) {
String suffix = r.canSucceed() ? "\n\n" + ctx.getString(
R.string.introduction_response_accepted_sent_info,
introducedAuthor) : "";
text = ctx.getString(
R.string.introduction_response_accepted_sent,
introducedAuthor)
+ "\n\n" + ctx.getString(
R.string.introduction_response_accepted_sent_info,
introducedAuthor);
introducedAuthor) + suffix;
} else {
text = ctx.getString(
R.string.introduction_response_declined_sent,