merge with master and fixes after comments

This commit is contained in:
Ernir Erlingsson
2016-09-27 23:34:00 +02:00
parent 33795e7046
commit 92f2e7b0fc
10 changed files with 186 additions and 146 deletions

View File

@@ -1,5 +1,7 @@
package org.briarproject.android.util;
import android.support.annotation.UiThread;
import org.briarproject.api.clients.MessageTree;
import org.briarproject.clients.MessageTreeImpl;
@@ -8,7 +10,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
/* This class is not thread safe */
@UiThread
public class NestedTreeList<T extends MessageTree.MessageNode>
implements Iterable<T> {