Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Return proper Invitation objects in SharingManager

Browse Source 
Fixes #470
This commit is contained in:
Torsten Grote
2016-08-03 16:52:42 -03:00
parent 3bbc8dcc4e
commit 17db03d40a
15 changed files with 135 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/org/briarproject/android/sharing/BlogInvitationAdapter.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import org.briarproject.R;
import org.briarproject.api.blogs.Blog;
import org.briarproject.api.sharing.InvitationItem;
class BlogInvitationAdapter extends InvitationAdapter {

1
briar-android/src/org/briarproject/android/sharing/ForumInvitationAdapter.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.android.sharing;
import android.content.Context;
import org.briarproject.api.forum.Forum;
import org.briarproject.api.sharing.InvitationItem;
class ForumInvitationAdapter extends InvitationAdapter {

6
briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java
View File

@@ -12,6 +12,7 @@ import android.widget.TextView;
import org.briarproject.R;
import org.briarproject.android.util.TextAvatarView;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.util.StringUtils;
import java.util.ArrayList;
@@ -48,7 +49,8 @@ abstract class InvitationAdapter extends
final InvitationItem item = getItem(position);
Collection<String> names = new ArrayList<>();
for (Contact c : item.getContacts()) names.add(c.getAuthor().getName());
for (Contact c : item.getNewSharers())
names.add(c.getAuthor().getName());
ui.sharedBy.setText(ctx.getString(R.string.shared_by_format,
StringUtils.join(names, ", ")));
@@ -153,7 +155,7 @@ abstract class InvitationAdapter extends
public boolean areContentsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.isSubscribed() == newItem.isSubscribed() &&
oldItem.getContacts().equals(newItem.getContacts());
oldItem.getNewSharers().equals(newItem.getNewSharers());
}
@Override

33
briar-android/src/org/briarproject/android/sharing/InvitationItem.java
View File

@@ -1,33 +0,0 @@
package org.briarproject.android.sharing;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.sharing.Shareable;
import java.util.Collection;
class InvitationItem {
private final Shareable shareable;
private final boolean subscribed;
private final Collection<Contact> contacts;
InvitationItem(Shareable shareable, boolean subscribed,
Collection<Contact> contacts) {
this.shareable = shareable;
this.subscribed = subscribed;
this.contacts = contacts;
}
Shareable getShareable() {
return shareable;
}
boolean isSubscribed() {
return subscribed;
}
Collection<Contact> getContacts() {
return contacts;
}
}

1
briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java
View File

@@ -12,6 +12,7 @@ import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.sharing.InvitationItem;
import java.util.Collection;
import java.util.logging.Logger;

22
briar-android/src/org/briarproject/android/sharing/InvitationsBlogActivity.java
View File

@@ -9,11 +9,11 @@ import org.briarproject.api.blogs.BlogManager;
import org.briarproject.api.blogs.BlogSharingManager;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchGroupException;
import org.briarproject.api.event.BlogInvitationReceivedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.GroupAddedEvent;
import org.briarproject.api.event.GroupRemovedEvent;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.api.sync.ClientId;
import java.util.ArrayList;
@@ -71,30 +71,18 @@ public class InvitationsBlogActivity extends InvitationsActivity {
runOnDbThread(new Runnable() {
@Override
public void run() {
Collection<InvitationItem> invitations = new ArrayList<>();
try {
Collection<InvitationItem> invitations = new ArrayList<>();
long now = System.currentTimeMillis();
for (Blog b : blogSharingManager.getInvited()) {
boolean subscribed;
try {
blogManager.getBlog(b.getId());
subscribed = true;
} catch (NoSuchGroupException e) {
subscribed = false;
}
Collection<Contact> c =
blogSharingManager.getSharedBy(b.getId());
invitations.add(
new InvitationItem(b, subscribed, c));
}
invitations.addAll(blogSharingManager.getInvitations());
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Load took " + duration + " ms");
displayInvitations(invitations, clear);
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
}
displayInvitations(invitations, clear);
}
});
}
@@ -106,7 +94,7 @@ public class InvitationsBlogActivity extends InvitationsActivity {
public void run() {
try {
Blog b = (Blog) item.getShareable();
for (Contact c : item.getContacts()) {
for (Contact c : item.getNewSharers()) {
blogSharingManager.respondToInvitation(b, c, accept);
}
} catch (DbException e) {

22
briar-android/src/org/briarproject/android/sharing/InvitationsForumActivity.java
View File

@@ -6,7 +6,6 @@ import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchGroupException;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.ForumInvitationReceivedEvent;
import org.briarproject.api.event.GroupAddedEvent;
@@ -14,6 +13,7 @@ import org.briarproject.api.event.GroupRemovedEvent;
import org.briarproject.api.forum.Forum;
import org.briarproject.api.forum.ForumManager;
import org.briarproject.api.forum.ForumSharingManager;
import org.briarproject.api.sharing.InvitationItem;
import org.briarproject.api.sync.ClientId;
import java.util.ArrayList;
@@ -71,30 +71,18 @@ public class InvitationsForumActivity extends InvitationsActivity {
runOnDbThread(new Runnable() {
@Override
public void run() {
Collection<InvitationItem> invitations = new ArrayList<>();
try {
Collection<InvitationItem> forums = new ArrayList<>();
long now = System.currentTimeMillis();
for (Forum f : forumSharingManager.getInvited()) {
boolean subscribed;
try {
forumManager.getForum(f.getId());
subscribed = true;
} catch (NoSuchGroupException e) {
subscribed = false;
}
Collection<Contact> c =
forumSharingManager.getSharedBy(f.getId());
forums.add(
new InvitationItem(f, subscribed, c));
}
invitations.addAll(forumSharingManager.getInvitations());
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Load took " + duration + " ms");
displayInvitations(forums, clear);
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
}
displayInvitations(invitations, clear);
}
});
}
@@ -106,7 +94,7 @@ public class InvitationsForumActivity extends InvitationsActivity {
public void run() {
try {
Forum f = (Forum) item.getShareable();
for (Contact c : item.getContacts()) {
for (Contact c : item.getNewSharers()) {
forumSharingManager.respondToInvitation(f, c, accept);
}
} catch (DbException e) {