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

Removed restricted groups (may be restored after beta testing).

Browse Source
This commit is contained in:
akwizgran
2013-09-27 15:11:04 +01:00
parent 1e5e067df7
commit b94954544d
31 changed files with 219 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
View File

@@ -140,7 +140,6 @@ OnItemClickListener {
long now = System.currentTimeMillis();
for(GroupStatus s : db.getAvailableGroups()) {
Group g = s.getGroup();
if(g.isRestricted()) continue;
if(s.isSubscribed()) {
try {
Collection<GroupMessageHeader> headers =
@@ -242,11 +241,8 @@ OnItemClickListener {
public void eventOccurred(DatabaseEvent e) {
if(e instanceof GroupMessageAddedEvent) {
Group g = ((GroupMessageAddedEvent) e).getGroup();
if(!g.isRestricted()) {
if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading");
loadHeaders(g);
}
if(LOG.isLoggable(INFO)) LOG.info("Message added, reloading");
loadHeaders(((GroupMessageAddedEvent) e).getGroup());
} else if(e instanceof MessageExpiredEvent) {
if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading");
loadHeaders();
@@ -255,18 +251,12 @@ OnItemClickListener {
LOG.info("Remote subscriptions changed, reloading");
loadAvailable();
} else if(e instanceof SubscriptionAddedEvent) {
Group g = ((SubscriptionAddedEvent) e).getGroup();
if(!g.isRestricted()) {
if(LOG.isLoggable(INFO)) LOG.info("Group added, reloading");
loadHeaders();
}
if(LOG.isLoggable(INFO)) LOG.info("Group added, reloading");
loadHeaders();
} else if(e instanceof SubscriptionRemovedEvent) {
Group g = ((SubscriptionRemovedEvent) e).getGroup();
if(!g.isRestricted()) {
// Reload the group, expecting NoSuchSubscriptionException
if(LOG.isLoggable(INFO)) LOG.info("Group removed, reloading");
loadHeaders(g);
}
// Reload the group, expecting NoSuchSubscriptionException
if(LOG.isLoggable(INFO)) LOG.info("Group removed, reloading");
loadHeaders(((SubscriptionRemovedEvent) e).getGroup());
}
}
@@ -317,10 +307,8 @@ OnItemClickListener {
lifecycleManager.waitForDatabase();
int available = 0;
long now = System.currentTimeMillis();
for(GroupStatus s : db.getAvailableGroups()) {
if(!s.getGroup().isRestricted() && !s.isSubscribed())
available++;
}
for(GroupStatus s : db.getAvailableGroups())
if(!s.isSubscribed()) available++;
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Loading available took " + duration + " ms");

22
briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
View File

@@ -5,11 +5,8 @@ import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.groups.ManageGroupsItem.NONE;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
@@ -78,13 +75,10 @@ implements DatabaseListener, OnItemClickListener {
try {
lifecycleManager.waitForDatabase();
long now = System.currentTimeMillis();
List<GroupStatus> available = new ArrayList<GroupStatus>();
for(GroupStatus s : db.getAvailableGroups())
if(!s.getGroup().isRestricted()) available.add(s);
Collection<GroupStatus> available = db.getAvailableGroups();
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Load took " + duration + " ms");
available = Collections.unmodifiableList(available);
displayAvailableGroups(available);
} catch(DbException e) {
if(LOG.isLoggable(WARNING))
@@ -124,17 +118,11 @@ implements DatabaseListener, OnItemClickListener {
LOG.info("Remote subscriptions changed, reloading");
loadAvailableGroups();
} else if(e instanceof SubscriptionAddedEvent) {
Group g = ((SubscriptionAddedEvent) e).getGroup();
if(g.isRestricted()) {
if(LOG.isLoggable(INFO)) LOG.info("Group added, reloading");
loadAvailableGroups();
}
if(LOG.isLoggable(INFO)) LOG.info("Group added, reloading");
loadAvailableGroups();
} else if(e instanceof SubscriptionRemovedEvent) {
Group g = ((SubscriptionRemovedEvent) e).getGroup();
if(g.isRestricted()) {
if(LOG.isLoggable(INFO)) LOG.info("Group removed, reloading");
loadAvailableGroups();
}
if(LOG.isLoggable(INFO)) LOG.info("Group removed, reloading");
loadAvailableGroups();
}
}

9
briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java
View File

@@ -11,10 +11,7 @@ import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
@@ -213,14 +210,12 @@ implements OnItemSelectedListener, OnClickListener {
public void run() {
try {
lifecycleManager.waitForDatabase();
List<Group> groups = new ArrayList<Group>();
long now = System.currentTimeMillis();
for(Group g : db.getSubscriptions())
if(!g.isRestricted()) groups.add(g);
Collection<Group> groups = db.getSubscriptions();
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Loading groups took " + duration + " ms");
displayGroups(Collections.unmodifiableList(groups));
displayGroups(groups);
} catch(DbException e) {
if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);