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

Factor out generic sharing code from ForumSharingManger

Browse Source
This commit is contained in:
str4d
2016-06-16 04:26:49 +00:00
parent 5df2776dc2
commit 9ae64124d3
49 changed files with 1723 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/contact/ContactListFragment.java
View File

@@ -352,7 +352,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
now = System.currentTimeMillis();
Collection<ForumInvitationMessage> invitations =
forumSharingManager.getForumInvitationMessages(id);
forumSharingManager.getInvitationMessages(id);
for (ForumInvitationMessage i : invitations) {
messages.add(ConversationItem.from(i));
}

2
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -316,7 +316,7 @@ public class ConversationActivity extends BriarActivity
.getIntroductionMessages(contactId);
Collection<ForumInvitationMessage> invitations =
forumSharingManager
.getForumInvitationMessages(contactId);
.getInvitationMessages(contactId);
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Loading headers took " + duration + " ms");

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

@@ -82,7 +82,7 @@ public class AvailableForumsActivity extends BriarActivity
try {
Collection<ForumContacts> available = new ArrayList<>();
long now = System.currentTimeMillis();
for (Forum f : forumSharingManager.getAvailableForums()) {
for (Forum f : forumSharingManager.getAvailable()) {
try {
Collection<Contact> c =
forumSharingManager.getSharedBy(f.getId());

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

@@ -38,7 +38,7 @@ import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.forum.ShareForumActivity.CONTACTS;
import static org.briarproject.android.forum.ShareForumActivity.getContactsFromIds;
import static org.briarproject.api.forum.ForumConstants.GROUP_ID;
import static org.briarproject.api.sharing.SharingConstants.GROUP_ID;
public class ContactSelectorFragment extends BaseFragment implements
BaseContactListAdapter.OnItemClickListener {

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

@@ -177,7 +177,7 @@ public class ForumListFragment extends BaseEventFragment implements
try {
long now = System.currentTimeMillis();
int available =
forumSharingManager.getAvailableForums().size();
forumSharingManager.getAvailable().size();
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Loading available took " + duration + " ms");

4
briar-android/src/org/briarproject/android/forum/ShareForumMessageFragment.java
View File

@@ -28,7 +28,7 @@ import static android.widget.Toast.LENGTH_SHORT;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.forum.ShareForumActivity.CONTACTS;
import static org.briarproject.android.forum.ShareForumActivity.getContactsFromIds;
import static org.briarproject.api.forum.ForumConstants.GROUP_ID;
import static org.briarproject.api.sharing.SharingConstants.GROUP_ID;
public class ShareForumMessageFragment extends BaseFragment {
@@ -136,7 +136,7 @@ public class ShareForumMessageFragment extends BaseFragment {
public void run() {
try {
for (ContactId c : contacts) {
forumSharingManager.sendForumInvitation(groupId, c,
forumSharingManager.sendInvitation(groupId, c,
msg);
}
} catch (DbException e) {