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

ConversationManager: Address review issues

Browse Source
This commit is contained in:
Torsten Grote
2018-09-18 10:09:59 -03:00
parent 2309e73216
commit 7d479063a9
7 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java
View File

@@ -70,34 +70,34 @@ class ConversationNoticeOutItem extends ConversationOutItem {
}
private static String getText(Context ctx, String contactName,
PrivateResponse ir) {
if (ir.wasAccepted()) {
if (ir instanceof IntroductionResponse) {
String name = ((IntroductionResponse) ir).getIntroducedAuthor()
PrivateResponse r) {
if (r.wasAccepted()) {
if (r instanceof IntroductionResponse) {
String name = ((IntroductionResponse) r).getIntroducedAuthor()
.getName();
return ctx.getString(
R.string.introduction_response_accepted_sent,
name) + "\n\n" + ctx.getString(
R.string.introduction_response_accepted_sent_info,
name);
} else if (ir instanceof ForumInvitationResponse) {
} else if (r instanceof ForumInvitationResponse) {
return ctx.getString(R.string.forum_invitation_response_accepted_sent, contactName);
} else if (ir instanceof BlogInvitationResponse) {
} else if (r instanceof BlogInvitationResponse) {
return ctx.getString(R.string.blogs_sharing_response_accepted_sent, contactName);
} else if (ir instanceof GroupInvitationResponse) {
} else if (r instanceof GroupInvitationResponse) {
return ctx.getString(R.string.groups_invitations_response_accepted_sent, contactName);
}
} else {
if (ir instanceof IntroductionResponse) {
String name = ((IntroductionResponse) ir).getIntroducedAuthor()
if (r instanceof IntroductionResponse) {
String name = ((IntroductionResponse) r).getIntroducedAuthor()
.getName();
return ctx.getString(
R.string.introduction_response_declined_sent, name);
} else if (ir instanceof ForumInvitationResponse) {
} else if (r instanceof ForumInvitationResponse) {
return ctx.getString(R.string.forum_invitation_response_declined_sent, contactName);
} else if (ir instanceof BlogInvitationResponse) {
} else if (r instanceof BlogInvitationResponse) {
return ctx.getString(R.string.blogs_sharing_response_declined_sent, contactName);
} else if (ir instanceof GroupInvitationResponse) {
} else if (r instanceof GroupInvitationResponse) {
return ctx.getString(R.string.groups_invitations_response_declined_sent, contactName);
}
}