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

Rename object to nameable

Browse Source
This commit is contained in:
Torsten Grote
2018-09-07 11:37:13 -03:00
parent 7e32697696
commit 183fe08565
13 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogControllerImpl.java
View File

@@ -108,7 +108,7 @@ class BlogControllerImpl extends BaseControllerImpl
BlogInvitationResponseReceivedEvent b =
(BlogInvitationResponseReceivedEvent) e;
PrivateResponse<Blog> r = b.getMessageHeader();
if (r.getObject().getId().equals(groupId) && r.wasAccepted()) {
if (r.getNameable().getId().equals(groupId) && r.wasAccepted()) {
LOG.info("Blog invitation accepted");
onBlogInvitationAccepted(b.getContactId());
}

12
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java
View File

@@ -151,7 +151,7 @@ abstract class ConversationItem {
return new ConversationRequestItem(ir.getId(),
ir.getGroupId(), type, ir.getSessionId(), text,
ir.getMessage(), ir.getTimestamp(), ir.isRead(),
((Shareable) ir.getObject()).getId(), !ir.wasAnswered(),
((Shareable) ir.getNameable()).getId(), !ir.wasAnswered(),
ir.doesExist());
}
}
@@ -163,14 +163,14 @@ abstract class ConversationItem {
if (ir.wasAccepted()) {
text = ctx.getString(
R.string.introduction_response_accepted_sent,
ir.getObject().getName());
ir.getNameable().getName());
text += "\n\n" + ctx.getString(
R.string.introduction_response_accepted_sent_info,
ir.getObject().getName());
ir.getNameable().getName());
} else {
text = ctx.getString(
R.string.introduction_response_declined_sent,
ir.getObject().getName());
ir.getNameable().getName());
}
return new ConversationNoticeOutItem(ir.getId(), ir.getGroupId(),
text, null, ir.getTimestamp(), ir.isSent(), ir.isSeen());
@@ -179,7 +179,7 @@ abstract class ConversationItem {
if (ir.wasAccepted()) {
res = R.string.introduction_response_accepted_received;
} else {
if (ir.getObject().isIntroducer()) {
if (ir.getNameable().isIntroducer()) {
res = R.string.introduction_response_declined_received;
} else {
res =
@@ -187,7 +187,7 @@ abstract class ConversationItem {
}
}
String text =
ctx.getString(res, contactName, ir.getObject().getName());
ctx.getString(res, contactName, ir.getNameable().getName());
return new ConversationNoticeInItem(ir.getId(), ir.getGroupId(),
text, null, ir.getTimestamp(), ir.isRead());
}

2
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java
View File

@@ -85,7 +85,7 @@ class ForumControllerImpl extends
ForumInvitationResponseReceivedEvent f =
(ForumInvitationResponseReceivedEvent) e;
ForumInvitationResponse r = f.getMessageHeader();
if (r.getObject().getId().equals(getGroupId()) && r.wasAccepted()) {
if (r.getNameable().getId().equals(getGroupId()) && r.wasAccepted()) {
LOG.info("Forum invitation was accepted");
onForumInvitationAccepted(f.getContactId());
}

2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java
View File

@@ -100,7 +100,7 @@ class GroupControllerImpl extends
GroupInvitationResponseReceivedEvent g =
(GroupInvitationResponseReceivedEvent) e;
GroupInvitationResponse r = g.getMessageHeader();
if (getGroupId().equals(r.getObject().getId()) && r.wasAccepted()) {
if (getGroupId().equals(r.getNameable().getId()) && r.wasAccepted()) {
listener.runOnUiThreadUnlessDestroyed(
() -> listener.onInvitationAccepted(g.getContactId()));
}