Remember to return

.gitlab-ci.yml

@@ -2,7 +2,6 @@ image: briar/ci-image-android:latest
 
 stages:
 - test
-- optional_tests
 - check_reproducibility
 
 test:
@@ -32,33 +31,3 @@ test_reproducible:
     - "curl -X POST -F token=${RELEASE_CHECK_TOKEN} -F ref=master -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
   only:
     - tags
-
-.optional_tests:
-  stage: optional_tests
-  before_script:
-    - set -e
-    - export GRADLE_USER_HOME=$PWD/.gradle
-
-  cache:
-    paths:
-      - .gradle/wrapper
-      - .gradle/caches
-
-  script:
-    - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
-
-  after_script:
-    # these file change every time but should not be cached
-    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
-    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
-
-manual_tests:
-  extends: .optional_tests
-  when: manual
-  except:
-    - tags
-
-pre_release_tests:
-  extends: .optional_tests
-  only:
-    - tags

bramble-android/build.gradle

@@ -11,8 +11,8 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10214
-		versionName "1.2.14"
+		versionCode 10213
+		versionName "1.2.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
@@ -120,17 +119,4 @@ public interface ClientHelper {
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 
-	/**
-	 * Retrieves the contact ID from the group metadata of the given contact
-	 * group.
-	 */
-	ContactId getContactId(Transaction txn, GroupId contactGroupId)
-		throws DbException, FormatException;
-
-	/**
-	 * Stores the given contact ID in the group metadata of the given contact
-	 * group.
-	 */
-	void setContactId(Transaction txn, GroupId contactGroupId, ContactId c)
-		throws DbException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupConstants.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-public interface ContactGroupConstants {
-
-	/**
-	 * Group metadata key for associating a contact ID with a contact group.
-	 */
-	String GROUP_KEY_CONTACT_ID = "contactId";
-}

bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java

@@ -6,9 +6,7 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
 
-@Immutable
 @NotNullByDefault
 public class ValidationUtils {
 
@@ -66,9 +64,4 @@ public class ValidationUtils {
 		if (dictionary != null && dictionary.size() != size)
 			throw new FormatException();
 	}
-
-	public static void checkRange(@Nullable Long l, long min, long max)
-			throws FormatException {
-		if (l != null && (l < min || l > max)) throw new FormatException();
-	}
 }

bramble-api/src/test/java/org/briarproject/bramble/test/TimeTravel.java

@@ -1,8 +0,0 @@
-package org.briarproject.bramble.test;
-
-public interface TimeTravel {
-
-	void setCurrentTimeMillis(long now) throws InterruptedException;
-
-	void addCurrentTimeMillis(long add) throws InterruptedException;
-}

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java

@@ -21,6 +21,7 @@ import org.briarproject.bramble.rendezvous.RendezvousModule;
 import org.briarproject.bramble.settings.SettingsModule;
 import org.briarproject.bramble.sync.SyncModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
+import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 
@@ -28,6 +29,7 @@ import dagger.Module;
 
 @Module(includes = {
 		ClientModule.class,
+		ClockModule.class,
 		ConnectionModule.class,
 		ContactModule.class,
 		CryptoModule.class,

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -2,13 +2,11 @@ package org.briarproject.bramble.client;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfEntry;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.BdfReader;
 import org.briarproject.bramble.api.data.BdfReaderFactory;
@@ -41,7 +39,6 @@ import java.util.Map.Entry;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.client.ContactGroupConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
@@ -392,27 +389,4 @@ class ClientHelperImpl implements ClientHelper {
 		return tpMap;
 	}
 
-	@Override
-	public ContactId getContactId(Transaction txn, GroupId contactGroupId)
-			throws DbException {
-		try {
-			BdfDictionary meta =
-					getGroupMetadataAsDictionary(txn, contactGroupId);
-			return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue());
-		} catch (FormatException e) {
-			throw new DbException(e); // Invalid group metadata
-		}
-	}
-
-	@Override
-	public void setContactId(Transaction txn, GroupId contactGroupId,
-			ContactId c) throws DbException {
-		BdfDictionary meta = BdfDictionary.of(
-				new BdfEntry(GROUP_KEY_CONTACT_ID, c.getInt()));
-		try {
-			mergeGroupMetadata(txn, contactGroupId, meta);
-		} catch (FormatException e) {
-			throw new AssertionError(e);
-		}
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningConstants.java

@@ -5,5 +5,6 @@ interface ClientVersioningConstants {
 	// Metadata keys
 	String MSG_KEY_UPDATE_VERSION = "version";
 	String MSG_KEY_LOCAL = "local";
+	String GROUP_KEY_CONTACT_ID = "contactId";
 }
 

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java

@@ -50,6 +50,7 @@ import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
+import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
 
@@ -160,7 +161,13 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 		db.addGroup(txn, g);
 		db.setGroupVisibility(txn, c.getId(), g.getId(), SHARED);
 		// Attach the contact ID to the group
-		clientHelper.setContactId(txn, g.getId(), c.getId());
+		BdfDictionary meta = new BdfDictionary();
+		meta.put(GROUP_KEY_CONTACT_ID, c.getId().getInt());
+		try {
+			clientHelper.mergeGroupMetadata(txn, g.getId(), meta);
+		} catch (FormatException e) {
+			throw new AssertionError(e);
+		}
 		// Create and store the first local update
 		List<ClientVersion> versions = new ArrayList<>(clients);
 		Collections.sort(versions);
@@ -222,7 +229,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 			Map<ClientMajorVersion, Visibility> after =
 					getVisibilities(newLocalStates, newRemoteStates);
 			// Call hooks for any visibilities that have changed
-			ContactId c = clientHelper.getContactId(txn, m.getGroupId());
+			ContactId c = getContactId(txn, m.getGroupId());
 			if (!before.equals(after)) {
 				Contact contact = db.getContact(txn, c);
 				callVisibilityHooks(txn, contact, before, after);
@@ -514,6 +521,17 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 		storeUpdate(txn, g, states, 1);
 	}
 
+	private ContactId getContactId(Transaction txn, GroupId g)
+			throws DbException {
+		try {
+			BdfDictionary meta =
+					clientHelper.getGroupMetadataAsDictionary(txn, g);
+			return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue());
+		} catch (FormatException e) {
+			throw new DbException(e);
+		}
+	}
+
 	private List<ClientState> updateStatesFromRemoteStates(
 			List<ClientState> oldLocalStates, List<ClientState> remoteStates) {
 		Set<ClientMajorVersion> remoteSet = new HashSet<>();

bramble-core/src/test/java/org/briarproject/bramble/BrambleCoreIntegrationTestEagerSingletons.java

@@ -1,18 +1,18 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.system.TimeTravelModule;
+import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
 
 public interface BrambleCoreIntegrationTestEagerSingletons
 		extends BrambleCoreEagerSingletons {
 
-	void inject(TimeTravelModule.EagerSingletons init);
+	void inject(DefaultTaskSchedulerModule.EagerSingletons init);
 
 	class Helper {
 
 		public static void injectEagerSingletons(
 				BrambleCoreIntegrationTestEagerSingletons c) {
 			BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
-			c.inject(new TimeTravelModule.EagerSingletons());
+			c.inject(new DefaultTaskSchedulerModule.EagerSingletons());
 		}
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/system/TestTaskScheduler.java

@@ -1,122 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-
-import java.util.Queue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.junit.Assert.fail;
-
-/**
- * A {@link TaskScheduler} for use in tests. The scheduler keeps all scheduled
- * tasks in a queue until {@link #runTasks()} is called.
- */
-@NotNullByDefault
-class TestTaskScheduler implements TaskScheduler {
-
-	private final Queue<Task> queue = new PriorityBlockingQueue<>();
-	private final Clock clock;
-
-	TestTaskScheduler(Clock clock) {
-		this.clock = clock;
-	}
-
-	@Override
-	public Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return schedule(task, executor, delay, unit, cancelled);
-	}
-
-	@Override
-	public Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return scheduleWithFixedDelay(task, executor, delay, interval, unit,
-				cancelled);
-	}
-
-	private Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit, AtomicBoolean cancelled) {
-		long delayMillis = MILLISECONDS.convert(delay, unit);
-		long dueMillis = clock.currentTimeMillis() + delayMillis;
-		Task t = new Task(task, executor, dueMillis, cancelled);
-		queue.add(t);
-		return t;
-	}
-
-	private Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit, AtomicBoolean cancelled) {
-		// All executions of this periodic task share a cancelled flag
-		Runnable wrapped = () -> {
-			task.run();
-			scheduleWithFixedDelay(task, executor, interval, interval, unit,
-					cancelled);
-		};
-		return schedule(wrapped, executor, delay, unit, cancelled);
-	}
-
-	/**
-	 * Runs any scheduled tasks that are due.
-	 */
-	void runTasks() throws InterruptedException {
-		long now = clock.currentTimeMillis();
-		while (true) {
-			Task t = queue.peek();
-			if (t == null || t.dueMillis > now) return;
-			t = queue.poll();
-			// Submit the task to its executor and wait for it to finish
-			if (!t.run().await(1, MINUTES)) fail();
-		}
-	}
-
-	private static class Task
-			implements Cancellable, Comparable<Task> {
-
-		private final Runnable task;
-		private final Executor executor;
-		private final long dueMillis;
-		private final AtomicBoolean cancelled;
-
-		private Task(Runnable task, Executor executor, long dueMillis,
-				AtomicBoolean cancelled) {
-			this.task = task;
-			this.executor = executor;
-			this.dueMillis = dueMillis;
-			this.cancelled = cancelled;
-		}
-
-		@SuppressWarnings("UseCompareMethod") // Animal Sniffer
-		@Override
-		public int compareTo(Task task) {
-			return Long.valueOf(dueMillis).compareTo(task.dueMillis);
-		}
-
-		/**
-		 * Submits the task to its executor and returns a latch that will be
-		 * released when the task finishes.
-		 */
-		public CountDownLatch run() {
-			if (cancelled.get()) return new CountDownLatch(0);
-			CountDownLatch latch = new CountDownLatch(1);
-			executor.execute(() -> {
-				task.run();
-				latch.countDown();
-			});
-			return latch;
-		}
-
-		@Override
-		public void cancel() {
-			cancelled.set(true);
-		}
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/system/TimeTravelModule.java

@@ -1,98 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.test.SettableClock;
-import org.briarproject.bramble.test.TimeTravel;
-
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class TimeTravelModule {
-
-	public static class EagerSingletons {
-		@Inject
-		TaskScheduler scheduler;
-	}
-
-	private final ScheduledExecutorService scheduledExecutorService;
-	private final Clock clock;
-	private final TaskScheduler taskScheduler;
-	private final TimeTravel timeTravel;
-
-	public TimeTravelModule() {
-		this(false);
-	}
-
-	public TimeTravelModule(boolean travel) {
-		// Discard tasks that are submitted during shutdown
-		RejectedExecutionHandler policy =
-				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduledExecutorService =
-				new ScheduledThreadPoolExecutor(1, policy);
-		if (travel) {
-			// Use a SettableClock and TestTaskScheduler to allow time travel
-			AtomicLong time = new AtomicLong(System.currentTimeMillis());
-			clock = new SettableClock(time);
-			TestTaskScheduler testTaskScheduler = new TestTaskScheduler(clock);
-			taskScheduler = testTaskScheduler;
-			timeTravel = new TimeTravel() {
-				@Override
-				public void setCurrentTimeMillis(long now)
-						throws InterruptedException {
-					time.set(now);
-					testTaskScheduler.runTasks();
-				}
-
-				@Override
-				public void addCurrentTimeMillis(long add)
-						throws InterruptedException {
-					time.addAndGet(add);
-					testTaskScheduler.runTasks();
-				}
-			};
-		} else {
-			// Use the default clock and task scheduler
-			clock = new SystemClock();
-			taskScheduler = new TaskSchedulerImpl(scheduledExecutorService);
-			timeTravel = new TimeTravel() {
-				@Override
-				public void setCurrentTimeMillis(long now) {
-					throw new UnsupportedOperationException();
-				}
-
-				@Override
-				public void addCurrentTimeMillis(long add) {
-					throw new UnsupportedOperationException();
-				}
-			};
-		}
-	}
-
-	@Provides
-	Clock provideClock() {
-		return clock;
-	}
-
-	@Provides
-	@Singleton
-	TaskScheduler provideTaskScheduler(LifecycleManager lifecycleManager) {
-		lifecycleManager.registerForShutdown(scheduledExecutorService);
-		return taskScheduler;
-	}
-
-	@Provides
-	TimeTravel provideTimeTravel() {
-		return timeTravel;
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java

@@ -3,8 +3,8 @@ package org.briarproject.bramble.test;
 import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.battery.DefaultBatteryManagerModule;
 import org.briarproject.bramble.event.DefaultEventExecutorModule;
+import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
 import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule;
-import org.briarproject.bramble.system.TimeTravelModule;
 
 import dagger.Module;
 import dagger.Provides;
@@ -12,11 +12,11 @@ import dagger.Provides;
 @Module(includes = {
 		DefaultBatteryManagerModule.class,
 		DefaultEventExecutorModule.class,
+		DefaultTaskSchedulerModule.class,
 		DefaultWakefulIoExecutorModule.class,
 		TestDatabaseConfigModule.class,
 		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
-		TimeTravelModule.class
+		TestSecureRandomModule.class
 })
 public class BrambleCoreIntegrationTestModule {
 

bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java

@@ -38,6 +38,7 @@ import static org.briarproject.bramble.test.TestUtils.getContact;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
+import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
 import static org.junit.Assert.assertEquals;
@@ -59,6 +60,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 	private final ClientId clientId = getClientId();
 	private final long now = System.currentTimeMillis();
 	private final Transaction txn = new Transaction(null, false);
+	private final BdfDictionary groupMeta = BdfDictionary.of(
+			new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 	private ClientVersioningManagerImpl createInstance() {
 		context.checking(new Expectations() {{
@@ -120,8 +123,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).addGroup(txn, contactGroup);
 			oneOf(db).setGroupVisibility(txn, contact.getId(),
 					contactGroup.getId(), SHARED);
-			oneOf(clientHelper).setContactId(txn, contactGroup.getId(),
-					contact.getId());
+			oneOf(clientHelper).mergeGroupMetadata(txn, contactGroup.getId(),
+					groupMeta);
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(clientHelper).createMessage(contactGroup.getId(), now,
@@ -457,8 +460,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessage(txn, oldRemoteUpdateId);
 			oneOf(db).deleteMessageMetadata(txn, oldRemoteUpdateId);
 			// Get contact ID
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
-			will(returnValue(contact.getId()));
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			// No states or visibilities have changed
 		}});
 
@@ -488,9 +492,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			// Load the latest local update
 			oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId);
 			will(returnValue(oldLocalUpdateBody));
-			// Get contact ID
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
-			will(returnValue(contact.getId()));
+			// Get client ID
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			// No states or visibilities have changed
 		}});
 
@@ -541,6 +546,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 		BdfDictionary newLocalUpdateMeta = BdfDictionary.of(
 				new BdfEntry(MSG_KEY_UPDATE_VERSION, 2L),
 				new BdfEntry(MSG_KEY_LOCAL, true));
+		BdfDictionary groupMeta = BdfDictionary.of(
+				new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 		context.checking(new Expectations() {{
 			oneOf(clientHelper).toList(newRemoteUpdate);
@@ -570,8 +577,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).addLocalMessage(txn, newLocalUpdate,
 					newLocalUpdateMeta, true, false);
 			// The client's visibility has changed
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
-			will(returnValue(contact.getId()));
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			oneOf(db).getContact(txn, contact.getId());
 			will(returnValue(contact));
 			oneOf(hook).onClientVisibilityChanging(txn, contact, visibility);
@@ -611,6 +619,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 		BdfDictionary newLocalUpdateMeta = BdfDictionary.of(
 				new BdfEntry(MSG_KEY_UPDATE_VERSION, 2L),
 				new BdfEntry(MSG_KEY_LOCAL, true));
+		BdfDictionary groupMeta = BdfDictionary.of(
+				new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 		context.checking(new Expectations() {{
 			oneOf(clientHelper).toList(newRemoteUpdate);
@@ -640,8 +650,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).addLocalMessage(txn, newLocalUpdate,
 					newLocalUpdateMeta, true, false);
 			// The client's visibility has changed
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
-			will(returnValue(contact.getId()));
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			oneOf(db).getContact(txn, contact.getId());
 			will(returnValue(contact));
 			oneOf(hook).onClientVisibilityChanging(txn, contact, INVISIBLE);

bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java

@@ -8,9 +8,9 @@ import org.briarproject.bramble.system.JavaSystemModule;
 import dagger.Module;
 
 @Module(includes = {
-		CircumventionModule.class,
 		JavaNetworkModule.class,
 		JavaSystemModule.class,
+		CircumventionModule.class,
 		SocksModule.class
 })
 public class BrambleJavaModule {

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -53,7 +53,7 @@ public class BridgeTest extends BrambleTestCase {
 		return component.getCircumventionProvider().getBridges(false);
 	}
 
-	private final static long TIMEOUT = SECONDS.toMillis(60);
+	private final static long TIMEOUT = SECONDS.toMillis(30);
 
 	private final static Logger LOG = getLogger(BridgeTest.class.getName());
 

briar-android/artwork/notification_signout.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0 0,1 16,4V6H14V4H5V20H14V18H16V20A2,2 0 0,1 14,22H5A2,2 0 0,1 3,20V4A2,2 0 0,1 5,2H14Z" /></svg>

briar-android/build.gradle

@@ -22,11 +22,9 @@ android {
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10214
-		versionName "1.2.14"
+		versionCode 10213
+		versionName "1.2.13"
 		applicationId "org.briarproject.briar.android"
-
-		vectorDrawables.useSupportLibrary = true
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
 		def now = (long) (System.currentTimeMillis() / 1000)

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android;
 import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
-import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
@@ -17,7 +16,6 @@ import dagger.Component;
 @Component(modules = {
 		AppModule.class,
 		AttachmentModule.class,
-		ClockModule.class,
 		MediaModule.class,
 		BriarCoreModule.class,
 		BrambleAndroidModule.class,

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android;
 import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
-import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
@@ -18,7 +17,6 @@ import dagger.Component;
 @Component(modules = {
 		AppModule.class,
 		AttachmentModule.class,
-		ClockModule.class,
 		MediaModule.class,
 		BriarCoreModule.class,
 		BrambleAndroidModule.class,

briar-android/src/main/AndroidManifest.xml

@@ -448,6 +448,12 @@
 			android:label="@string/pending_contact_requests"
 			android:theme="@style/BriarTheme" />
 
+		<activity
+			android:name=".android.bluetoothsetup.BluetoothSetupActivity"
+			android:label="Bluetooth Setup"
+			android:theme="@style/BriarTheme"
+			android:windowSoftInputMode="adjustResize|stateHidden" />
+
 	</application>
 
 	<queries>

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -29,7 +29,6 @@ import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.plugin.tor.CircumventionProvider;
-import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
@@ -42,7 +41,6 @@ import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
 import org.briarproject.briar.api.attachment.AttachmentReader;
-import org.briarproject.briar.api.autodelete.AutoDeleteManager;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 import org.briarproject.briar.api.blog.BlogSharingManager;
@@ -77,7 +75,6 @@ import dagger.Component;
 		BriarAccountModule.class,
 		AppModule.class,
 		AttachmentModule.class,
-		ClockModule.class,
 		MediaModule.class
 })
 public interface AndroidComponent
@@ -182,8 +179,6 @@ public interface AndroidComponent
 
 	AndroidWakeLockManager wakeLockManager();
 
-	AutoDeleteManager autoDeleteManager();
-
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java

@@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 				R.string.ongoing_notification_title;
 		int text = locked ? R.string.lock_tap_to_unlock :
 				R.string.ongoing_notification_text;
-		int icon = locked ? R.drawable.notification_lock :
+		int icon = locked ? R.drawable.startup_lock :
 				R.drawable.notification_ongoing;
 		// Ongoing foreground notification that shows BriarService is running
 		NotificationCompat.Builder b =
@@ -624,7 +624,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 		NotificationCompat.Builder b =
 				new NotificationCompat.Builder(appContext, REMINDER_CHANNEL_ID);
-		b.setSmallIcon(R.drawable.notification_signout);
+		b.setSmallIcon(R.drawable.ic_signout);
 		b.setColor(getColor(appContext, R.color.briar_primary));
 		b.setContentTitle(
 				appContext.getText(R.string.reminder_notification_title));

briar-android/src/main/java/org/briarproject/briar/android/AppModule.java

@@ -30,16 +30,15 @@ import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
 import org.briarproject.briar.android.account.SetupModule;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupModule;
 import org.briarproject.briar.android.contact.ContactListModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
-import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
 import org.briarproject.briar.android.settings.SettingsModule;
-import org.briarproject.briar.android.sharing.SharingModule;
 import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -68,6 +67,7 @@ import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_ONION_ADDRESS;
 import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBLIC_KEY_HEX;
+import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 
 @Module(includes = {
 		SetupModule.class,
@@ -79,11 +79,10 @@ import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBL
 		SettingsModule.class,
 		DevReportModule.class,
 		ContactListModule.class,
+		BluetoothSetupModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
-		ForumModule.class,
+		ForumModule.BindsModule.class,
 		GroupListModule.class,
-		GroupConversationModule.class,
-		SharingModule.class,
 })
 public class AppModule {
 
@@ -268,12 +267,12 @@ public class AppModule {
 
 			@Override
 			public boolean shouldEnableImageAttachments() {
-				return false;
+				return IS_DEBUG_BUILD;
 			}
 
 			@Override
 			public boolean shouldEnableProfilePictures() {
-				return false;
+				return IS_DEBUG_BUILD;
 			}
 		};
 	}

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -20,6 +20,10 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupActivity;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupChooseFragment;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupPendingFragment;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupStartFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
@@ -27,12 +31,12 @@ import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
 import org.briarproject.briar.android.conversation.AliasDialogFragment;
 import org.briarproject.briar.android.conversation.ConversationActivity;
-import org.briarproject.briar.android.conversation.ConversationSettingsDialog;
 import org.briarproject.briar.android.conversation.ImageActivity;
 import org.briarproject.briar.android.conversation.ImageFragment;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
+import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
@@ -50,6 +54,7 @@ import org.briarproject.briar.android.navdrawer.TransportsActivity;
 import org.briarproject.briar.android.panic.PanicPreferencesActivity;
 import org.briarproject.briar.android.panic.PanicResponderActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupActivity;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupFragment;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupModule;
@@ -88,10 +93,12 @@ import dagger.Component;
 		ActivityModule.class,
 		BlogModule.class,
 		CreateGroupModule.class,
+		ForumModule.class,
 		GroupInvitationModule.class,
+		GroupConversationModule.class,
 		GroupMemberModule.class,
 		GroupRevealModule.class,
-		SharingModule.SharingLegacyModule.class
+		SharingModule.class
 }, dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
@@ -183,6 +190,8 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
+	void inject(BluetoothSetupActivity activity);
+
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -239,6 +248,10 @@ public interface ActivityComponent {
 
 	void inject(ConfirmAvatarDialogFragment fragment);
 
-	void inject(ConversationSettingsDialog dialog);
+	void inject(BluetoothSetupStartFragment fragment);
+
+	void inject(BluetoothSetupChooseFragment fragment);
+
+	void inject(BluetoothSetupPendingFragment fragment);
 
 }

briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java

@@ -14,6 +14,7 @@ import org.briarproject.briar.android.BriarApplication;
 import org.briarproject.briar.android.DestroyableContext;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.controller.ActivityLifecycleController;
+import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.util.UiUtils;
@@ -86,6 +87,7 @@ public abstract class BaseActivity extends AppCompatActivity
 		activityComponent = DaggerActivityComponent.builder()
 				.androidComponent(applicationComponent)
 				.activityModule(getActivityModule())
+				.forumModule(getForumModule())
 				.build();
 		injectActivity(activityComponent);
 		super.onCreate(state);
@@ -120,6 +122,11 @@ public abstract class BaseActivity extends AppCompatActivity
 		return new ActivityModule(this);
 	}
 
+	// TODO use a test module where this is used in tests
+	protected ForumModule getForumModule() {
+		return new ForumModule();
+	}
+
 	@Override
 	protected void onStart() {
 		super.onStart();

briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java

@@ -160,6 +160,7 @@ public abstract class BriarActivity extends BaseActivity {
 	 * @param ownLayout true if the custom toolbar brings its own layout
 	 * @return the Toolbar object or null if content view did not contain one
 	 */
+	@Nullable
 	protected Toolbar setUpCustomToolbar(boolean ownLayout) {
 		// Custom Toolbar
 		Toolbar toolbar = findViewById(R.id.toolbar);

briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java

@@ -20,7 +20,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.android.view.TextSendController.SendListener;
-import org.briarproject.briar.android.view.TextSendController.SendState;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.List;
@@ -28,9 +27,6 @@ import java.util.List;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
 import static android.view.View.FOCUS_DOWN;
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
@@ -38,7 +34,6 @@ import static android.view.View.VISIBLE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.blog.BasePostFragment.POST_ID;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
@@ -126,8 +121,8 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> headers) {
 		ui.input.hideSoftKeyboard();
 		feedController.repeatPost(item, text,
 				new UiExceptionHandler<DbException>(this) {
@@ -137,7 +132,6 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 					}
 				});
 		finish();
-		return new MutableLiveData<>(SENT);
 	}
 
 	private void showProgressBar() {

briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java

@@ -31,16 +31,12 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.briar.android.view.TextSendController.SendState;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
@@ -116,8 +112,8 @@ public class WriteBlogPostActivity extends BriarActivity
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> headers) {
 		if (isNullOrEmpty(text)) throw new AssertionError();
 
 		// hide publish button, show progress bar
@@ -126,7 +122,6 @@ public class WriteBlogPostActivity extends BriarActivity
 		progressBar.setVisibility(VISIBLE);
 
 		storePost(text);
-		return new MutableLiveData<>(SENT);
 	}
 
 	private void storePost(String text) {

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupActivity.java

@@ -0,0 +1,60 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupActivity extends BriarActivity implements
+		BaseFragmentListener {
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_fragment_container);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(BluetoothSetupViewModel.class);
+
+		if (state == null) {
+			showInitialFragment(new BluetoothSetupStartFragment());
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupChooseFragment.java

@@ -0,0 +1,72 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupChooseFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupChooseFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v =
+				inflater.inflate(R.layout.fragment_bluetooth_setup_choose,
+						container, false);
+
+		// TODO to enable when user picks a device from list
+
+		Button continueButton = v.findViewById(R.id.continueButton);
+		continueButton.setOnClickListener(view -> {
+			showNextFragment(new BluetoothSetupPendingFragment());
+		});
+		continueButton.setEnabled(true);
+
+//		RecyclerView devices = v.findViewById(R.id.devices);
+//		devices.setHasFixedSize(true);
+//		final LinearLayoutManager layoutManager =
+//				new LinearLayoutManager(getActivity(),
+//						LinearLayoutManager.VERTICAL, false);
+//		devices.setLayoutManager(layoutManager);
+
+		return v;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupModule.java

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class BluetoothSetupModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(BluetoothSetupViewModel.class)
+	abstract ViewModel bindBluetoothSetupViewModel(
+			BluetoothSetupViewModel bluetoothSetupViewModel);
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupPendingFragment.java

@@ -0,0 +1,59 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupPendingFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupPendingFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v = inflater.inflate(R.layout.fragment_bluetooth_setup_pending,
+				container, false);
+
+		return v;
+	}
+
+	private void onContinueButtonClicked() {
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupStartFragment.java

@@ -0,0 +1,65 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupStartFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupStartFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v = inflater.inflate(R.layout.fragment_bluetooth_setup_start,
+				container, false);
+
+		// TODO device-BT and BT-plugin needs to be enabled at this point
+
+		Button startButton = v.findViewById(R.id.startButton);
+		startButton.setOnClickListener(view -> {
+			showNextFragment(new BluetoothSetupChooseFragment());
+		});
+		startButton.setEnabled(true);
+
+		return v;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupViewModel.java

@@ -0,0 +1,33 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.TransactionManager;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.android.viewmodel.DbViewModel;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static java.util.logging.Logger.getLogger;
+
+@NotNullByDefault
+public class BluetoothSetupViewModel extends DbViewModel {
+
+	private final static Logger LOG =
+			getLogger(BluetoothSetupViewModel.class.getName());
+
+	@Inject
+	BluetoothSetupViewModel(Application application,
+			@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager,
+			TransactionManager db,
+			AndroidExecutor androidExecutor) {
+		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -15,6 +15,7 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupActivity;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
@@ -134,6 +135,11 @@ public class ContactListFragment extends BaseFragment
 			case R.id.action_add_contact_remotely:
 				startActivity(
 						new Intent(getContext(), AddContactActivity.class));
+				return;
+			case R.id.action_bluetooth_setup:
+				startActivity(
+						new Intent(getContext(),
+								BluetoothSetupActivity.class));
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java

@@ -7,7 +7,6 @@ import java.util.Collection;
 
 import androidx.annotation.UiThread;
 
-@Deprecated
 @NotNullByDefault
 public interface SharingController {
 

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java

@@ -18,7 +18,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
 
-@Deprecated
 @NotNullByDefault
 public class SharingControllerImpl implements SharingController, EventListener {
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java

@@ -31,8 +31,6 @@ import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-// TODO: we can probably switch to androidx DialogFragment here but need to
-//  test this properly
 public class AliasDialogFragment extends AppCompatDialogFragment {
 
 	final static String TAG = AliasDialogFragment.class.getName();

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.conversation;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.transition.Slide;
@@ -50,7 +49,6 @@ import org.briarproject.briar.android.blog.BlogActivity;
 import org.briarproject.briar.android.conversation.ConversationVisitor.AttachmentCache;
 import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache;
 import org.briarproject.briar.android.forum.ForumActivity;
-import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
@@ -60,7 +58,6 @@ import org.briarproject.briar.android.view.TextAttachmentController;
 import org.briarproject.briar.android.view.TextAttachmentController.AttachmentListener;
 import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendState;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.blog.BlogSharingManager;
@@ -108,7 +105,6 @@ import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
 import androidx.recyclerview.selection.StorageStrategy;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import de.hdodenhof.circleimageview.CircleImageView;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
@@ -140,14 +136,12 @@ import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.android.view.AuthorView.setAvatar;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACHMENTS_PER_MESSAGE;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH;
-import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_IMAGES_AUTO_DELETE;
-import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_ONLY;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class ConversationActivity extends BriarActivity
-		implements BaseFragmentListener, EventListener, ConversationListener,
-		TextCache, AttachmentCache, AttachmentListener, ActionMode.Callback {
+		implements EventListener, ConversationListener, TextCache,
+		AttachmentCache, AttachmentListener, ActionMode.Callback {
 
 	public static final String CONTACT_ID = "briar.CONTACT_ID";
 
@@ -272,11 +266,15 @@ public class ConversationActivity extends BriarActivity
 			ImagePreview imagePreview = findViewById(R.id.imagePreview);
 			sendController = new TextAttachmentController(textInputView,
 					imagePreview, this, viewModel);
-			observeOnce(viewModel.getPrivateMessageFormat(), this, format -> {
-				if (format != TEXT_ONLY) {
-					// TODO: remove cast when removing feature flag
-					((TextAttachmentController) sendController)
-							.setImagesSupported();
+			viewModel.hasImageSupport().observe(this, new Observer<Boolean>() {
+				@Override
+				public void onChanged(@Nullable Boolean hasSupport) {
+					if (hasSupport != null && hasSupport) {
+						// TODO: remove cast when removing feature flag
+						((TextAttachmentController) sendController)
+								.setImagesSupported();
+						viewModel.hasImageSupport().removeObserver(this);
+					}
 				}
 			});
 		} else {
@@ -286,9 +284,6 @@ public class ConversationActivity extends BriarActivity
 		textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
 		textInputView.setReady(false);
 		textInputView.setOnKeyboardShownListener(this::scrollToBottom);
-
-		viewModel.getAutoDeleteTimer().observe(this, timer ->
-				sendController.setAutoDeleteTimer(timer));
 	}
 
 	private void scrollToBottom() {
@@ -372,12 +367,6 @@ public class ConversationActivity extends BriarActivity
 		// enable alias action if available
 		observeOnce(viewModel.getContactItem(), this, contact ->
 				menu.findItem(R.id.action_set_alias).setEnabled(true));
-		// show auto-delete timer setting only, if contacts supports it
-		observeOnce(viewModel.getPrivateMessageFormat(), this, format -> {
-			boolean visible = format == TEXT_IMAGES_AUTO_DELETE;
-			MenuItem item = menu.findItem(R.id.action_conversation_settings);
-			item.setVisible(visible);
-		});
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -399,10 +388,6 @@ public class ConversationActivity extends BriarActivity
 				AliasDialogFragment.newInstance().show(
 						getSupportFragmentManager(), AliasDialogFragment.TAG);
 				return true;
-			case R.id.action_conversation_settings:
-				if (contactId == null) return false;
-				onAutoDeleteTimerNoticeClicked();
-				return true;
 			case R.id.action_delete_all_messages:
 				askToDeleteAllMessages();
 				return true;
@@ -494,10 +479,12 @@ public class ConversationActivity extends BriarActivity
 	@UiThread
 	private void displayContactOnlineStatus() {
 		if (connectionRegistry.isConnected(contactId)) {
-			toolbarStatus.setImageResource(R.drawable.contact_online);
+			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
+					ConversationActivity.this, R.drawable.contact_online));
 			toolbarStatus.setContentDescription(getString(R.string.online));
 		} else {
-			toolbarStatus.setImageResource(R.drawable.contact_offline);
+			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
+					ConversationActivity.this, R.drawable.contact_offline));
 			toolbarStatus.setContentDescription(getString(R.string.offline));
 		}
 	}
@@ -653,8 +640,8 @@ public class ConversationActivity extends BriarActivity
 				supportFinishAfterTransition();
 			}
 		} else if (e instanceof ConversationMessageReceivedEvent) {
-			ConversationMessageReceivedEvent<?> p =
-					(ConversationMessageReceivedEvent<?>) e;
+			ConversationMessageReceivedEvent p =
+					(ConversationMessageReceivedEvent) e;
 			if (p.getContactId().equals(contactId)) {
 				LOG.info("Message received, adding");
 				onNewConversationMessage(p.getMessageHeader());
@@ -748,13 +735,20 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> attachmentHeaders,
-			long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> attachmentHeaders) {
 		if (isNullOrEmpty(text) && attachmentHeaders.isEmpty())
 			throw new AssertionError();
-		return viewModel
-				.sendMessage(text, attachmentHeaders, expectedAutoDeleteTimer);
+		long timestamp = System.currentTimeMillis();
+		timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
+		viewModel.sendMessage(text, attachmentHeaders, timestamp);
+		textInputView.clearText();
+	}
+
+	private long getMinTimestampForNewMessage() {
+		// Don't use an earlier timestamp than the newest message
+		ConversationItem item = adapter.getLastItem();
+		return item == null ? 0 : item.getTime() + 1;
 	}
 
 	private void onAddedPrivateMessage(@Nullable PrivateMessageHeader h) {
@@ -941,16 +935,13 @@ public class ConversationActivity extends BriarActivity
 			return;
 		}
 
-		int color =
-				ContextCompat.getColor(this, R.color.briar_primary);
-		Drawable drawable = VectorDrawableCompat
-				.create(getResources(), R.drawable.ic_more_vert_accent, null);
 		new MaterialTapTargetPrompt.Builder(ConversationActivity.this,
 				R.style.OnboardingDialogTheme).setTarget(target)
 				.setPrimaryText(R.string.introduction_onboarding_title)
 				.setSecondaryText(R.string.introduction_onboarding_text)
-				.setIconDrawable(drawable)
-				.setBackgroundColour(color)
+				.setIcon(R.drawable.ic_more_vert_accent)
+				.setBackgroundColour(
+						ContextCompat.getColor(this, R.color.briar_primary))
 				.show();
 	}
 
@@ -964,11 +955,13 @@ public class ConversationActivity extends BriarActivity
 			adapter.notifyItemChanged(position, item);
 		}
 		runOnDbThread(() -> {
+			long timestamp = System.currentTimeMillis();
+			timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
 			try {
 				switch (item.getRequestType()) {
 					case INTRODUCTION:
 						respondToIntroductionRequest(item.getSessionId(),
-								accept);
+								accept, timestamp);
 						break;
 					case FORUM:
 						respondToForumRequest(item.getSessionId(), accept);
@@ -1042,18 +1035,11 @@ public class ConversationActivity extends BriarActivity
 		ActivityCompat.startActivity(this, i, options.toBundle());
 	}
 
-	@Override
-	public void onAutoDeleteTimerNoticeClicked() {
-		ConversationSettingsDialog dialog =
-				ConversationSettingsDialog.newInstance(contactId);
-		dialog.show(getSupportFragmentManager(),
-				ConversationSettingsDialog.TAG);
-	}
-
 	@DatabaseExecutor
 	private void respondToIntroductionRequest(SessionId sessionId,
-			boolean accept) throws DbException {
-		introductionManager.respondToIntroduction(contactId, sessionId, accept);
+			boolean accept, long time) throws DbException {
+		introductionManager.respondToIntroduction(contactId, sessionId, time,
+				accept);
 	}
 
 	@DatabaseExecutor

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java

@@ -13,8 +13,6 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.BriarAdapter;
 import org.briarproject.briar.android.util.ItemReturningAdapter;
 
-import java.util.Collection;
-
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.selection.SelectionTracker;
@@ -22,14 +20,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView.RecycledViewPool;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
 
 @NotNullByDefault
 class ConversationAdapter
 		extends BriarAdapter<ConversationItem, ConversationItemViewHolder>
 		implements ItemReturningAdapter<ConversationItem> {
 
-	private final ConversationListener listener;
+	private ConversationListener listener;
 	private final RecycledViewPool imageViewPool;
 	private final ImageItemDecoration imageItemDecoration;
 	@Nullable
@@ -68,20 +65,22 @@ class ConversationAdapter
 			@LayoutRes int type) {
 		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
 				type, viewGroup, false);
-		if (type == R.layout.list_item_conversation_msg_in) {
-			return new ConversationMessageViewHolder(v, listener, true,
-					imageViewPool, imageItemDecoration);
-		} else if (type == R.layout.list_item_conversation_msg_out) {
-			return new ConversationMessageViewHolder(v, listener, false,
-					imageViewPool, imageItemDecoration);
-		} else if (type == R.layout.list_item_conversation_notice_in) {
-			return new ConversationNoticeViewHolder(v, listener, true);
-		} else if (type == R.layout.list_item_conversation_notice_out) {
-			return new ConversationNoticeViewHolder(v, listener, false);
-		} else if (type == R.layout.list_item_conversation_request) {
-			return new ConversationRequestViewHolder(v, listener, true);
+		switch (type) {
+			case R.layout.list_item_conversation_msg_in:
+				return new ConversationMessageViewHolder(v, listener, true,
+						imageViewPool, imageItemDecoration);
+			case R.layout.list_item_conversation_msg_out:
+				return new ConversationMessageViewHolder(v, listener, false,
+						imageViewPool, imageItemDecoration);
+			case R.layout.list_item_conversation_notice_in:
+				return new ConversationNoticeViewHolder(v, listener, true);
+			case R.layout.list_item_conversation_notice_out:
+				return new ConversationNoticeViewHolder(v, listener, false);
+			case R.layout.list_item_conversation_request:
+				return new ConversationRequestViewHolder(v, listener, true);
+			default:
+				throw new IllegalArgumentException("Unknown ConversationItem");
 		}
-		throw new IllegalArgumentException("Unknown ConversationItem");
 	}
 
 	@Override
@@ -108,49 +107,22 @@ class ConversationAdapter
 		return c1.equals(c2);
 	}
 
-	@Override
-	public void add(ConversationItem item) {
-		items.beginBatchedUpdates();
-		items.add(item);
-		updateTimersInBatch();
-		items.endBatchedUpdates();
-	}
-
-	@Override
-	public void addAll(Collection<ConversationItem> itemsToAdd) {
-		items.beginBatchedUpdates();
-		// there can be items already in the adapter
-		// SortedList takes care of duplicates and detecting changed items
-		items.addAll(itemsToAdd);
-		updateTimersInBatch();
-		items.endBatchedUpdates();
-	}
-
-	private void updateTimersInBatch() {
-		long lastTimerIncoming = NO_AUTO_DELETE_TIMER;
-		long lastTimerOutgoing = NO_AUTO_DELETE_TIMER;
-		for (int i = 0; i < items.size(); i++) {
-			ConversationItem c = items.get(i);
-			boolean itemChanged;
-			boolean timerChanged;
-			if (c.isIncoming()) {
-				timerChanged = lastTimerIncoming != c.getAutoDeleteTimer();
-				lastTimerIncoming = c.getAutoDeleteTimer();
-			} else {
-				timerChanged = lastTimerOutgoing != c.getAutoDeleteTimer();
-				lastTimerOutgoing = c.getAutoDeleteTimer();
-			}
-			itemChanged = c.setTimerNoticeVisible(timerChanged);
-			if (itemChanged) items.updateItemAt(i, c);
-		}
-	}
-
 	void setSelectionTracker(SelectionTracker<String> tracker) {
 		this.tracker = tracker;
 	}
 
+	@Nullable
+	ConversationItem getLastItem() {
+		if (items.size() > 0) {
+			return items.get(items.size() - 1);
+		} else {
+			return null;
+		}
+	}
+
 	SparseArray<ConversationItem> getOutgoingMessages() {
 		SparseArray<ConversationItem> messages = new SparseArray<>();
+
 		for (int i = 0; i < items.size(); i++) {
 			ConversationItem item = items.get(i);
 			if (!item.isIncoming()) {

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java

@@ -9,7 +9,6 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import androidx.annotation.LayoutRes;
-import androidx.lifecycle.LiveData;
 
 import static org.briarproject.bramble.util.StringUtils.toHexString;
 
@@ -23,25 +22,20 @@ abstract class ConversationItem {
 	protected String text;
 	private final MessageId id;
 	private final GroupId groupId;
-	private final long time, autoDeleteTimer;
+	private final long time;
 	private final boolean isIncoming;
-	private final LiveData<String> contactName;
-	private boolean read, sent, seen, showTimerNotice;
+	private boolean read, sent, seen;
 
-	ConversationItem(@LayoutRes int layoutRes, ConversationMessageHeader h,
-			LiveData<String> contactName) {
+	ConversationItem(@LayoutRes int layoutRes, ConversationMessageHeader h) {
 		this.layoutRes = layoutRes;
 		this.text = null;
 		this.id = h.getId();
 		this.groupId = h.getGroupId();
 		this.time = h.getTimestamp();
-		this.autoDeleteTimer = h.getAutoDeleteTimer();
 		this.read = h.isRead();
 		this.sent = h.isSent();
 		this.seen = h.isSeen();
 		this.isIncoming = !h.isLocal();
-		this.contactName = contactName;
-		this.showTimerNotice = false;
 	}
 
 	@LayoutRes
@@ -74,10 +68,6 @@ abstract class ConversationItem {
 		return time;
 	}
 
-	public long getAutoDeleteTimer() {
-		return autoDeleteTimer;
-	}
-
 	/**
 	 * Only useful for incoming messages.
 	 */
@@ -121,25 +111,4 @@ abstract class ConversationItem {
 		return isIncoming;
 	}
 
-	public LiveData<String> getContactName() {
-		return contactName;
-	}
-
-	/**
-	 * Set this to true when {@link #getAutoDeleteTimer()} has changed
-	 * since the last message from the same peer.
-	 *
-	 * @return true if the value was set, false if it was already set.
-	 */
-	boolean setTimerNoticeVisible(boolean visible) {
-		if (this.showTimerNotice != visible) {
-			this.showTimerNotice = visible;
-			return true;
-		}
-		return false;
-	}
-
-	boolean isTimerNoticeVisible() {
-		return showTimerNotice;
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java

@@ -1,8 +1,6 @@
 package org.briarproject.briar.android.conversation;
 
-import android.content.Context;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -14,11 +12,8 @@ import androidx.annotation.UiThread;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
 import static org.briarproject.bramble.util.StringUtils.trim;
 import static org.briarproject.briar.android.util.UiUtils.formatDate;
-import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
 
 @UiThread
 @NotNullByDefault
@@ -29,9 +24,8 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 	protected final ConstraintLayout layout;
 	@Nullable
 	private final OutItemViewHolder outViewHolder;
-	private final TextView topNotice, text;
+	private final TextView text;
 	protected final TextView time;
-	protected final ImageView bomb;
 	@Nullable
 	private String itemKey = null;
 
@@ -39,13 +33,11 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 			boolean isIncoming) {
 		super(v);
 		this.listener = listener;
-		outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
+		this.outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
 		root = v;
-		topNotice = v.findViewById(R.id.topNotice);
 		layout = v.findViewById(R.id.layout);
 		text = v.findViewById(R.id.text);
 		time = v.findViewById(R.id.time);
-		bomb = v.findViewById(R.id.bomb);
 	}
 
 	@CallSuper
@@ -53,8 +45,6 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 		itemKey = item.getKey();
 		root.setActivated(selected);
 
-		setTopNotice(item);
-
 		if (item.getText() != null) {
 			text.setText(trim(item.getText()));
 		}
@@ -62,9 +52,6 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 		long timestamp = item.getTime();
 		time.setText(formatDate(time.getContext(), timestamp));
 
-		boolean showBomb = item.getAutoDeleteTimer() != NO_AUTO_DELETE_TIMER;
-		bomb.setVisibility(showBomb ? VISIBLE : GONE);
-
 		if (outViewHolder != null) outViewHolder.bind(item);
 	}
 
@@ -77,31 +64,4 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 		return itemKey;
 	}
 
-	private void setTopNotice(ConversationItem item) {
-		if (item.isTimerNoticeVisible()) {
-			Context ctx = itemView.getContext();
-			topNotice.setVisibility(VISIBLE);
-			boolean enabled = item.getAutoDeleteTimer() != NO_AUTO_DELETE_TIMER;
-			String tapToLearnMore = ctx.getString(R.string.tap_to_learn_more);
-			String text;
-			if (item.isIncoming()) {
-				String name = item.getContactName().getValue();
-				int strRes = enabled ?
-						R.string.auto_delete_msg_contact_enabled :
-						R.string.auto_delete_msg_contact_disabled;
-				text = ctx.getString(strRes, name, tapToLearnMore);
-			} else {
-				int strRes = enabled ?
-						R.string.auto_delete_msg_you_enabled :
-						R.string.auto_delete_msg_you_disabled;
-				text = ctx.getString(strRes, tapToLearnMore);
-			}
-			topNotice.setText(text);
-			topNotice.setOnClickListener(
-					v -> listener.onAutoDeleteTimerNoticeClicked());
-		} else {
-			topNotice.setVisibility(GONE);
-		}
-	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java

@@ -18,6 +18,4 @@ interface ConversationListener {
 	void onAttachmentClicked(View view, ConversationMessageItem messageItem,
 			AttachmentItem attachmentItem);
 
-	void onAutoDeleteTimerNoticeClicked();
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java

@@ -10,7 +10,6 @@ import javax.annotation.concurrent.NotThreadSafe;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
 
 @NotThreadSafe
 @NotNullByDefault
@@ -19,8 +18,8 @@ class ConversationMessageItem extends ConversationItem {
 	private final List<AttachmentItem> attachments;
 
 	ConversationMessageItem(@LayoutRes int layoutRes, PrivateMessageHeader h,
-			LiveData<String> contactName, List<AttachmentItem> attachments) {
-		super(layoutRes, h, contactName);
+			List<AttachmentItem> attachments) {
+		super(layoutRes, h);
 		this.attachments = attachments;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.conversation;
 
-import android.content.res.ColorStateList;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -15,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView.RecycledViewPool;
 
 import static androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT;
 import static androidx.core.content.ContextCompat.getColor;
-import static androidx.core.widget.ImageViewCompat.setImageTintList;
 
 @UiThread
 @NotNullByDefault
@@ -86,7 +84,6 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 		if (item.getText() == null) {
 			statusLayout.setBackgroundResource(R.drawable.msg_status_bubble);
 			time.setTextColor(timeColorBubble);
-			setImageTintList(bomb, ColorStateList.valueOf(timeColorBubble));
 			constraintSet = imageConstraints;
 		} else {
 			resetStatusLayoutForText();
@@ -114,7 +111,6 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 		// also reset padding (the background drawable defines some)
 		statusLayout.setPadding(0, 0, 0, 0);
 		time.setTextColor(timeColor);
-		setImageTintList(bomb, ColorStateList.valueOf(timeColor));
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java

@@ -8,7 +8,6 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import androidx.annotation.LayoutRes;
-import androidx.lifecycle.LiveData;
 
 @NotThreadSafe
 @NotNullByDefault
@@ -18,15 +17,15 @@ class ConversationNoticeItem extends ConversationItem {
 	private final String msgText;
 
 	ConversationNoticeItem(@LayoutRes int layoutRes, String text,
-			LiveData<String> contactName, ConversationRequest<?> r) {
-		super(layoutRes, r, contactName);
+			ConversationRequest r) {
+		super(layoutRes, r);
 		this.text = text;
 		this.msgText = r.getText();
 	}
 
 	ConversationNoticeItem(@LayoutRes int layoutRes, String text,
-			LiveData<String> contactName, ConversationResponse r) {
-		super(layoutRes, r, contactName);
+			ConversationResponse r) {
+		super(layoutRes, r);
 		this.text = text;
 		this.msgText = null;
 	}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java

@@ -11,7 +11,6 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import androidx.annotation.LayoutRes;
-import androidx.lifecycle.LiveData;
 
 @NotThreadSafe
 @NotNullByDefault
@@ -27,15 +26,14 @@ class ConversationRequestItem extends ConversationNoticeItem {
 	private boolean answered;
 
 	ConversationRequestItem(@LayoutRes int layoutRes, String text,
-			LiveData<String> contactName, RequestType type,
-			ConversationRequest<?> r) {
-		super(layoutRes, text, contactName, r);
+			RequestType type, ConversationRequest r) {
+		super(layoutRes, text, r);
 		this.requestType = type;
 		this.sessionId = r.getSessionId();
 		this.answered = r.wasAnswered();
 		if (r instanceof InvitationRequest) {
 			this.requestedGroupId = ((Shareable) r.getNameable()).getId();
-			this.canBeOpened = ((InvitationRequest<?>) r).canBeOpened();
+			this.canBeOpened = ((InvitationRequest) r).canBeOpened();
 		} else {
 			this.requestedGroupId = null;
 			this.canBeOpened = false;

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsDialog.java

@@ -1,122 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.fragment.BaseFragment;
-
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
-
-import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class ConversationSettingsDialog extends DialogFragment {
-
-	final static String TAG = ConversationSettingsDialog.class.getName();
-
-	private static final Logger LOG = Logger.getLogger(TAG);
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private ConversationViewModel viewModel;
-
-	static ConversationSettingsDialog newInstance(ContactId contactId) {
-		Bundle args = new Bundle();
-		args.putInt(CONTACT_ID, contactId.getInt());
-		ConversationSettingsDialog dialog = new ConversationSettingsDialog();
-		dialog.setArguments(args);
-		return dialog;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		injectFragment(((BaseFragment.BaseFragmentListener) context)
-				.getActivityComponent());
-	}
-
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(ConversationViewModel.class);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setStyle(DialogFragment.STYLE_NO_FRAME,
-				R.style.BriarFullScreenDialogTheme);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View view = inflater.inflate(R.layout.fragment_conversation_settings,
-				container, false);
-
-		Bundle args = requireArguments();
-		int id = args.getInt(CONTACT_ID, -1);
-		if (id == -1) throw new IllegalStateException();
-		ContactId contactId = new ContactId(id);
-
-		FragmentActivity activity = requireActivity();
-		viewModel = new ViewModelProvider(activity, viewModelFactory)
-				.get(ConversationViewModel.class);
-		viewModel.setContactId(contactId);
-
-		Toolbar toolbar = view.findViewById(R.id.toolbar);
-		toolbar.setNavigationOnClickListener(v -> dismiss());
-
-		SwitchCompat switchDisappearingMessages = view.findViewById(
-				R.id.switchDisappearingMessages);
-		switchDisappearingMessages.setOnCheckedChangeListener(
-				(button, value) -> viewModel.setAutoDeleteTimerEnabled(value));
-
-		TextView buttonLearnMore =
-				view.findViewById(R.id.buttonLearnMore);
-		buttonLearnMore.setOnClickListener(e -> showLearnMoreDialog());
-
-		viewModel.getAutoDeleteTimer()
-				.observe(getViewLifecycleOwner(), timer -> {
-					LOG.info("Received auto delete timer: " + timer);
-					boolean disappearingMessages =
-							timer != NO_AUTO_DELETE_TIMER;
-					switchDisappearingMessages
-							.setChecked(disappearingMessages);
-					switchDisappearingMessages.setEnabled(true);
-				});
-
-		return view;
-	}
-
-	private void showLearnMoreDialog() {
-		ConversationSettingsLearnMoreDialog
-				dialog = new ConversationSettingsLearnMoreDialog();
-		dialog.show(getChildFragmentManager(),
-				ConversationSettingsLearnMoreDialog.TAG);
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationSettingsLearnMoreDialog.java

@@ -1,43 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public class ConversationSettingsLearnMoreDialog extends DialogFragment {
-
-	final static String TAG =
-			ConversationSettingsLearnMoreDialog.class.getName();
-
-	@Override
-	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-		FragmentActivity activity = requireActivity();
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(activity,
-				R.style.OnboardingDialogTheme);
-
-		LayoutInflater inflater = LayoutInflater.from(builder.getContext());
-		View view = inflater.inflate(
-				R.layout.fragment_conversation_settings_learn_more, null);
-		builder.setView(view);
-
-		builder.setTitle(R.string.disappearing_messages_title);
-		builder.setPositiveButton(R.string.ok, null);
-
-		return builder.create();
-	}
-
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java

@@ -10,7 +10,6 @@ import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -29,22 +28,16 @@ import org.briarproject.briar.android.attachment.AttachmentResult;
 import org.briarproject.briar.android.attachment.AttachmentRetriever;
 import org.briarproject.briar.android.contact.ContactItem;
 import org.briarproject.briar.android.util.UiUtils;
-import org.briarproject.briar.android.view.TextSendController.SendState;
 import org.briarproject.briar.android.viewmodel.DbViewModel;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
-import org.briarproject.briar.api.autodelete.AutoDeleteManager;
-import org.briarproject.briar.api.autodelete.UnexpectedTimerException;
-import org.briarproject.briar.api.autodelete.event.AutoDeleteTimerMirroredEvent;
 import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent;
-import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.identity.AuthorInfo;
 import org.briarproject.briar.api.identity.AuthorManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
-import org.briarproject.briar.api.messaging.PrivateMessageFormat;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent;
 
@@ -62,8 +55,6 @@ import androidx.lifecycle.MutableLiveData;
 
 import static androidx.lifecycle.Transformations.map;
 import static java.util.Objects.requireNonNull;
-import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
@@ -71,12 +62,6 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
-import static org.briarproject.briar.android.view.TextSendController.SendState.ERROR;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
-import static org.briarproject.briar.android.view.TextSendController.SendState.UNEXPECTED_TIMER;
-import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
-import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_IMAGES;
-import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_ONLY;
 
 @NotNullByDefault
 public class ConversationViewModel extends DbViewModel
@@ -99,8 +84,6 @@ public class ConversationViewModel extends DbViewModel
 	private final PrivateMessageFactory privateMessageFactory;
 	private final AttachmentRetriever attachmentRetriever;
 	private final AttachmentCreator attachmentCreator;
-	private final AutoDeleteManager autoDeleteManager;
-	private final ConversationManager conversationManager;
 
 	@Nullable
 	private ContactId contactId = null;
@@ -109,7 +92,7 @@ public class ConversationViewModel extends DbViewModel
 	private final LiveData<String> contactName = map(contactItem, c ->
 			UiUtils.getContactDisplayName(c.getContact()));
 	private final LiveData<GroupId> messagingGroupId;
-	private final MutableLiveData<PrivateMessageFormat> privateMessageFormat =
+	private final MutableLiveData<Boolean> imageSupport =
 			new MutableLiveData<>();
 	private final MutableLiveEvent<Boolean> showImageOnboarding =
 			new MutableLiveEvent<>();
@@ -117,10 +100,8 @@ public class ConversationViewModel extends DbViewModel
 			new MutableLiveEvent<>();
 	private final MutableLiveData<Boolean> showIntroductionAction =
 			new MutableLiveData<>();
-	private final MutableLiveData<Long> autoDeleteTimer =
-			new MutableLiveData<>();
 	private final MutableLiveData<Boolean> contactDeleted =
-			new MutableLiveData<>(false);
+			new MutableLiveData<>();
 	private final MutableLiveEvent<PrivateMessageHeader> addedHeader =
 			new MutableLiveEvent<>();
 
@@ -137,9 +118,7 @@ public class ConversationViewModel extends DbViewModel
 			SettingsManager settingsManager,
 			PrivateMessageFactory privateMessageFactory,
 			AttachmentRetriever attachmentRetriever,
-			AttachmentCreator attachmentCreator,
-			AutoDeleteManager autoDeleteManager,
-			ConversationManager conversationManager) {
+			AttachmentCreator attachmentCreator) {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
 		this.db = db;
 		this.eventBus = eventBus;
@@ -150,10 +129,10 @@ public class ConversationViewModel extends DbViewModel
 		this.privateMessageFactory = privateMessageFactory;
 		this.attachmentRetriever = attachmentRetriever;
 		this.attachmentCreator = attachmentCreator;
-		this.autoDeleteManager = autoDeleteManager;
-		this.conversationManager = conversationManager;
 		messagingGroupId = map(contactItem, c ->
 				messagingManager.getContactGroup(c.getContact()).getId());
+		contactDeleted.setValue(false);
+
 		eventBus.addListener(this);
 	}
 
@@ -173,11 +152,6 @@ public class ConversationViewModel extends DbViewModel
 				runOnDbThread(() -> attachmentRetriever
 						.loadAttachmentItem(a.getMessageId()));
 			}
-		} else if (e instanceof AutoDeleteTimerMirroredEvent) {
-			AutoDeleteTimerMirroredEvent a = (AutoDeleteTimerMirroredEvent) e;
-			if (a.getContactId().equals(contactId)) {
-				autoDeleteTimer.postValue(a.getNewTimer());
-			}
 		} else if (e instanceof AvatarUpdatedEvent) {
 			AvatarUpdatedEvent a = (AvatarUpdatedEvent) e;
 			if (a.getContactId().equals(contactId)) {
@@ -227,11 +201,6 @@ public class ConversationViewModel extends DbViewModel
 				contactItem.postValue(new ContactItem(c, authorInfo));
 				logDuration(LOG, "Loading contact", start);
 				start = now();
-				long timer = db.transactionWithResult(true, txn ->
-						autoDeleteManager.getAutoDeleteTimer(txn, contactId));
-				autoDeleteTimer.postValue(timer);
-				logDuration(LOG, "Getting auto-delete timer", start);
-				start = now();
 				checkFeaturesAndOnboarding(contactId);
 				logDuration(LOG, "Checking for image support", start);
 			} catch (NoSuchContactException e) {
@@ -266,6 +235,20 @@ public class ConversationViewModel extends DbViewModel
 		});
 	}
 
+	@UiThread
+	void sendMessage(@Nullable String text,
+			List<AttachmentHeader> headers, long timestamp) {
+		// messagingGroupId is loaded with the contact
+		observeForeverOnce(messagingGroupId, groupId -> {
+			requireNonNull(groupId);
+			observeForeverOnce(imageSupport, hasImageSupport -> {
+				requireNonNull(hasImageSupport);
+				createMessage(groupId, text, headers, timestamp,
+						hasImageSupport);
+			});
+		});
+	}
+
 	@Override
 	@UiThread
 	public LiveData<AttachmentResult> storeAttachments(Collection<Uri> uris,
@@ -292,12 +275,10 @@ public class ConversationViewModel extends DbViewModel
 
 	@DatabaseExecutor
 	private void checkFeaturesAndOnboarding(ContactId c) throws DbException {
-		// check if images and auto-deletion are supported
-		PrivateMessageFormat format = db.transactionWithResult(true, txn ->
-				messagingManager.getContactMessageFormat(txn, c));
-		if (LOG.isLoggable(INFO))
-			LOG.info("PrivateMessageFormat loaded: " + format.name());
-		privateMessageFormat.postValue(format);
+		// check if images are supported
+		boolean imagesSupported = db.transactionWithResult(true, txn ->
+				messagingManager.contactSupportsImages(txn, c));
+		imageSupport.postValue(imagesSupported);
 
 		// check if introductions are supported
 		Collection<Contact> contacts = contactManager.getContacts();
@@ -306,7 +287,7 @@ public class ConversationViewModel extends DbViewModel
 
 		// we only show one onboarding dialog at a time
 		Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-		if (format != TEXT_ONLY &&
+		if (imagesSupported &&
 				settings.getBoolean(SHOW_ONBOARDING_IMAGE, true)) {
 			onOnboardingShown(SHOW_ONBOARDING_IMAGE);
 			showImageOnboarding.postEvent(true);
@@ -325,82 +306,39 @@ public class ConversationViewModel extends DbViewModel
 	}
 
 	@UiThread
-	LiveData<SendState> sendMessage(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedTimer) {
-		MutableLiveData<SendState> liveData = new MutableLiveData<>();
-		runOnDbThread(() -> {
-			try {
-				db.transaction(false, txn -> {
-					long start = now();
-					PrivateMessage m = createMessage(txn, text, headers,
-							expectedTimer);
-					messagingManager.addLocalMessage(txn, m);
-					logDuration(LOG, "Storing message", start);
-					Message message = m.getMessage();
-					PrivateMessageHeader h = new PrivateMessageHeader(
-							message.getId(), message.getGroupId(),
-							message.getTimestamp(), true, true, false, false,
-							m.hasText(), m.getAttachmentHeaders(),
-							m.getAutoDeleteTimer());
-					// TODO add text to cache when available here
-					MessageId id = message.getId();
-					txn.attach(() -> {
-						attachmentCreator.onAttachmentsSent(id);
-						liveData.setValue(SENT);
-						addedHeader.setEvent(h);
-					});
-				});
-			} catch (UnexpectedTimerException e) {
-				liveData.postValue(UNEXPECTED_TIMER);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				liveData.postValue(ERROR);
-			}
-		});
-		return liveData;
-	}
-
-	private PrivateMessage createMessage(Transaction txn, @Nullable String text,
-			List<AttachmentHeader> headers, long expectedTimer)
-			throws DbException {
-		// Sending is only possible (setReady(true)) after loading all messages
-		// which happens after the contact has been loaded.
-		// privateMessageFormat is loaded together with contact
-		Contact contact = requireNonNull(contactItem.getValue()).getContact();
-		GroupId groupId = messagingManager.getContactGroup(contact).getId();
-		PrivateMessageFormat format =
-				requireNonNull(privateMessageFormat.getValue());
-		long timestamp = conversationManager
-				.getTimestampForOutgoingMessage(txn, requireNonNull(contactId));
+	private void createMessage(GroupId groupId, @Nullable String text,
+			List<AttachmentHeader> headers, long timestamp,
+			boolean hasImageSupport) {
 		try {
-			if (format == TEXT_ONLY) {
-				return privateMessageFactory.createLegacyPrivateMessage(
-						groupId, timestamp, requireNonNull(text));
-			} else if (format == TEXT_IMAGES) {
-				return privateMessageFactory.createPrivateMessage(groupId,
+			PrivateMessage pm;
+			if (hasImageSupport) {
+				pm = privateMessageFactory.createPrivateMessage(groupId,
 						timestamp, text, headers);
 			} else {
-				long timer = autoDeleteManager
-						.getAutoDeleteTimer(txn, contactId, timestamp);
-				if (timer != expectedTimer)
-					throw new UnexpectedTimerException();
-				return privateMessageFactory.createPrivateMessage(groupId,
-						timestamp, text, headers, timer);
+				pm = privateMessageFactory.createLegacyPrivateMessage(
+						groupId, timestamp, requireNonNull(text));
 			}
+			storeMessage(pm);
 		} catch (FormatException e) {
 			throw new AssertionError(e);
 		}
 	}
 
-	void setAutoDeleteTimerEnabled(boolean enabled) {
-		final long timer = enabled ? DAYS.toMillis(7) : NO_AUTO_DELETE_TIMER;
-		// ContactId is set before menu gets inflated and UI interaction
-		final ContactId c = requireNonNull(contactId);
+	@UiThread
+	private void storeMessage(PrivateMessage m) {
+		attachmentCreator.onAttachmentsSent(m.getMessage().getId());
 		runOnDbThread(() -> {
 			try {
-				db.transaction(false, txn ->
-						autoDeleteManager.setAutoDeleteTimer(txn, c, timer));
-				autoDeleteTimer.postValue(timer);
+				long start = now();
+				messagingManager.addLocalMessage(m);
+				logDuration(LOG, "Storing message", start);
+				Message message = m.getMessage();
+				PrivateMessageHeader h = new PrivateMessageHeader(
+						message.getId(), message.getGroupId(),
+						message.getTimestamp(), true, true, false, false,
+						m.hasText(), m.getAttachmentHeaders());
+				// TODO add text to cache when available here
+				addedHeader.postEvent(h);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 			}
@@ -419,8 +357,8 @@ public class ConversationViewModel extends DbViewModel
 		return contactName;
 	}
 
-	LiveData<PrivateMessageFormat> getPrivateMessageFormat() {
-		return privateMessageFormat;
+	LiveData<Boolean> hasImageSupport() {
+		return imageSupport;
 	}
 
 	LiveEvent<Boolean> showImageOnboarding() {
@@ -435,10 +373,6 @@ public class ConversationViewModel extends DbViewModel
 		return showIntroductionAction;
 	}
 
-	LiveData<Long> getAutoDeleteTimer() {
-		return autoDeleteTimer;
-	}
-
 	LiveData<Boolean> isContactDeleted() {
 		return contactDeleted;
 	}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java

@@ -60,12 +60,10 @@ class ConversationVisitor implements
 		}
 		if (h.isLocal()) {
 			item = new ConversationMessageItem(
-					R.layout.list_item_conversation_msg_out, h, contactName,
-					attachments);
+					R.layout.list_item_conversation_msg_out, h, attachments);
 		} else {
 			item = new ConversationMessageItem(
-					R.layout.list_item_conversation_msg_in, h, contactName,
-					attachments);
+					R.layout.list_item_conversation_msg_in, h, attachments);
 		}
 		if (h.hasText()) {
 			String text = textCache.getText(h.getId());
@@ -81,15 +79,13 @@ class ConversationVisitor implements
 			String text = ctx.getString(R.string.blogs_sharing_invitation_sent,
 					r.getName(), contactName.getValue());
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text = ctx.getString(
 					R.string.blogs_sharing_invitation_received,
 					contactName.getValue(), r.getName());
 			return new ConversationRequestItem(
-					R.layout.list_item_conversation_request, text, contactName,
-					BLOG, r);
+					R.layout.list_item_conversation_request, text, BLOG, r);
 		}
 	}
 
@@ -108,8 +104,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
 			if (r.wasAccepted()) {
@@ -122,8 +117,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_in, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_in, text, r);
 		}
 	}
 
@@ -134,15 +128,13 @@ class ConversationVisitor implements
 			String text = ctx.getString(R.string.forum_invitation_sent,
 					r.getName(), contactName.getValue());
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text = ctx.getString(
 					R.string.forum_invitation_received,
 					contactName.getValue(), r.getName());
 			return new ConversationRequestItem(
-					R.layout.list_item_conversation_request, text, contactName,
-					FORUM, r);
+					R.layout.list_item_conversation_request, text, FORUM, r);
 		}
 	}
 
@@ -161,8 +153,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
 			if (r.wasAccepted()) {
@@ -175,8 +166,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_in, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_in, text, r);
 		}
 	}
 
@@ -188,15 +178,13 @@ class ConversationVisitor implements
 					R.string.groups_invitations_invitation_sent,
 					contactName.getValue(), r.getName());
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text = ctx.getString(
 					R.string.groups_invitations_invitation_received,
 					contactName.getValue(), r.getName());
 			return new ConversationRequestItem(
-					R.layout.list_item_conversation_request, text, contactName,
-					GROUP, r);
+					R.layout.list_item_conversation_request, text, GROUP, r);
 		}
 	}
 
@@ -215,8 +203,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
 			if (r.wasAccepted()) {
@@ -229,8 +216,7 @@ class ConversationVisitor implements
 						contactName.getValue());
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_in, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_in, text, r);
 		}
 	}
 
@@ -241,8 +227,7 @@ class ConversationVisitor implements
 			String text = ctx.getString(R.string.introduction_request_sent,
 					contactName.getValue(), name);
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
 			if (r.wasAnswered()) {
@@ -258,7 +243,7 @@ class ConversationVisitor implements
 						contactName.getValue(), name);
 			}
 			return new ConversationRequestItem(
-					R.layout.list_item_conversation_request, text, contactName,
+					R.layout.list_item_conversation_request, text,
 					INTRODUCTION, r);
 		}
 	}
@@ -283,8 +268,7 @@ class ConversationVisitor implements
 						introducedAuthor);
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_out, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_out, text, r);
 		} else {
 			String text;
 			if (r.wasAccepted()) {
@@ -304,8 +288,7 @@ class ConversationVisitor implements
 						introducedAuthor);
 			}
 			return new ConversationNoticeItem(
-					R.layout.list_item_conversation_notice_in, text,
-					contactName, r);
+					R.layout.list_item_conversation_notice_in, text, r);
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java

@@ -6,54 +6,52 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
+import org.briarproject.briar.android.forum.ForumController.ForumListener;
 import org.briarproject.briar.android.sharing.ForumSharingStatusActivity;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter;
 import org.briarproject.briar.android.threaded.ThreadListActivity;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.forum.Forum;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.widget.Toast.LENGTH_SHORT;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SHARE_FORUM;
-import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class ForumActivity extends
-		ThreadListActivity<ForumPostItem, ThreadItemAdapter<ForumPostItem>> {
+		ThreadListActivity<Forum, ForumPostItem, ThreadItemAdapter<ForumPostItem>>
+		implements ForumListener {
 
 	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private ForumViewModel viewModel;
+	ForumController forumController;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
-		viewModel = new ViewModelProvider(this, viewModelFactory)
-				.get(ForumViewModel.class);
 	}
 
 	@Override
-	protected ThreadListViewModel<ForumPostItem> getViewModel() {
-		return viewModel;
-	}
-
-	@Override
-	protected ThreadItemAdapter<ForumPostItem> createAdapter() {
-		return new ThreadItemAdapter<>(this);
+	protected ThreadListController<Forum, ForumPostItem> getController() {
+		return forumController;
 	}
 
 	@Override
@@ -61,27 +59,36 @@ public class ForumActivity extends
 		super.onCreate(state);
 
 		Toolbar toolbar = setUpCustomToolbar(false);
-		// Open member list on Toolbar click
-		toolbar.setOnClickListener(v -> {
-			Intent i = new Intent(ForumActivity.this,
-					ForumSharingStatusActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-		});
 
-		String groupName = getIntent().getStringExtra(GROUP_NAME);
-		if (groupName != null) {
-			setTitle(groupName);
-		} else {
-			observeOnce(viewModel.loadForum(), this, forum ->
-					setTitle(forum.getName())
-			);
+		Intent i = getIntent();
+		String groupName = i.getStringExtra(GROUP_NAME);
+		if (groupName != null) setTitle(groupName);
+		else loadNamedGroup();
+
+		// Open member list on Toolbar click
+		if (toolbar != null) {
+			toolbar.setOnClickListener(v -> {
+				Intent i1 = new Intent(ForumActivity.this,
+						ForumSharingStatusActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+			});
 		}
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onNamedGroupLoaded(Forum forum) {
+		setTitle(forum.getName());
+	}
+
+	@Override
+	protected ThreadItemAdapter<ForumPostItem> createAdapter(
+			LinearLayoutManager layoutManager) {
+		return new ThreadItemAdapter<>(this, layoutManager);
+	}
+
+	@Override
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 
 		if (request == REQUEST_SHARE_FORUM && result == RESULT_OK) {
@@ -94,31 +101,32 @@ public class ForumActivity extends
 		// Inflate the menu items for use in the action bar
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.forum_actions, menu);
-		super.onCreateOptionsMenu(menu);
-		return true;
+
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		// Handle presses on the action bar items
-		int itemId = item.getItemId();
-		if (itemId == R.id.action_forum_share) {
-			Intent i = new Intent(this, ShareForumActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivityForResult(i, REQUEST_SHARE_FORUM);
-			return true;
-		} else if (itemId == R.id.action_forum_sharing_status) {
-			Intent i = new Intent(this, ForumSharingStatusActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_forum_delete) {
-			showUnsubscribeDialog();
-			return true;
+		switch (item.getItemId()) {
+			case R.id.action_forum_share:
+				Intent i2 = new Intent(this, ShareForumActivity.class);
+				i2.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+				i2.putExtra(GROUP_ID, groupId.getBytes());
+				startActivityForResult(i2, REQUEST_SHARE_FORUM);
+				return true;
+			case R.id.action_forum_sharing_status:
+				Intent i3 = new Intent(this, ForumSharingStatusActivity.class);
+				i3.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+				i3.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i3);
+				return true;
+			case R.id.action_forum_delete:
+				showUnsubscribeDialog();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
@@ -127,7 +135,7 @@ public class ForumActivity extends
 	}
 
 	private void showUnsubscribeDialog() {
-		OnClickListener okListener = (dialog, which) -> viewModel.deleteForum();
+		OnClickListener okListener = (dialog, which) -> deleteForum();
 		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_leave_forum));
@@ -137,4 +145,27 @@ public class ForumActivity extends
 		builder.show();
 	}
 
+	private void deleteForum() {
+		forumController.deleteNamedGroup(
+				new UiResultExceptionHandler<Void, DbException>(this) {
+					@Override
+					public void onResultUi(Void v) {
+						Toast.makeText(ForumActivity.this,
+								R.string.forum_left_toast, LENGTH_SHORT).show();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@Override
+	public void onForumLeft(ContactId c) {
+		sharingController.remove(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.forum;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.forum.Forum;
+
+import androidx.annotation.UiThread;
+
+@NotNullByDefault
+interface ForumController extends ThreadListController<Forum, ForumPostItem> {
+
+	interface ForumListener extends ThreadListListener<ForumPostItem> {
+		@UiThread
+		void onForumLeft(ContactId c);
+	}
+
+}

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

@@ -0,0 +1,185 @@
+package org.briarproject.briar.android.forum;
+
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.forum.ForumController.ForumListener;
+import org.briarproject.briar.android.threaded.ThreadListControllerImpl;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.briar.api.forum.Forum;
+import org.briarproject.briar.api.forum.ForumInvitationResponse;
+import org.briarproject.briar.api.forum.ForumManager;
+import org.briarproject.briar.api.forum.ForumPost;
+import org.briarproject.briar.api.forum.ForumPostHeader;
+import org.briarproject.briar.api.forum.ForumSharingManager;
+import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
+import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent;
+import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static java.lang.Math.max;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@NotNullByDefault
+class ForumControllerImpl extends
+		ThreadListControllerImpl<Forum, ForumPostItem, ForumPostHeader, ForumPost, ForumListener>
+		implements ForumController {
+
+	private static final Logger LOG =
+			Logger.getLogger(ForumControllerImpl.class.getName());
+
+	private final ForumManager forumManager;
+	private final ForumSharingManager forumSharingManager;
+
+	@Inject
+	ForumControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor,
+			ForumManager forumManager, ForumSharingManager forumSharingManager,
+			EventBus eventBus, Clock clock, MessageTracker messageTracker,
+			AndroidNotificationManager notificationManager) {
+		super(dbExecutor, lifecycleManager, identityManager, cryptoExecutor,
+				eventBus, clock, notificationManager, messageTracker);
+		this.forumManager = forumManager;
+		this.forumSharingManager = forumSharingManager;
+	}
+
+	@Override
+	public void onActivityStart() {
+		super.onActivityStart();
+		notificationManager.clearForumPostNotification(getGroupId());
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		super.eventOccurred(e);
+
+		if (e instanceof ForumPostReceivedEvent) {
+			ForumPostReceivedEvent f = (ForumPostReceivedEvent) e;
+			if (f.getGroupId().equals(getGroupId())) {
+				LOG.info("Forum post received, adding...");
+				listener.onItemReceived(buildItem(f.getHeader(), f.getText()));
+			}
+		} else if (e instanceof ForumInvitationResponseReceivedEvent) {
+			ForumInvitationResponseReceivedEvent f =
+					(ForumInvitationResponseReceivedEvent) e;
+			ForumInvitationResponse r = f.getMessageHeader();
+			if (r.getShareableId().equals(getGroupId()) && r.wasAccepted()) {
+				LOG.info("Forum invitation was accepted");
+				listener.onInvitationAccepted(f.getContactId());
+			}
+		} else if (e instanceof ContactLeftShareableEvent) {
+			ContactLeftShareableEvent c = (ContactLeftShareableEvent) e;
+			if (c.getGroupId().equals(getGroupId())) {
+				LOG.info("Forum left by contact");
+				listener.onForumLeft(c.getContactId());
+			}
+		}
+	}
+
+	@Override
+	protected Forum loadNamedGroup() throws DbException {
+		return forumManager.getForum(getGroupId());
+	}
+
+	@Override
+	protected Collection<ForumPostHeader> loadHeaders() throws DbException {
+		return forumManager.getPostHeaders(getGroupId());
+	}
+
+	@Override
+	protected String loadMessageText(ForumPostHeader h) throws DbException {
+		return forumManager.getPostText(h.getId());
+	}
+
+	@Override
+	protected void markRead(MessageId id) throws DbException {
+		forumManager.setReadFlag(getGroupId(), id, true);
+	}
+
+	@Override
+	public void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				Collection<Contact> contacts =
+						forumSharingManager.getSharedWith(getGroupId());
+				Collection<ContactId> contactIds =
+						new ArrayList<>(contacts.size());
+				for (Contact c : contacts) contactIds.add(c.getId());
+				handler.onResult(contactIds);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void createAndStoreMessage(String text,
+			@Nullable ForumPostItem parentItem,
+			ResultExceptionHandler<ForumPostItem, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				GroupCount count = forumManager.getGroupCount(getGroupId());
+				long timestamp = max(count.getLatestMsgTime() + 1,
+						clock.currentTimeMillis());
+				MessageId parentId = parentItem != null ?
+						parentItem.getId() : null;
+				createMessage(text, timestamp, parentId, author, handler);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	private void createMessage(String text, long timestamp,
+			@Nullable MessageId parentId, LocalAuthor author,
+			ResultExceptionHandler<ForumPostItem, DbException> handler) {
+		cryptoExecutor.execute(() -> {
+			LOG.info("Creating forum post...");
+			ForumPost msg = forumManager.createLocalPost(getGroupId(), text,
+					timestamp, parentId, author);
+			storePost(msg, text, handler);
+		});
+	}
+
+	@Override
+	protected ForumPostHeader addLocalMessage(ForumPost p) throws DbException {
+		return forumManager.addLocalPost(p);
+	}
+
+	@Override
+	protected void deleteNamedGroup(Forum forum) throws DbException {
+		forumManager.removeForum(forum);
+	}
+
+	@Override
+	protected ForumPostItem buildItem(ForumPostHeader header, String text) {
+		return new ForumPostItem(header, text);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumModule.java

@@ -1,23 +1,32 @@
 package org.briarproject.briar.android.forum;
 
+import org.briarproject.briar.android.activity.ActivityScope;
+import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.viewmodel.ViewModelKey;
 
 import androidx.lifecycle.ViewModel;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 import dagger.multibindings.IntoMap;
 
 @Module
-public interface ForumModule {
+public class ForumModule {
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(ForumListViewModel.class)
-	ViewModel bindForumListViewModel(ForumListViewModel forumListViewModel);
+	@Module
+	public interface BindsModule {
+		@Binds
+		@IntoMap
+		@ViewModelKey(ForumListViewModel.class)
+		ViewModel bindForumListViewModel(ForumListViewModel forumListViewModel);
+	}
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(ForumViewModel.class)
-	ViewModel bindForumViewModel(ForumViewModel forumViewModel);
+	@ActivityScope
+	@Provides
+	ForumController provideForumController(BaseActivity activity,
+			ForumControllerImpl forumController) {
+		activity.addLifecycleController(forumController);
+		return forumController;
+	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumPostItem.java

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.threaded.ThreadItem;
 import org.briarproject.briar.api.forum.ForumPostHeader;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe
@@ -16,4 +17,9 @@ class ForumPostItem extends ThreadItem {
 				h.getAuthorInfo(), h.isRead());
 	}
 
+	ForumPostItem(MessageId messageId, @Nullable MessageId parentId,
+			String text, long timestamp, Author author, AuthorInfo authorInfo) {
+		super(messageId, parentId, text, timestamp, author, authorInfo, true);
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java

@@ -1,231 +0,0 @@
-package org.briarproject.briar.android.forum;
-
-import android.app.Application;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.db.TransactionManager;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.forum.Forum;
-import org.briarproject.briar.api.forum.ForumInvitationResponse;
-import org.briarproject.briar.api.forum.ForumManager;
-import org.briarproject.briar.api.forum.ForumPost;
-import org.briarproject.briar.api.forum.ForumPostHeader;
-import org.briarproject.briar.api.forum.ForumSharingManager;
-import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent;
-import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static android.widget.Toast.LENGTH_SHORT;
-import static java.lang.Math.max;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
-
-	private static final Logger LOG = getLogger(ForumViewModel.class.getName());
-
-	private final ForumManager forumManager;
-	private final ForumSharingManager forumSharingManager;
-
-	@Inject
-	ForumViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			EventBus eventBus,
-			ForumManager forumManager,
-			ForumSharingManager forumSharingManager) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor,
-				identityManager, notificationManager, sharingController,
-				cryptoExecutor, clock, messageTracker, eventBus);
-		this.forumManager = forumManager;
-		this.forumSharingManager = forumSharingManager;
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ForumPostReceivedEvent) {
-			ForumPostReceivedEvent f = (ForumPostReceivedEvent) e;
-			if (f.getGroupId().equals(groupId)) {
-				LOG.info("Forum post received, adding...");
-				ForumPostItem item =
-						new ForumPostItem(f.getHeader(), f.getText());
-				addItem(item, false);
-			}
-		} else if (e instanceof ForumInvitationResponseReceivedEvent) {
-			ForumInvitationResponseReceivedEvent f =
-					(ForumInvitationResponseReceivedEvent) e;
-			ForumInvitationResponse r = f.getMessageHeader();
-			if (r.getShareableId().equals(groupId) && r.wasAccepted()) {
-				LOG.info("Forum invitation was accepted");
-				sharingController.add(f.getContactId());
-			}
-		} else if (e instanceof ContactLeftShareableEvent) {
-			ContactLeftShareableEvent c = (ContactLeftShareableEvent) e;
-			if (c.getGroupId().equals(groupId)) {
-				LOG.info("Forum left by contact");
-				sharingController.remove(c.getContactId());
-			}
-		} else {
-			super.eventOccurred(e);
-		}
-	}
-
-	protected void clearNotifications() {
-		notificationManager.clearForumPostNotification(groupId);
-	}
-
-	LiveData<Forum> loadForum() {
-		MutableLiveData<Forum> forum = new MutableLiveData<>();
-		runOnDbThread(() -> {
-			try {
-				Forum f = forumManager.getForum(groupId);
-				forum.postValue(f);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-		return forum;
-	}
-
-	@Override
-	public void loadItems() {
-		loadList(txn -> {
-			long start = now();
-			List<ForumPostHeader> headers =
-					forumManager.getPostHeaders(txn, groupId);
-			logDuration(LOG, "Loading headers", start);
-			start = now();
-			List<ForumPostItem> items = new ArrayList<>();
-			for (ForumPostHeader header : headers) {
-				items.add(loadItem(txn, header));
-			}
-			logDuration(LOG, "Loading bodies and creating items", start);
-			return items;
-		}, this::setItems);
-	}
-
-	private ForumPostItem loadItem(Transaction txn, ForumPostHeader header)
-			throws DbException {
-		String text = forumManager.getPostText(txn, header.getId());
-		return new ForumPostItem(header, text);
-	}
-
-	@Override
-	public void createAndStoreMessage(String text,
-			@Nullable MessageId parentId) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor author = identityManager.getLocalAuthor();
-				GroupCount count = forumManager.getGroupCount(groupId);
-				long timestamp = max(count.getLatestMsgTime() + 1,
-						clock.currentTimeMillis());
-				createMessage(text, timestamp, parentId, author);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void createMessage(String text, long timestamp,
-			@Nullable MessageId parentId, LocalAuthor author) {
-		cryptoExecutor.execute(() -> {
-			LOG.info("Creating forum post...");
-			ForumPost msg = forumManager.createLocalPost(groupId, text,
-					timestamp, parentId, author);
-			storePost(msg, text);
-		});
-	}
-
-	private void storePost(ForumPost msg, String text) {
-		runOnDbThread(false, txn -> {
-			long start = now();
-			ForumPostHeader header = forumManager.addLocalPost(txn, msg);
-			logDuration(LOG, "Storing forum post", start);
-			txn.attach(() -> {
-				ForumPostItem item = new ForumPostItem(header, text);
-				addItem(item, true);
-			});
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	@Override
-	protected void markItemRead(ForumPostItem item) {
-		runOnDbThread(() -> {
-			try {
-				forumManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
-			Collection<Contact> contacts =
-					forumSharingManager.getSharedWith(txn, groupId);
-			Collection<ContactId> contactIds = new ArrayList<>(contacts.size());
-			for (Contact c : contacts) contactIds.add(c.getId());
-			txn.attach(() -> sharingController.addAll(contactIds));
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	void deleteForum() {
-		runOnDbThread(() -> {
-			try {
-				Forum f = forumManager.getForum(groupId);
-				forumManager.removeForum(f);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-		Toast.makeText(getApplication(), R.string.forum_left_toast,
-				LENGTH_SHORT).show();
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java

@@ -35,8 +35,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 import de.hdodenhof.circleimageview.CircleImageView;
 
 import static android.app.Activity.RESULT_OK;
@@ -48,8 +46,6 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 import static org.briarproject.briar.android.view.AuthorView.setAvatar;
-import static org.briarproject.briar.android.view.TextSendController.SendState;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
@@ -205,8 +201,8 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> headers) {
 		// disable button to prevent accidental double invitations
 		ui.message.setReady(false);
 
@@ -216,7 +212,6 @@ public class IntroductionMessageFragment extends BaseFragment
 		hideSoftKeyboard(ui.message);
 		introductionActivity.setResult(RESULT_OK);
 		introductionActivity.supportFinishAfterTransition();
-		return new MutableLiveData<>(SENT);
 	}
 
 	private void makeIntroduction(Contact c1, Contact c2,
@@ -224,7 +219,8 @@ public class IntroductionMessageFragment extends BaseFragment
 		introductionActivity.runOnDbThread(() -> {
 			// actually make the introduction
 			try {
-				introductionManager.makeIntroduction(c1, c2, text);
+				long timestamp = System.currentTimeMillis();
+				introductionManager.makeIntroduction(c1, c2, text, timestamp);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 				introductionError();

briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java

@@ -1,13 +1,17 @@
 package org.briarproject.briar.android.login;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 
 import androidx.appcompat.app.AlertDialog;
 
-import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
+import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getDrawable;
+import static androidx.core.graphics.drawable.DrawableCompat.setTint;
+import static java.util.Objects.requireNonNull;
 
 @NotNullByDefault
 class LoginUtils {
@@ -15,7 +19,9 @@ class LoginUtils {
 	static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
-		builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+		Drawable icon = getDrawable(ctx, R.drawable.alerts_and_states_error);
+		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
+		builder.setIcon(icon);
 		builder.setTitle(R.string.dialog_title_cannot_check_password);
 		builder.setMessage(R.string.dialog_message_cannot_check_password);
 		builder.setPositiveButton(R.string.ok, null);

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.navdrawer;
 
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -60,7 +59,6 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.view.View.GONE;
@@ -435,7 +433,8 @@ public class NavDrawerActivity extends BriarActivity implements
 				Transport t = getItem(position);
 
 				ImageView icon = view.findViewById(R.id.imageView);
-				icon.setImageResource(t.iconDrawable);
+				icon.setImageDrawable(ContextCompat.getDrawable(
+						NavDrawerActivity.this, t.iconDrawable));
 				icon.setColorFilter(ContextCompat.getColor(
 						NavDrawerActivity.this, t.iconColor));
 
@@ -477,13 +476,11 @@ public class NavDrawerActivity extends BriarActivity implements
 	private void showTransportsOnboarding(boolean show, ImageView imageView) {
 		if (show) {
 			int color = resolveColorAttribute(this, R.attr.colorControlNormal);
-			Drawable drawable = VectorDrawableCompat
-					.create(getResources(), R.drawable.transport_tor, null);
 			new MaterialTapTargetPrompt.Builder(NavDrawerActivity.this,
 					R.style.OnboardingDialogTheme).setTarget(imageView)
 					.setPrimaryText(R.string.network_settings_title)
 					.setSecondaryText(R.string.transports_onboarding_text)
-					.setIconDrawable(drawable)
+					.setIcon(R.drawable.transport_tor)
 					.setIconDrawableColourFilter(color)
 					.setBackgroundColour(
 							ContextCompat.getColor(this, R.color.briar_primary))

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/TransportsActivity.java

@@ -141,7 +141,8 @@ public class TransportsActivity extends BriarActivity {
 				Transport t = getItem(position);
 
 				ImageView icon = view.findViewById(R.id.icon);
-				icon.setImageResource(t.iconDrawable);
+				icon.setImageDrawable(ContextCompat.getDrawable(
+						TransportsActivity.this, t.iconDrawable));
 				icon.setColorFilter(ContextCompat.getColor(
 						TransportsActivity.this, t.iconColor));
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java

@@ -1,60 +1,67 @@
 package org.briarproject.briar.android.privategroup.conversation;
 
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.controller.handler.UiExceptionHandler;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
+import org.briarproject.briar.android.privategroup.conversation.GroupController.GroupListener;
 import org.briarproject.briar.android.privategroup.creation.GroupInviteActivity;
 import org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.threaded.ThreadListActivity;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_GROUP_INVITE;
-import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class GroupActivity extends
-		ThreadListActivity<GroupMessageItem, GroupMessageAdapter> {
+		ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageAdapter>
+		implements GroupListener, OnClickListener {
 
 	@Inject
-	ViewModelProvider.Factory viewModelFactory;
+	GroupController controller;
 
-	private GroupViewModel viewModel;
+	@Nullable
+	private Boolean isCreator = null;
+	private boolean isDissolved = false;
+	private MenuItem revealMenuItem, inviteMenuItem, leaveMenuItem,
+			dissolveMenuItem;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
-		viewModel = new ViewModelProvider(this, viewModelFactory)
-				.get(GroupViewModel.class);
 	}
 
 	@Override
-	protected ThreadListViewModel<GroupMessageItem> getViewModel() {
-		return viewModel;
-	}
-
-	@Override
-	protected GroupMessageAdapter createAdapter() {
-		return new GroupMessageAdapter(this);
+	protected ThreadListController<PrivateGroup, GroupMessageItem> getController() {
+		return controller;
 	}
 
 	@Override
@@ -62,27 +69,65 @@ public class GroupActivity extends
 		super.onCreate(state);
 
 		Toolbar toolbar = setUpCustomToolbar(false);
-		// Open member list on Toolbar click
-		toolbar.setOnClickListener(v -> {
-			Intent i = new Intent(GroupActivity.this,
-					GroupMemberListActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-		});
 
-		String groupName = getIntent().getStringExtra(GROUP_NAME);
+		Intent i = getIntent();
+		String groupName = i.getStringExtra(GROUP_NAME);
 		if (groupName != null) setTitle(groupName);
-		observeOnce(viewModel.getPrivateGroup(), this, privateGroup ->
-				setTitle(privateGroup.getName())
-		);
-		observeOnce(viewModel.isCreator(), this, adapter::setIsCreator);
+		loadNamedGroup();
+
+		// Open member list on Toolbar click
+		if (toolbar != null) {
+			toolbar.setOnClickListener(v -> {
+				Intent i1 = new Intent(GroupActivity.this,
+						GroupMemberListActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+			});
+		}
 
-		// start with group disabled and enable when not dissolved
 		setGroupEnabled(false);
-		viewModel.isDissolved().observeEvent(this, dissolved -> {
-			setGroupEnabled(!dissolved);
-			if (dissolved) onGroupDissolved();
-		});
+	}
+
+	@Override
+	protected GroupMessageAdapter createAdapter(
+			LinearLayoutManager layoutManager) {
+		return new GroupMessageAdapter(this, layoutManager);
+	}
+
+	@Override
+	protected void loadItems() {
+		controller.isDissolved(
+				new UiResultExceptionHandler<Boolean, DbException>(this) {
+					@Override
+					public void onResultUi(Boolean isDissolved) {
+						setGroupEnabled(!isDissolved);
+						GroupActivity.super.loadItems();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@Override
+	protected void onNamedGroupLoaded(PrivateGroup group) {
+		setTitle(group.getName());
+		controller.loadLocalAuthor(
+				new UiResultExceptionHandler<LocalAuthor, DbException>(this) {
+					@Override
+					public void onResultUi(LocalAuthor author) {
+						isCreator = group.getCreator().equals(author);
+						adapter.setPerspective(isCreator);
+						showMenuItems();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
 	@Override
@@ -91,61 +136,74 @@ public class GroupActivity extends
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.group_actions, menu);
 
-		// show items based on role (which will not change, so observe once)
-		observeOnce(viewModel.isCreator(), this, isCreator -> {
-			menu.findItem(R.id.action_group_reveal).setVisible(!isCreator);
-			menu.findItem(R.id.action_group_invite).setVisible(isCreator);
-			menu.findItem(R.id.action_group_leave).setVisible(!isCreator);
-			menu.findItem(R.id.action_group_dissolve).setVisible(isCreator);
-		});
-		super.onCreateOptionsMenu(menu);
-		return true;
+		revealMenuItem = menu.findItem(R.id.action_group_reveal);
+		inviteMenuItem = menu.findItem(R.id.action_group_invite);
+		leaveMenuItem = menu.findItem(R.id.action_group_leave);
+		dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
+
+		// all role-dependent items are invisible until we know our role
+		revealMenuItem.setVisible(false);
+		inviteMenuItem.setVisible(false);
+		leaveMenuItem.setVisible(false);
+		dissolveMenuItem.setVisible(false);
+
+		// show items based on role
+		showMenuItems();
+
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		int itemId = item.getItemId();
-		if (itemId == R.id.action_group_member_list) {
-			Intent i = new Intent(this, GroupMemberListActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_group_reveal) {
-			if (requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			Intent i = new Intent(this, RevealContactsActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_group_invite) {
-			if (!requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			Intent i = new Intent(this, GroupInviteActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivityForResult(i, REQUEST_GROUP_INVITE);
-			return true;
-		} else if (itemId == R.id.action_group_leave) {
-			if (requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			showLeaveGroupDialog();
-			return true;
-		} else if (itemId == R.id.action_group_dissolve) {
-			if (!requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			showDissolveGroupDialog();
-			return true;
+		switch (item.getItemId()) {
+			case R.id.action_group_member_list:
+				Intent i1 = new Intent(this, GroupMemberListActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+				return true;
+			case R.id.action_group_reveal:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
+				Intent i2 = new Intent(this, RevealContactsActivity.class);
+				i2.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i2);
+				return true;
+			case R.id.action_group_invite:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
+				Intent i3 = new Intent(this, GroupInviteActivity.class);
+				i3.putExtra(GROUP_ID, groupId.getBytes());
+				startActivityForResult(i3, REQUEST_GROUP_INVITE);
+				return true;
+			case R.id.action_group_leave:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
+				showLeaveGroupDialog();
+				return true;
+			case R.id.action_group_dissolve:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
+				showDissolveGroupDialog();
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		if (request == REQUEST_GROUP_INVITE && result == RESULT_OK) {
 			displaySnackbar(R.string.groups_invitation_sent);
 		} else super.onActivityResult(request, result, data);
 	}
 
+	@Override
+	public void onItemReceived(GroupMessageItem item) {
+		super.onItemReceived(item);
+		if (item instanceof JoinMessageItem) {
+			if (((JoinMessageItem) item).isInitial()) loadSharingContacts();
+		}
+	}
+
 	@Override
 	protected int getMaxTextLength() {
 		return MAX_GROUP_POST_TEXT_LENGTH;
@@ -153,11 +211,11 @@ public class GroupActivity extends
 
 	@Override
 	public void onReplyClick(GroupMessageItem item) {
-		Boolean isDissolved = viewModel.isDissolved().getLastValue();
-		if (isDissolved != null && !isDissolved) super.onReplyClick(item);
+		if (!isDissolved) super.onReplyClick(item);
 	}
 
 	private void setGroupEnabled(boolean enabled) {
+		isDissolved = !enabled;
 		sendController.setReady(enabled);
 		list.getRecyclerView().setAlpha(enabled ? 1f : 0.5f);
 
@@ -169,13 +227,21 @@ public class GroupActivity extends
 		}
 	}
 
+	private void showMenuItems() {
+		// we need to have the menu items and know if we are the creator
+		if (leaveMenuItem == null || isCreator == null) return;
+		revealMenuItem.setVisible(!isCreator);
+		inviteMenuItem.setVisible(isCreator);
+		leaveMenuItem.setVisible(!isCreator);
+		dissolveMenuItem.setVisible(isCreator);
+	}
+
 	private void showLeaveGroupDialog() {
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_leave_dialog_title));
 		builder.setMessage(getString(R.string.groups_leave_dialog_message));
-		builder.setNegativeButton(R.string.dialog_button_leave,
-				(d, w) -> deleteGroup());
+		builder.setNegativeButton(R.string.dialog_button_leave, this);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.show();
 	}
@@ -185,19 +251,37 @@ public class GroupActivity extends
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolve_dialog_title));
 		builder.setMessage(getString(R.string.groups_dissolve_dialog_message));
-		builder.setNegativeButton(R.string.groups_dissolve_button,
-				(d, w) -> deleteGroup());
+		builder.setNegativeButton(R.string.groups_dissolve_button, this);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.show();
 	}
 
-	private void deleteGroup() {
-		// The activity is going to be destroyed by the
-		// GroupRemovedEvent being fired
-		viewModel.deletePrivateGroup();
+	@Override
+	public void onClick(DialogInterface dialog, int which) {
+		controller.deleteNamedGroup(
+				new UiExceptionHandler<DbException>(this) {
+					// The activity is going to be destroyed by the
+					// GroupRemovedEvent being fired
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
-	private void onGroupDissolved() {
+	@Override
+	public void onContactRelationshipRevealed(AuthorId memberId, ContactId c,
+			Visibility v) {
+		adapter.updateVisibility(memberId, v);
+
+		sharingController.add(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
+	@Override
+	public void onGroupDissolved() {
+		setGroupEnabled(false);
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolved_dialog_title));

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java

@@ -0,0 +1,33 @@
+package org.briarproject.briar.android.privategroup.conversation;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.Visibility;
+
+import androidx.annotation.UiThread;
+
+public interface GroupController
+		extends ThreadListController<PrivateGroup, GroupMessageItem> {
+
+	void loadLocalAuthor(
+			ResultExceptionHandler<LocalAuthor, DbException> handler);
+
+	void isDissolved(
+			ResultExceptionHandler<Boolean, DbException> handler);
+
+	interface GroupListener extends ThreadListListener<GroupMessageItem> {
+
+		@UiThread
+		void onContactRelationshipRevealed(AuthorId memberId,
+				ContactId contactId, Visibility v);
+
+		@UiThread
+		void onGroupDissolved();
+	}
+
+}

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

@@ -0,0 +1,242 @@
+package org.briarproject.briar.android.privategroup.conversation;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.privategroup.conversation.GroupController.GroupListener;
+import org.briarproject.briar.android.threaded.ThreadListControllerImpl;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.briar.api.privategroup.GroupMember;
+import org.briarproject.briar.api.privategroup.GroupMessage;
+import org.briarproject.briar.api.privategroup.GroupMessageFactory;
+import org.briarproject.briar.api.privategroup.GroupMessageHeader;
+import org.briarproject.briar.api.privategroup.JoinMessageHeader;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.PrivateGroupManager;
+import org.briarproject.briar.api.privategroup.event.ContactRelationshipRevealedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent;
+import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static java.lang.Math.max;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class GroupControllerImpl extends
+		ThreadListControllerImpl<PrivateGroup, GroupMessageItem, GroupMessageHeader, GroupMessage, GroupListener>
+		implements GroupController {
+
+	private static final Logger LOG =
+			Logger.getLogger(GroupControllerImpl.class.getName());
+
+	private final PrivateGroupManager privateGroupManager;
+	private final GroupMessageFactory groupMessageFactory;
+
+	@Inject
+	GroupControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor,
+			PrivateGroupManager privateGroupManager,
+			GroupMessageFactory groupMessageFactory, EventBus eventBus,
+			MessageTracker messageTracker, Clock clock,
+			AndroidNotificationManager notificationManager) {
+		super(dbExecutor, lifecycleManager, identityManager, cryptoExecutor,
+				eventBus, clock, notificationManager, messageTracker);
+		this.privateGroupManager = privateGroupManager;
+		this.groupMessageFactory = groupMessageFactory;
+	}
+
+	@Override
+	public void onActivityStart() {
+		super.onActivityStart();
+		notificationManager.clearGroupMessageNotification(getGroupId());
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		super.eventOccurred(e);
+
+		if (e instanceof GroupMessageAddedEvent) {
+			GroupMessageAddedEvent g = (GroupMessageAddedEvent) e;
+			if (!g.isLocal() && g.getGroupId().equals(getGroupId())) {
+				LOG.info("Group message received, adding...");
+				listener.onItemReceived(buildItem(g.getHeader(), g.getText()));
+			}
+		} else if (e instanceof ContactRelationshipRevealedEvent) {
+			ContactRelationshipRevealedEvent c =
+					(ContactRelationshipRevealedEvent) e;
+			if (getGroupId().equals(c.getGroupId())) {
+				listener.onContactRelationshipRevealed(c.getMemberId(),
+						c.getContactId(), c.getVisibility());
+			}
+		} else if (e instanceof GroupInvitationResponseReceivedEvent) {
+			GroupInvitationResponseReceivedEvent g =
+					(GroupInvitationResponseReceivedEvent) e;
+			GroupInvitationResponse r = g.getMessageHeader();
+			if (getGroupId().equals(r.getShareableId()) && r.wasAccepted()) {
+				listener.onInvitationAccepted(g.getContactId());
+			}
+		} else if (e instanceof GroupDissolvedEvent) {
+			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
+			if (getGroupId().equals(g.getGroupId())) {
+				listener.onGroupDissolved();
+			}
+		}
+	}
+
+	@Override
+	protected PrivateGroup loadNamedGroup() throws DbException {
+		return privateGroupManager.getPrivateGroup(getGroupId());
+	}
+
+	@Override
+	protected Collection<GroupMessageHeader> loadHeaders() throws DbException {
+		return privateGroupManager.getHeaders(getGroupId());
+	}
+
+	@Override
+	protected String loadMessageText(GroupMessageHeader header)
+			throws DbException {
+		if (header instanceof JoinMessageHeader) {
+			// will be looked up later
+			return "";
+		}
+		return privateGroupManager.getMessageText(header.getId());
+	}
+
+	@Override
+	protected void markRead(MessageId id) throws DbException {
+		privateGroupManager.setReadFlag(getGroupId(), id, true);
+	}
+
+	@Override
+	public void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				Collection<GroupMember> members =
+						privateGroupManager.getMembers(getGroupId());
+				Collection<ContactId> contactIds = new ArrayList<>();
+				for (GroupMember m : members) {
+					if (m.getContactId() != null)
+						contactIds.add(m.getContactId());
+				}
+				handler.onResult(contactIds);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void createAndStoreMessage(String text,
+			@Nullable GroupMessageItem parentItem,
+			ResultExceptionHandler<GroupMessageItem, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				MessageId parentId = null;
+				MessageId previousMsgId =
+						privateGroupManager.getPreviousMsgId(getGroupId());
+				GroupCount count =
+						privateGroupManager.getGroupCount(getGroupId());
+				long timestamp = count.getLatestMsgTime();
+				if (parentItem != null) parentId = parentItem.getId();
+				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
+				createMessage(text, timestamp, parentId, author, previousMsgId,
+						handler);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	private void createMessage(String text, long timestamp,
+			@Nullable MessageId parentId, LocalAuthor author,
+			MessageId previousMsgId,
+			ResultExceptionHandler<GroupMessageItem, DbException> handler) {
+		cryptoExecutor.execute(() -> {
+			LOG.info("Creating group message...");
+			GroupMessage msg = groupMessageFactory
+					.createGroupMessage(getGroupId(), timestamp,
+							parentId, author, text, previousMsgId);
+			storePost(msg, text, handler);
+		});
+	}
+
+	@Override
+	protected GroupMessageHeader addLocalMessage(GroupMessage message)
+			throws DbException {
+		return privateGroupManager.addLocalMessage(message);
+	}
+
+	@Override
+	protected void deleteNamedGroup(PrivateGroup group) throws DbException {
+		privateGroupManager.removePrivateGroup(group.getId());
+	}
+
+	@Override
+	protected GroupMessageItem buildItem(GroupMessageHeader header,
+			String text) {
+		if (header instanceof JoinMessageHeader) {
+			return new JoinMessageItem((JoinMessageHeader) header, text);
+		}
+		return new GroupMessageItem(header, text);
+	}
+
+	@Override
+	public void loadLocalAuthor(
+			ResultExceptionHandler<LocalAuthor, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				handler.onResult(author);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void isDissolved(
+			ResultExceptionHandler<Boolean, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				boolean isDissolved =
+						privateGroupManager.isDissolved(getGroupId());
+				handler.onResult(isDissolved);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupConversationModule.java

@@ -1,18 +1,19 @@
 package org.briarproject.briar.android.privategroup.conversation;
 
-import org.briarproject.briar.android.viewmodel.ViewModelKey;
+import org.briarproject.briar.android.activity.ActivityScope;
+import org.briarproject.briar.android.activity.BaseActivity;
 
-import androidx.lifecycle.ViewModel;
-import dagger.Binds;
 import dagger.Module;
-import dagger.multibindings.IntoMap;
+import dagger.Provides;
 
 @Module
-public interface GroupConversationModule {
-
-	@Binds
-	@IntoMap
-	@ViewModelKey(GroupViewModel.class)
-	ViewModel bindGroupViewModel(GroupViewModel groupViewModel);
+public class GroupConversationModule {
 
+	@ActivityScope
+	@Provides
+	GroupController provideGroupController(BaseActivity activity,
+			GroupControllerImpl groupController) {
+		activity.addLifecycleController(groupController);
+		return groupController;
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupMessageAdapter.java

@@ -4,14 +4,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter;
 import org.briarproject.briar.android.threaded.ThreadPostViewHolder;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.UiThread;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 @UiThread
 @NotNullByDefault
@@ -19,14 +24,15 @@ class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
 
 	private boolean isCreator = false;
 
-	GroupMessageAdapter(ThreadItemListener<GroupMessageItem> listener) {
-		super(listener);
+	GroupMessageAdapter(ThreadItemListener<GroupMessageItem> listener,
+			LinearLayoutManager layoutManager) {
+		super(listener, layoutManager);
 	}
 
 	@LayoutRes
 	@Override
 	public int getItemViewType(int position) {
-		GroupMessageItem item = getItem(position);
+		GroupMessageItem item = items.get(position);
 		return item.getLayout();
 	}
 
@@ -41,9 +47,30 @@ class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
 		return new ThreadPostViewHolder<>(v);
 	}
 
-	void setIsCreator(boolean isCreator) {
+	void setPerspective(boolean isCreator) {
 		this.isCreator = isCreator;
 		notifyDataSetChanged();
 	}
 
+	void updateVisibility(AuthorId memberId, Visibility v) {
+		int position = findItemPosition(memberId);
+		if (position != NO_POSITION) {
+			GroupMessageItem item = items.get(position);
+			if (item instanceof JoinMessageItem) {
+				((JoinMessageItem) item).setVisibility(v);
+				notifyItemChanged(findItemPosition(item), item);
+			}
+		}
+	}
+
+	private int findItemPosition(AuthorId a) {
+		int count = items.size();
+		for (int i = 0; i < count; i++) {
+			GroupMessageItem item = items.get(i);
+			if (item.getAuthor().getId().equals(a))
+				return i;
+		}
+		return NO_POSITION; // Not found
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java

@@ -1,289 +0,0 @@
-package org.briarproject.briar.android.privategroup.conversation;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.db.TransactionManager;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
-import org.briarproject.briar.android.viewmodel.LiveEvent;
-import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.privategroup.GroupMember;
-import org.briarproject.briar.api.privategroup.GroupMessage;
-import org.briarproject.briar.api.privategroup.GroupMessageFactory;
-import org.briarproject.briar.api.privategroup.GroupMessageHeader;
-import org.briarproject.briar.api.privategroup.JoinMessageHeader;
-import org.briarproject.briar.api.privategroup.PrivateGroup;
-import org.briarproject.briar.api.privategroup.PrivateGroupManager;
-import org.briarproject.briar.api.privategroup.event.ContactRelationshipRevealedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent;
-import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static java.lang.Math.max;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
-
-	private static final Logger LOG = getLogger(GroupViewModel.class.getName());
-
-	private final PrivateGroupManager privateGroupManager;
-	private final GroupMessageFactory groupMessageFactory;
-
-	private final MutableLiveData<PrivateGroup> privateGroup =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> isCreator = new MutableLiveData<>();
-	private final MutableLiveEvent<Boolean> isDissolved =
-			new MutableLiveEvent<>();
-
-	@Inject
-	GroupViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			EventBus eventBus,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			PrivateGroupManager privateGroupManager,
-			GroupMessageFactory groupMessageFactory) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor,
-				identityManager, notificationManager, sharingController,
-				cryptoExecutor, clock, messageTracker, eventBus);
-		this.privateGroupManager = privateGroupManager;
-		this.groupMessageFactory = groupMessageFactory;
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof GroupMessageAddedEvent) {
-			GroupMessageAddedEvent g = (GroupMessageAddedEvent) e;
-			// only act on non-local messages in this group
-			if (!g.isLocal() && g.getGroupId().equals(groupId)) {
-				LOG.info("Group message received, adding...");
-				GroupMessageItem item = buildItem(g.getHeader(), g.getText());
-				addItem(item, false);
-				// In case the join message comes from the creator,
-				// we need to reload the sharing contacts
-				// in case it was delayed and the sharing count is wrong (#850).
-				if (item instanceof JoinMessageItem &&
-						(((JoinMessageItem) item).isInitial())) {
-					loadSharingContacts();
-				}
-			}
-		} else if (e instanceof GroupInvitationResponseReceivedEvent) {
-			GroupInvitationResponseReceivedEvent g =
-					(GroupInvitationResponseReceivedEvent) e;
-			GroupInvitationResponse r = g.getMessageHeader();
-			if (r.getShareableId().equals(groupId) && r.wasAccepted()) {
-				sharingController.add(g.getContactId());
-			}
-		} else if (e instanceof ContactRelationshipRevealedEvent) {
-			ContactRelationshipRevealedEvent c =
-					(ContactRelationshipRevealedEvent) e;
-			if (c.getGroupId().equals(groupId)) {
-				sharingController.add(c.getContactId());
-			}
-		} else if (e instanceof GroupDissolvedEvent) {
-			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
-			if (g.getGroupId().equals(groupId)) {
-				isDissolved.setEvent(true);
-			}
-		} else {
-			super.eventOccurred(e);
-		}
-	}
-
-	@Override
-	protected void performInitialLoad() {
-		super.performInitialLoad();
-		loadPrivateGroup(groupId);
-	}
-
-	protected void clearNotifications() {
-		notificationManager.clearGroupMessageNotification(groupId);
-	}
-
-	private void loadPrivateGroup(GroupId groupId) {
-		runOnDbThread(() -> {
-			try {
-				PrivateGroup g = privateGroupManager.getPrivateGroup(groupId);
-				privateGroup.postValue(g);
-				Author author = identityManager.getLocalAuthor();
-				isCreator.postValue(g.getCreator().equals(author));
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	@Override
-	public void loadItems() {
-		loadList(txn -> {
-			// check first if group is dissolved
-			isDissolved
-					.postEvent(privateGroupManager.isDissolved(txn, groupId));
-			// now continue to load the items
-			long start = now();
-			List<GroupMessageHeader> headers =
-					privateGroupManager.getHeaders(txn, groupId);
-			logDuration(LOG, "Loading headers", start);
-			start = now();
-			List<GroupMessageItem> items = new ArrayList<>();
-			for (GroupMessageHeader header : headers) {
-				items.add(loadItem(txn, header));
-			}
-			logDuration(LOG, "Loading bodies and creating items", start);
-			return items;
-		}, this::setItems);
-	}
-
-	private GroupMessageItem loadItem(Transaction txn,
-			GroupMessageHeader header) throws DbException {
-		String text;
-		if (header instanceof JoinMessageHeader) {
-			// will be looked up later
-			text = "";
-		} else {
-			text = privateGroupManager.getMessageText(txn, header.getId());
-		}
-		return buildItem(header, text);
-	}
-
-	private GroupMessageItem buildItem(GroupMessageHeader header, String text) {
-		if (header instanceof JoinMessageHeader) {
-			return new JoinMessageItem((JoinMessageHeader) header, text);
-		}
-		return new GroupMessageItem(header, text);
-	}
-
-	@Override
-	public void createAndStoreMessage(String text,
-			@Nullable MessageId parentId) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor author = identityManager.getLocalAuthor();
-				MessageId previousMsgId =
-						privateGroupManager.getPreviousMsgId(groupId);
-				GroupCount count = privateGroupManager.getGroupCount(groupId);
-				long timestamp = count.getLatestMsgTime();
-				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
-				createMessage(text, timestamp, parentId, author, previousMsgId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void createMessage(String text, long timestamp,
-			@Nullable MessageId parentId, LocalAuthor author,
-			MessageId previousMsgId) {
-		cryptoExecutor.execute(() -> {
-			LOG.info("Creating group message...");
-			GroupMessage msg = groupMessageFactory.createGroupMessage(groupId,
-					timestamp, parentId, author, text, previousMsgId);
-			storePost(msg, text);
-		});
-	}
-
-	private void storePost(GroupMessage msg, String text) {
-		runOnDbThread(false, txn -> {
-			long start = now();
-			GroupMessageHeader header =
-					privateGroupManager.addLocalMessage(txn, msg);
-			logDuration(LOG, "Storing group message", start);
-			txn.attach(() ->
-					addItem(buildItem(header, text), true)
-			);
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	@Override
-	protected void markItemRead(GroupMessageItem item) {
-		runOnDbThread(() -> {
-			try {
-				privateGroupManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
-			Collection<GroupMember> members =
-					privateGroupManager.getMembers(txn, groupId);
-			Collection<ContactId> contactIds = new ArrayList<>();
-			for (GroupMember m : members) {
-				if (m.getContactId() != null)
-					contactIds.add(m.getContactId());
-			}
-			txn.attach(() -> sharingController.addAll(contactIds));
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	void deletePrivateGroup() {
-		runOnDbThread(() -> {
-			try {
-				privateGroupManager.removePrivateGroup(groupId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	LiveData<PrivateGroup> getPrivateGroup() {
-		return privateGroup;
-	}
-
-	LiveData<Boolean> isCreator() {
-		return isCreator;
-	}
-
-	LiveEvent<Boolean> isDissolved() {
-		return isDissolved;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItem.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.privategroup.conversation;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.api.privategroup.JoinMessageHeader;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -12,11 +13,13 @@ import androidx.annotation.UiThread;
 @NotThreadSafe
 class JoinMessageItem extends GroupMessageItem {
 
+	private Visibility visibility;
 	private final boolean isInitial;
 
 	JoinMessageItem(JoinMessageHeader h, String text) {
 		super(h, text);
-		isInitial = h.isInitial();
+		this.visibility = h.getVisibility();
+		this.isInitial = h.isInitial();
 	}
 
 	@Override
@@ -30,6 +33,14 @@ class JoinMessageItem extends GroupMessageItem {
 		return R.layout.list_item_group_join_notice;
 	}
 
+	Visibility getVisibility() {
+		return visibility;
+	}
+
+	void setVisibility(Visibility visibility) {
+		this.visibility = visibility;
+	}
+
 	boolean isInitial() {
 		return isInitial;
 	}

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java

@@ -7,8 +7,6 @@ import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
@@ -17,8 +15,6 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
 import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
-import org.briarproject.briar.api.autodelete.AutoDeleteManager;
-import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.identity.AuthorManager;
 import org.briarproject.briar.api.privategroup.GroupMessage;
 import org.briarproject.briar.api.privategroup.GroupMessageFactory;
@@ -40,8 +36,6 @@ import javax.inject.Inject;
 import androidx.annotation.Nullable;
 
 import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @Immutable
@@ -50,12 +44,9 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 		implements CreateGroupController {
 
 	private static final Logger LOG =
-			getLogger(CreateGroupControllerImpl.class.getName());
+			Logger.getLogger(CreateGroupControllerImpl.class.getName());
 
 	private final Executor cryptoExecutor;
-	private final TransactionManager db;
-	private final AutoDeleteManager autoDeleteManager;
-	private final ConversationManager conversationManager;
 	private final ContactManager contactManager;
 	private final IdentityManager identityManager;
 	private final PrivateGroupFactory groupFactory;
@@ -66,27 +57,17 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 	private final Clock clock;
 
 	@Inject
-	CreateGroupControllerImpl(
-			@DatabaseExecutor Executor dbExecutor,
+	CreateGroupControllerImpl(@DatabaseExecutor Executor dbExecutor,
 			@CryptoExecutor Executor cryptoExecutor,
-			TransactionManager db,
-			AutoDeleteManager autoDeleteManager,
-			ConversationManager conversationManager,
-			LifecycleManager lifecycleManager,
-			ContactManager contactManager,
-			AuthorManager authorManager,
-			IdentityManager identityManager,
+			LifecycleManager lifecycleManager, ContactManager contactManager,
+			AuthorManager authorManager, IdentityManager identityManager,
 			PrivateGroupFactory groupFactory,
 			GroupMessageFactory groupMessageFactory,
 			PrivateGroupManager groupManager,
 			GroupInvitationFactory groupInvitationFactory,
-			GroupInvitationManager groupInvitationManager,
-			Clock clock) {
+			GroupInvitationManager groupInvitationManager, Clock clock) {
 		super(dbExecutor, lifecycleManager, contactManager, authorManager);
 		this.cryptoExecutor = cryptoExecutor;
-		this.db = db;
-		this.autoDeleteManager = autoDeleteManager;
-		this.conversationManager = conversationManager;
 		this.contactManager = contactManager;
 		this.identityManager = identityManager;
 		this.groupFactory = groupFactory;
@@ -150,14 +131,16 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 			ResultExceptionHandler<Void, DbException> handler) {
 		runOnDbThread(() -> {
 			try {
-				db.transaction(false, txn -> {
-					LocalAuthor localAuthor =
-							identityManager.getLocalAuthor(txn);
-					List<InvitationContext> contexts =
-							createInvitationContexts(txn, contactIds);
-					txn.attach(() -> signInvitations(g, localAuthor, contexts,
-							text, handler));
-				});
+				LocalAuthor localAuthor = identityManager.getLocalAuthor();
+				List<Contact> contacts = new ArrayList<>();
+				for (ContactId c : contactIds) {
+					try {
+						contacts.add(contactManager.getContact(c));
+					} catch (NoSuchContactException e) {
+						// Continue
+					}
+				}
+				signInvitations(g, localAuthor, contacts, text, handler);
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 				handler.onException(e);
@@ -165,32 +148,17 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 		});
 	}
 
-	private List<InvitationContext> createInvitationContexts(Transaction txn,
-			Collection<ContactId> contactIds) throws DbException {
-		List<InvitationContext> contexts = new ArrayList<>();
-		for (ContactId c : contactIds) {
-			try {
-				Contact contact = contactManager.getContact(txn, c);
-				long timestamp = conversationManager
-						.getTimestampForOutgoingMessage(txn, c);
-				long timer = autoDeleteManager.getAutoDeleteTimer(txn, c,
-						timestamp);
-				contexts.add(new InvitationContext(contact, timestamp, timer));
-			} catch (NoSuchContactException e) {
-				// Continue
-			}
-		}
-		return contexts;
-	}
-
 	private void signInvitations(GroupId g, LocalAuthor localAuthor,
-			List<InvitationContext> contexts, @Nullable String text,
+			Collection<Contact> contacts, @Nullable String text,
 			ResultExceptionHandler<Void, DbException> handler) {
 		cryptoExecutor.execute(() -> {
-			for (InvitationContext ctx : contexts) {
-				ctx.signature = groupInvitationFactory.signInvitation(
-						ctx.contact, g, ctx.timestamp,
-						localAuthor.getPrivateKey());
+			long timestamp = clock.currentTimeMillis();
+			List<InvitationContext> contexts = new ArrayList<>();
+			for (Contact c : contacts) {
+				byte[] signature = groupInvitationFactory.signInvitation(c, g,
+						timestamp, localAuthor.getPrivateKey());
+				contexts.add(new InvitationContext(c.getId(), timestamp,
+						signature));
 			}
 			sendInvitations(g, contexts, text, handler);
 		});
@@ -201,12 +169,11 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 			ResultExceptionHandler<Void, DbException> handler) {
 		runOnDbThread(() -> {
 			try {
-				for (InvitationContext ctx : contexts) {
+				for (InvitationContext context : contexts) {
 					try {
 						groupInvitationManager.sendInvitation(g,
-								ctx.contact.getId(), text, ctx.timestamp,
-								requireNonNull(ctx.signature),
-								ctx.autoDeleteTimer);
+								context.contactId, text, context.timestamp,
+								context.signature);
 					} catch (NoSuchContactException e) {
 						// Continue
 					}
@@ -221,16 +188,15 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 
 	private static class InvitationContext {
 
-		private final Contact contact;
-		private final long timestamp, autoDeleteTimer;
-		@Nullable
-		private byte[] signature = null;
+		private final ContactId contactId;
+		private final long timestamp;
+		private final byte[] signature;
 
-		private InvitationContext(Contact contact, long timestamp,
-				long autoDeleteTimer) {
-			this.contact = contact;
+		private InvitationContext(ContactId contactId, long timestamp,
+				byte[] signature) {
+			this.contactId = contactId;
 			this.timestamp = timestamp;
-			this.autoDeleteTimer = autoDeleteTimer;
+			this.signature = signature;
 		}
 	}
 }

briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java

@@ -15,7 +15,6 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.LargeTextInputView;
 import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.android.view.TextSendController.SendListener;
-import org.briarproject.briar.android.view.TextSendController.SendState;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.List;
@@ -23,10 +22,6 @@ import java.util.List;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -84,14 +79,13 @@ public abstract class BaseMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> headers) {
 		// disable button to prevent accidental double actions
 		sendController.setReady(false);
 		message.hideSoftKeyboard();
 
 		listener.onButtonClick(text);
-		return new MutableLiveData<>(SENT);
 	}
 
 	@UiThread

briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java

@@ -10,9 +10,11 @@ import org.briarproject.bramble.api.db.NoSuchGroupException;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
 import org.briarproject.briar.android.controller.handler.ExceptionHandler;
 import org.briarproject.briar.api.blog.BlogSharingManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.identity.AuthorManager;
 
 import java.util.Collection;
@@ -24,7 +26,6 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @Immutable
@@ -33,17 +34,22 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl
 		implements ShareBlogController {
 
 	private final static Logger LOG =
-			getLogger(ShareBlogControllerImpl.class.getName());
+			Logger.getLogger(ShareBlogControllerImpl.class.getName());
 
+	private final ConversationManager conversationManager;
 	private final BlogSharingManager blogSharingManager;
+	private final Clock clock;
 
 	@Inject
 	ShareBlogControllerImpl(@DatabaseExecutor Executor dbExecutor,
 			LifecycleManager lifecycleManager, ContactManager contactManager,
 			AuthorManager authorManager,
-			BlogSharingManager blogSharingManager) {
+			ConversationManager conversationManager,
+			BlogSharingManager blogSharingManager, Clock clock) {
 		super(dbExecutor, lifecycleManager, contactManager, authorManager);
+		this.conversationManager = conversationManager;
 		this.blogSharingManager = blogSharingManager;
+		this.clock = clock;
 	}
 
 	@Override
@@ -58,7 +64,10 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl
 			try {
 				for (ContactId c : contacts) {
 					try {
-						blogSharingManager.sendInvitation(g, c, text);
+						long time = Math.max(clock.currentTimeMillis(),
+								conversationManager.getGroupCount(c)
+										.getLatestMsgTime() + 1);
+						blogSharingManager.sendInvitation(g, c, text, time);
 					} catch (NoSuchContactException | NoSuchGroupException e) {
 						logException(LOG, WARNING, e);
 					}

briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java

@@ -10,8 +10,10 @@ import org.briarproject.bramble.api.db.NoSuchGroupException;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
 import org.briarproject.briar.android.controller.handler.ExceptionHandler;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 import org.briarproject.briar.api.identity.AuthorManager;
 
@@ -24,7 +26,6 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @Immutable
@@ -33,17 +34,22 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl
 		implements ShareForumController {
 
 	private final static Logger LOG =
-			getLogger(ShareForumControllerImpl.class.getName());
+			Logger.getLogger(ShareForumControllerImpl.class.getName());
 
+	private final ConversationManager conversationManager;
 	private final ForumSharingManager forumSharingManager;
+	private final Clock clock;
 
 	@Inject
 	ShareForumControllerImpl(@DatabaseExecutor Executor dbExecutor,
 			LifecycleManager lifecycleManager, ContactManager contactManager,
 			AuthorManager authorManager,
-			ForumSharingManager forumSharingManager) {
+			ConversationManager conversationManager,
+			ForumSharingManager forumSharingManager, Clock clock) {
 		super(dbExecutor, lifecycleManager, contactManager, authorManager);
+		this.conversationManager = conversationManager;
 		this.forumSharingManager = forumSharingManager;
+		this.clock = clock;
 	}
 
 	@Override
@@ -58,7 +64,10 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl
 			try {
 				for (ContactId c : contacts) {
 					try {
-						forumSharingManager.sendInvitation(g, c, text);
+						long time = Math.max(clock.currentTimeMillis(),
+								conversationManager.getGroupCount(c)
+										.getLatestMsgTime() + 1);
+						forumSharingManager.sendInvitation(g, c, text, time);
 					} catch (NoSuchContactException | NoSuchGroupException e) {
 						logException(LOG, WARNING, e);
 					}

briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingController.java

@@ -1,54 +0,0 @@
-package org.briarproject.briar.android.sharing;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-
-@NotNullByDefault
-public interface SharingController {
-
-	/**
-	 * Call this when the owning ViewModel gets cleared,
-	 * so the {@link EventBus} can get unregistered.
-	 */
-	void onCleared();
-
-	/**
-	 * Adds one contact to be tracked.
-	 */
-	@UiThread
-	void add(ContactId c);
-
-	/**
-	 * Adds a collection of contacts to be tracked.
-	 */
-	@UiThread
-	void addAll(Collection<ContactId> contacts);
-
-	/**
-	 * Call this when the contact identified by c is no longer sharing
-	 * the given group identified by GroupId g.
-	 */
-	@UiThread
-	void remove(ContactId c);
-
-	/**
-	 * Returns the total number of contacts that have been added.
-	 */
-	LiveData<SharingInfo> getSharingInfo();
-
-	class SharingInfo {
-		public final int total, online;
-
-		SharingInfo(int total, int online) {
-			this.total = total;
-			this.online = online;
-		}
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingControllerImpl.java

@@ -1,102 +0,0 @@
-package org.briarproject.briar.android.sharing;
-
-import org.briarproject.bramble.api.connection.ConnectionRegistry;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-@NotNullByDefault
-public class SharingControllerImpl implements SharingController, EventListener {
-
-	private final EventBus eventBus;
-	private final ConnectionRegistry connectionRegistry;
-
-	// UI thread
-	private final Set<ContactId> contacts = new HashSet<>();
-	private final MutableLiveData<SharingInfo> sharingInfo =
-			new MutableLiveData<>();
-
-	@Inject
-	SharingControllerImpl(EventBus eventBus,
-			ConnectionRegistry connectionRegistry) {
-		this.eventBus = eventBus;
-		this.connectionRegistry = connectionRegistry;
-		eventBus.addListener(this);
-	}
-
-	@Override
-	public void onCleared() {
-		eventBus.removeListener(this);
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ContactConnectedEvent) {
-			setConnected(((ContactConnectedEvent) e).getContactId());
-		} else if (e instanceof ContactDisconnectedEvent) {
-			setConnected(((ContactDisconnectedEvent) e).getContactId());
-		}
-	}
-
-	@UiThread
-	private void setConnected(ContactId c) {
-		if (contacts.contains(c)) {
-			updateLiveData();
-		}
-	}
-
-	@UiThread
-	private void updateLiveData() {
-		int online = getOnlineCount();
-		sharingInfo.setValue(new SharingInfo(contacts.size(), online));
-	}
-
-	private int getOnlineCount() {
-		int online = 0;
-		for (ContactId c : contacts) {
-			if (connectionRegistry.isConnected(c)) online++;
-		}
-		return online;
-	}
-
-	@UiThread
-	@Override
-	public void addAll(Collection<ContactId> c) {
-		contacts.addAll(c);
-		updateLiveData();
-	}
-
-	@UiThread
-	@Override
-	public void add(ContactId c) {
-		contacts.add(c);
-		updateLiveData();
-	}
-
-	@UiThread
-	@Override
-	public void remove(ContactId c) {
-		contacts.remove(c);
-		updateLiveData();
-	}
-
-	@Override
-	public LiveData<SharingInfo> getSharingInfo() {
-		return sharingInfo;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/sharing/SharingModule.java

@@ -9,47 +9,36 @@ import dagger.Provides;
 @Module
 public class SharingModule {
 
-	@Module
-	@Deprecated
-	public static class SharingLegacyModule {
-
-		@ActivityScope
-		@Provides
-		ShareForumController provideShareForumController(
-				ShareForumControllerImpl shareForumController) {
-			return shareForumController;
-		}
-
-		@ActivityScope
-		@Provides
-		BlogInvitationController provideInvitationBlogController(
-				BaseActivity activity,
-				BlogInvitationControllerImpl blogInvitationController) {
-			activity.addLifecycleController(blogInvitationController);
-			return blogInvitationController;
-		}
-
-		@ActivityScope
-		@Provides
-		ForumInvitationController provideInvitationForumController(
-				BaseActivity activity,
-				ForumInvitationControllerImpl forumInvitationController) {
-			activity.addLifecycleController(forumInvitationController);
-			return forumInvitationController;
-		}
-
-		@ActivityScope
-		@Provides
-		ShareBlogController provideShareBlogController(
-				ShareBlogControllerImpl shareBlogController) {
-			return shareBlogController;
-		}
+	@ActivityScope
+	@Provides
+	ShareForumController provideShareForumController(
+			ShareForumControllerImpl shareForumController) {
+		return shareForumController;
 	}
 
+	@ActivityScope
 	@Provides
-	SharingController provideSharingController(
-			SharingControllerImpl sharingController) {
-		return sharingController;
+	BlogInvitationController provideInvitationBlogController(
+			BaseActivity activity,
+			BlogInvitationControllerImpl blogInvitationController) {
+		activity.addLifecycleController(blogInvitationController);
+		return blogInvitationController;
+	}
+
+	@ActivityScope
+	@Provides
+	ForumInvitationController provideInvitationForumController(
+			BaseActivity activity,
+			ForumInvitationControllerImpl forumInvitationController) {
+		activity.addLifecycleController(forumInvitationController);
+		return forumInvitationController;
+	}
+
+	@ActivityScope
+	@Provides
+	ShareBlogController provideShareBlogController(
+			ShareBlogControllerImpl shareBlogController) {
+		return shareBlogController;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java

@@ -0,0 +1,54 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.briar.api.client.MessageTree;
+import org.briarproject.briar.api.client.MessageTree.MessageNode;
+import org.briarproject.briar.client.MessageTreeImpl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import androidx.annotation.UiThread;
+
+@UiThread
+@NotNullByDefault
+public class NestedTreeList<T extends MessageNode> implements Iterable<T> {
+
+	private final MessageTree<T> tree = new MessageTreeImpl<>();
+	private List<T> depthFirstCollection = new ArrayList<>();
+
+	public void addAll(Collection<T> collection) {
+		tree.add(collection);
+		depthFirstCollection = new ArrayList<>(tree.depthFirstOrder());
+	}
+
+	public void add(T elem) {
+		tree.add(elem);
+		depthFirstCollection = new ArrayList<>(tree.depthFirstOrder());
+	}
+
+	public void clear() {
+		tree.clear();
+		depthFirstCollection.clear();
+	}
+
+	public T get(int index) {
+		return depthFirstCollection.get(index);
+	}
+
+	public int size() {
+		return depthFirstCollection.size();
+	}
+
+	public boolean contains(MessageId m) {
+		return tree.contains(m);
+	}
+
+	@Override
+	public Iterator<T> iterator() {
+		return depthFirstCollection.iterator();
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java

@@ -99,14 +99,4 @@ public abstract class ThreadItem implements MessageNode {
 		return highlighted;
 	}
 
-	@Override
-	public int hashCode() {
-		return messageId.hashCode();
-	}
-
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof ThreadItem &&
-				messageId.equals(((ThreadItem) o).messageId);
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java

@@ -4,45 +4,39 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.ItemReturningAdapter;
+import org.briarproject.briar.android.util.VersionedAdapter;
+
+import java.util.Collection;
 
 import javax.annotation.Nullable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 @UiThread
-@NotNullByDefault
 public class ThreadItemAdapter<I extends ThreadItem>
-		extends ListAdapter<I, BaseThreadItemViewHolder<I>>
-		implements ItemReturningAdapter<I> {
+		extends RecyclerView.Adapter<BaseThreadItemViewHolder<I>>
+		implements VersionedAdapter, ItemReturningAdapter<I> {
 
 	static final int UNDEFINED = -1;
 
+	protected final NestedTreeList<I> items = new NestedTreeList<>();
 	private final ThreadItemListener<I> listener;
+	private final LinearLayoutManager layoutManager;
 
-	public ThreadItemAdapter(ThreadItemListener<I> listener) {
-		super(new DiffUtil.ItemCallback<I>() {
-			@Override
-			public boolean areItemsTheSame(I a, I b) {
-				return a.equals(b);
-			}
+	private volatile int revision = 0;
 
-			@Override
-			public boolean areContentsTheSame(I a, I b) {
-				return a.isHighlighted() == b.isHighlighted() &&
-						a.isRead() == b.isRead();
-			}
-		});
+	public ThreadItemAdapter(ThreadItemListener<I> listener,
+			LinearLayoutManager layoutManager) {
 		this.listener = listener;
+		this.layoutManager = layoutManager;
 	}
 
 	@NonNull
@@ -57,27 +51,76 @@ public class ThreadItemAdapter<I extends ThreadItem>
 	@Override
 	public void onBindViewHolder(@NonNull BaseThreadItemViewHolder<I> ui,
 			int position) {
-		I item = getItem(position);
+		I item = items.get(position);
 		ui.bind(item, listener);
 	}
 
-	int findItemPosition(MessageId id) {
-		for (int i = 0; i < getItemCount(); i++) {
-			if (id.equals(getItem(i).getId())) return i;
+	@Override
+	public int getItemCount() {
+		return items.size();
+	}
+
+	@Override
+	public int getRevision() {
+		return revision;
+	}
+
+	@Override
+	public void incrementRevision() {
+		revision++;
+	}
+
+	void setItemWithIdVisible(MessageId messageId) {
+		int pos = 0;
+		for (I item : items) {
+			if (item.getId().equals(messageId)) {
+				layoutManager.scrollToPosition(pos);
+				break;
+			}
+			pos++;
+		}
+	}
+
+	public void setItems(Collection<I> items) {
+		this.items.clear();
+		this.items.addAll(items);
+		notifyDataSetChanged();
+	}
+
+	public void add(I item) {
+		items.add(item);
+		notifyItemInserted(findItemPosition(item));
+	}
+
+	@Nullable
+	public I getItemAt(int position) {
+		if (position == NO_POSITION || position >= items.size()) {
+			return null;
+		}
+		return items.get(position);
+	}
+
+	protected int findItemPosition(@Nullable I item) {
+		for (int i = 0; i < items.size(); i++) {
+			if (items.get(i).equals(item)) return i;
 		}
 		return NO_POSITION; // Not found
 	}
 
+	boolean contains(MessageId m) {
+		return items.contains(m);
+	}
+
 	/**
 	 * Highlights the item with the given {@link MessageId}
 	 * and disables the highlight for a previously highlighted item, if any.
-	 * <p>
+	 *
 	 * Only one item can be highlighted at a time.
 	 */
 	void setHighlightedItem(@Nullable MessageId id) {
-		for (int i = 0; i < getItemCount(); i++) {
-			I item = getItem(i);
-			if (item.getId().equals(id)) {
+		for (int i = 0; i < items.size(); i++) {
+			I item = items.get(i);
+			if (id != null && item.getId().equals(id)) {
 				item.setHighlighted(true);
 				notifyItemChanged(i, item);
 			} else if (item.isHighlighted()) {
@@ -89,27 +132,20 @@ public class ThreadItemAdapter<I extends ThreadItem>
 
 	@Nullable
 	I getHighlightedItem() {
-		for (I item : getCurrentList()) {
-			if (item.isHighlighted()) return item;
+		for (I i : items) {
+			if (i.isHighlighted()) return i;
 		}
 		return null;
 	}
 
-	@Nullable
-	MessageId getFirstVisibleMessageId(LinearLayoutManager layoutManager) {
-		int position = layoutManager.findFirstVisibleItemPosition();
-		if (position == NO_POSITION) return null;
-		return getItemAt(position).getId();
-	}
-
 	/**
 	 * Returns the position of the first unread item below the current viewport
 	 */
-	int getVisibleUnreadPosBottom(LinearLayoutManager layoutManager) {
+	int getVisibleUnreadPosBottom() {
 		int positionBottom = layoutManager.findLastVisibleItemPosition();
 		if (positionBottom == NO_POSITION) return NO_POSITION;
-		for (int i = positionBottom + 1; i < getItemCount(); i++) {
-			if (!getItem(i).isRead()) return i;
+		for (int i = positionBottom + 1; i < items.size(); i++) {
+			if (!items.get(i).isRead()) return i;
 		}
 		return NO_POSITION;
 	}
@@ -117,11 +153,11 @@ public class ThreadItemAdapter<I extends ThreadItem>
 	/**
 	 * Returns the position of the first unread item above the current viewport
 	 */
-	int getVisibleUnreadPosTop(LinearLayoutManager layoutManager) {
+	int getVisibleUnreadPosTop() {
 		int positionTop = layoutManager.findFirstVisibleItemPosition();
 		int position = NO_POSITION;
-		for (int i = 0; i < getItemCount(); i++) {
-			if (i < positionTop && !getItem(i).isRead()) {
+		for (int i = 0; i < items.size(); i++) {
+			if (i < positionTop && !items.get(i).isRead()) {
 				position = i;
 			} else if (i >= positionTop) {
 				return position;
@@ -130,11 +166,6 @@ public class ThreadItemAdapter<I extends ThreadItem>
 		return NO_POSITION;
 	}
 
-	@Override
-	public I getItemAt(int position) {
-		return getItem(position);
-	}
-
 	public interface ThreadItemListener<I> {
 		void onReplyClick(I item);
 	}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemList.java

@@ -0,0 +1,15 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.sync.MessageId;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+public interface ThreadItemList<I extends ThreadItem> extends List<I> {
+
+	@Nullable
+	MessageId getFirstVisibleItemId();
+
+	void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId);
+}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java

@@ -0,0 +1,23 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.sync.MessageId;
+
+import java.util.ArrayList;
+
+import javax.annotation.Nullable;
+
+public class ThreadItemListImpl<I extends ThreadItem> extends ArrayList<I>
+		implements ThreadItemList<I> {
+
+	private MessageId bottomVisibleItemId;
+
+	@Override
+	public MessageId getFirstVisibleItemId() {
+		return bottomVisibleItemId;
+	}
+
+	@Override
+	public void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId) {
+		this.bottomVisibleItemId = bottomVisibleItemId;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java

@@ -2,57 +2,78 @@ package org.briarproject.briar.android.threaded;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.view.MenuItem;
 
 import com.google.android.material.snackbar.Snackbar;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BriarActivity;
-import org.briarproject.briar.android.sharing.SharingController.SharingInfo;
+import org.briarproject.briar.android.controller.SharingController;
+import org.briarproject.briar.android.controller.SharingController.SharingListener;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDataSource;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.android.view.TextSendController.SendListener;
-import org.briarproject.briar.android.view.TextSendController.SendState;
 import org.briarproject.briar.android.view.UnreadMessageButton;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.client.NamedGroup;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.StringRes;
+import androidx.annotation.UiThread;
 import androidx.appcompat.app.ActionBar;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadItemAdapter<I>>
-		extends BriarActivity implements SendListener, ThreadItemListener<I> {
+public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadItem, A extends ThreadItemAdapter<I>>
+		extends BriarActivity
+		implements ThreadListListener<I>, SendListener, SharingListener,
+		ThreadItemListener<I>, ThreadListDataSource {
 
-	protected final A adapter = createAdapter();
-	protected abstract ThreadListViewModel<I> getViewModel();
-	protected abstract A createAdapter();
+	protected static final String KEY_REPLY_ID = "replyId";
+
+	private static final Logger LOG =
+			Logger.getLogger(ThreadListActivity.class.getName());
+
+	protected A adapter;
+	private ThreadScrollListener<I> scrollListener;
 	protected BriarRecyclerView list;
+	private LinearLayoutManager layoutManager;
 	protected TextInputView textInput;
 	protected TextSendController sendController;
 	protected GroupId groupId;
+	@Nullable
+	private Parcelable layoutManagerState;
+	@Nullable
+	private MessageId replyId;
 
-	private LinearLayoutManager layoutManager;
-	private ThreadScrollListener<I> scrollListener;
+	protected abstract ThreadListController<G, I> getController();
+
+	@Inject
+	protected SharingController sharingController;
 
 	@CallSuper
 	@Override
@@ -65,8 +86,7 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 		byte[] b = i.getByteArrayExtra(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No GroupId in intent.");
 		groupId = new GroupId(b);
-		ThreadListViewModel<I> viewModel = getViewModel();
-		viewModel.setGroupId(groupId);
+		getController().setGroupId(groupId);
 
 		textInput = findViewById(R.id.text_input_container);
 		sendController = new TextSendController(textInput, this, false);
@@ -80,41 +100,131 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 		list = findViewById(R.id.list);
 		layoutManager = new LinearLayoutManager(this);
 		list.setLayoutManager(layoutManager);
+		adapter = createAdapter(layoutManager);
 		list.setAdapter(adapter);
-		scrollListener = new ThreadScrollListener<>(adapter, viewModel,
+		scrollListener = new ThreadScrollListener<>(adapter, getController(),
 				upButton, downButton);
 		list.getRecyclerView().addOnScrollListener(scrollListener);
 
 		upButton.setOnClickListener(v -> {
-			int position = adapter.getVisibleUnreadPosTop(layoutManager);
+			int position = adapter.getVisibleUnreadPosTop();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
 		});
 		downButton.setOnClickListener(v -> {
-			int position = adapter.getVisibleUnreadPosBottom(layoutManager);
+			int position = adapter.getVisibleUnreadPosBottom();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
 		});
 
-		viewModel.getItems().observe(this, result -> result
-				.onError(this::handleException)
-				.onSuccess(this::displayItems)
-		);
+		if (state != null) {
+			byte[] replyIdBytes = state.getByteArray(KEY_REPLY_ID);
+			if (replyIdBytes != null) replyId = new MessageId(replyIdBytes);
+		}
 
-		viewModel.getSharingInfo().observe(this, this::setToolbarSubTitle);
+		sharingController.setSharingListener(this);
+		loadSharingContacts();
+	}
 
-		viewModel.getGroupRemoved().observe(this, removed -> {
-			if (removed) supportFinishAfterTransition();
-		});
+	@Override
+	@Nullable
+	public MessageId getFirstVisibleMessageId() {
+		if (layoutManager != null && adapter != null) {
+			int position =
+					layoutManager.findFirstVisibleItemPosition();
+			I i = adapter.getItemAt(position);
+			return i == null ? null : i.getId();
+		}
+		return null;
+	}
+
+	protected abstract A createAdapter(LinearLayoutManager layoutManager);
+
+	protected void loadNamedGroup() {
+		getController().loadNamedGroup(
+				new UiResultExceptionHandler<G, DbException>(this) {
+					@Override
+					public void onResultUi(G groupItem) {
+						onNamedGroupLoaded(groupItem);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@UiThread
+	protected abstract void onNamedGroupLoaded(G groupItem);
+
+	protected void loadItems() {
+		int revision = adapter.getRevision();
+		getController().loadItems(
+				new UiResultExceptionHandler<ThreadItemList<I>, DbException>(
+						this) {
+					@Override
+					public void onResultUi(ThreadItemList<I> items) {
+						if (revision == adapter.getRevision()) {
+							adapter.incrementRevision();
+							if (items.isEmpty()) {
+								list.showData();
+							} else {
+								displayItems(items);
+								updateTextInput();
+							}
+						} else {
+							LOG.info("Concurrent update, reloading");
+							loadItems();
+						}
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	private void displayItems(ThreadItemList<I> items) {
+		adapter.setItems(items);
+		MessageId messageId = items.getFirstVisibleItemId();
+		if (messageId != null)
+			adapter.setItemWithIdVisible(messageId);
+		list.showData();
+		if (layoutManagerState == null) {
+			list.scrollToPosition(0);  // Scroll to the top
+		} else {
+			layoutManager.onRestoreInstanceState(layoutManagerState);
+		}
+	}
+
+	protected void loadSharingContacts() {
+		getController().loadSharingContacts(
+				new UiResultExceptionHandler<Collection<ContactId>, DbException>(
+						this) {
+					@Override
+					public void onResultUi(Collection<ContactId> contacts) {
+						sharingController.addAll(contacts);
+						int online = sharingController.getOnlineCount();
+						setToolbarSubTitle(contacts.size(), online);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
 	@CallSuper
 	@Override
 	public void onStart() {
 		super.onStart();
-		getViewModel().blockAndClearNotifications();
+		sharingController.onStart();
+		loadItems();
 		list.startPeriodicUpdate();
 	}
 
@@ -122,98 +232,91 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	@Override
 	public void onStop() {
 		super.onStop();
-		getViewModel().unblockNotifications();
+		sharingController.onStop();
 		list.stopPeriodicUpdate();
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == android.R.id.home) {
-			supportFinishAfterTransition();
-			return true;
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		if (layoutManager != null) {
+			layoutManagerState = layoutManager.onSaveInstanceState();
+			outState.putParcelable("layoutManager", layoutManagerState);
+		}
+		if (replyId != null) {
+			outState.putByteArray(KEY_REPLY_ID, replyId.getBytes());
+		}
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		super.onRestoreInstanceState(savedInstanceState);
+		layoutManagerState = savedInstanceState.getParcelable("layoutManager");
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				supportFinishAfterTransition();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
 	public void onBackPressed() {
 		if (adapter.getHighlightedItem() != null) {
 			textInput.clearText();
-			getViewModel().setReplyId(null);
+			replyId = null;
 			updateTextInput();
 		} else {
 			super.onBackPressed();
 		}
 	}
 
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		// store list position, so we can restore it when coming back here
-		if (layoutManager != null && adapter != null) {
-			MessageId id = adapter.getFirstVisibleMessageId(layoutManager);
-			getViewModel().storeMessageId(id);
-		}
-	}
-
-	protected void displayItems(List<I> items) {
-		if (items.isEmpty()) {
-			list.showData();
-		} else {
-			adapter.submitList(items, () -> {
-				// do stuff *after* list had been updated
-				scrollAfterListCommitted();
-				updateTextInput();
-			});
-		}
-	}
-
-	/**
-	 * Scrolls to the first visible item last time the activity was open,
-	 * if one exists and this is the first time, the list gets displayed.
-	 * Or scrolls to a locally added item that has just been added to the list.
-	 */
-	private void scrollAfterListCommitted() {
-		MessageId restoredFirstVisibleItemId =
-				getViewModel().getAndResetRestoredMessageId();
-		MessageId scrollToItem =
-				getViewModel().getAndResetScrollToItem();
-		if (restoredFirstVisibleItemId != null) {
-			scrollToItemAtTop(restoredFirstVisibleItemId);
-		} else if (scrollToItem != null) {
-			scrollToItemAtTop(scrollToItem);
-		}
-		scrollListener.updateUnreadButtons(layoutManager);
-	}
-
 	@Override
 	public void onReplyClick(I item) {
-		getViewModel().setReplyId(item.getId());
+		replyId = item.getId();
 		updateTextInput();
 		// FIXME This does not work for a hardware keyboard
 		if (textInput.isKeyboardOpen()) {
-			scrollToItemAtTop(item.getId());
+			scrollToItemAtTop(item);
 		} else {
 			// wait with scrolling until keyboard opened
 			textInput.setOnKeyboardShownListener(() -> {
-				scrollToItemAtTop(item.getId());
+				scrollToItemAtTop(item);
 				textInput.setOnKeyboardShownListener(null);
 			});
 		}
 	}
 
-	protected void setToolbarSubTitle(SharingInfo sharingInfo) {
+	@Override
+	public void onSharingInfoUpdated(int total, int online) {
+		setToolbarSubTitle(total, online);
+	}
+
+	@Override
+	public void onInvitationAccepted(ContactId c) {
+		sharingController.add(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
+	protected void setToolbarSubTitle(int total, int online) {
 		ActionBar actionBar = getSupportActionBar();
 		if (actionBar != null) {
-			actionBar.setSubtitle(getString(R.string.shared_with,
-					sharingInfo.total, sharingInfo.online));
+			actionBar.setSubtitle(
+					getString(R.string.shared_with, total, online));
 		}
 	}
 
-	private void scrollToItemAtTop(MessageId messageId) {
-		int position = adapter.findItemPosition(messageId);
+	private void scrollToItemAtTop(I item) {
+		int position = adapter.findItemPosition(item);
 		if (position != NO_POSITION) {
-			layoutManager.scrollToPositionWithOffset(position, 0);
+			layoutManager
+					.scrollToPositionWithOffset(position, 0);
 		}
 	}
 
@@ -224,7 +327,6 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	}
 
 	private void updateTextInput() {
-		MessageId replyId = getViewModel().getReplyId();
 		if (replyId != null) {
 			textInput.setHint(R.string.forum_message_reply_hint);
 			textInput.showSoftKeyboard();
@@ -235,19 +337,58 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	}
 
 	@Override
-	public LiveData<SendState> onSendClick(@Nullable String text,
-			List<AttachmentHeader> headers, long expectedAutoDeleteTimer) {
+	public void onSendClick(@Nullable String text,
+			List<AttachmentHeader> headers) {
 		if (isNullOrEmpty(text)) throw new AssertionError();
 
-		MessageId replyId = getViewModel().getReplyId();
-		getViewModel().createAndStoreMessage(text, replyId);
+		I replyItem = adapter.getHighlightedItem();
+		UiResultExceptionHandler<I, DbException> handler =
+				new UiResultExceptionHandler<I, DbException>(this) {
+					@Override
+					public void onResultUi(I result) {
+						addItem(result, true);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				};
+		getController().createAndStoreMessage(text, replyItem, handler);
 		textInput.hideSoftKeyboard();
 		textInput.clearText();
-		getViewModel().setReplyId(null);
+		replyId = null;
 		updateTextInput();
-		return new MutableLiveData<>(SENT);
 	}
 
 	protected abstract int getMaxTextLength();
 
+	@Override
+	public void onItemReceived(I item) {
+		addItem(item, false);
+	}
+
+	@Override
+	public void onGroupRemoved() {
+		supportFinishAfterTransition();
+	}
+
+	private void addItem(I item, boolean isLocal) {
+		adapter.incrementRevision();
+		MessageId parent = item.getParentId();
+		if (parent != null && !adapter.contains(parent)) {
+			// We've incremented the adapter's revision, so the item will be
+			// loaded when its parent has been loaded
+			LOG.info("Ignoring item with missing parent");
+			return;
+		}
+		adapter.add(item);
+
+		if (isLocal) {
+			scrollToItemAtTop(item);
+		} else {
+			scrollListener.updateUnreadButtons(layoutManager);
+		}
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java

@@ -0,0 +1,60 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.briar.android.controller.ActivityLifecycleController;
+import org.briarproject.briar.android.controller.handler.ExceptionHandler;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.api.client.NamedGroup;
+
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+
+import androidx.annotation.UiThread;
+
+@NotNullByDefault
+public interface ThreadListController<G extends NamedGroup, I extends ThreadItem>
+		extends ActivityLifecycleController {
+
+	void setGroupId(GroupId groupId);
+
+	void loadNamedGroup(ResultExceptionHandler<G, DbException> handler);
+
+	void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler);
+
+	void loadItems(
+			ResultExceptionHandler<ThreadItemList<I>, DbException> handler);
+
+	void markItemRead(I item);
+
+	void markItemsRead(Collection<I> items);
+
+	void createAndStoreMessage(String text, @Nullable I parentItem,
+			ResultExceptionHandler<I, DbException> handler);
+
+	void deleteNamedGroup(ExceptionHandler<DbException> handler);
+
+	interface ThreadListListener<I> extends ThreadListDataSource {
+
+		@UiThread
+		void onItemReceived(I item);
+
+		@UiThread
+		void onGroupRemoved();
+
+		@UiThread
+		void onInvitationAccepted(ContactId c);
+	}
+
+	interface ThreadListDataSource {
+
+		@UiThread @Nullable
+		MessageId getFirstVisibleMessageId();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java

@@ -0,0 +1,273 @@
+package org.briarproject.briar.android.threaded;
+
+import android.app.Activity;
+
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.DbControllerImpl;
+import org.briarproject.briar.android.controller.handler.ExceptionHandler;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.NamedGroup;
+import org.briarproject.briar.api.client.PostHeader;
+import org.briarproject.briar.api.client.ThreadedMessage;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import androidx.annotation.CallSuper;
+
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logDuration;
+import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.LogUtils.now;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends ThreadItem, H extends PostHeader, M extends ThreadedMessage, L extends ThreadListListener<I>>
+		extends DbControllerImpl
+		implements ThreadListController<G, I>, EventListener {
+
+	private static final Logger LOG =
+			Logger.getLogger(ThreadListControllerImpl.class.getName());
+
+	private final EventBus eventBus;
+	private final MessageTracker messageTracker;
+	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
+
+	private volatile GroupId groupId;
+
+	protected final IdentityManager identityManager;
+	protected final AndroidNotificationManager notificationManager;
+	protected final Executor cryptoExecutor;
+	protected final Clock clock;
+
+	// UI thread
+	protected L listener;
+
+	protected ThreadListControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor, EventBus eventBus,
+			Clock clock, AndroidNotificationManager notificationManager,
+			MessageTracker messageTracker) {
+		super(dbExecutor, lifecycleManager);
+		this.identityManager = identityManager;
+		this.cryptoExecutor = cryptoExecutor;
+		this.notificationManager = notificationManager;
+		this.clock = clock;
+		this.eventBus = eventBus;
+		this.messageTracker = messageTracker;
+	}
+
+	@Override
+	public void setGroupId(GroupId groupId) {
+		this.groupId = groupId;
+	}
+
+	@CallSuper
+	@SuppressWarnings("unchecked")
+	@Override
+	public void onActivityCreate(Activity activity) {
+		listener = (L) activity;
+	}
+
+	@CallSuper
+	@Override
+	public void onActivityStart() {
+		notificationManager.blockNotification(getGroupId());
+		eventBus.addListener(this);
+	}
+
+	@CallSuper
+	@Override
+	public void onActivityStop() {
+		notificationManager.unblockNotification(getGroupId());
+		eventBus.removeListener(this);
+	}
+
+	@Override
+	public void onActivityDestroy() {
+		MessageId messageId = listener.getFirstVisibleMessageId();
+		if (messageId != null) {
+			dbExecutor.execute(() -> {
+				try {
+					messageTracker.storeMessageId(groupId, messageId);
+				} catch (DbException e) {
+					logException(LOG, WARNING, e);
+				}
+			});
+		}
+	}
+
+	@CallSuper
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof GroupRemovedEvent) {
+			GroupRemovedEvent s = (GroupRemovedEvent) e;
+			if (s.getGroup().getId().equals(getGroupId())) {
+				LOG.info("Group removed");
+				listener.onGroupRemoved();
+			}
+		}
+	}
+
+	@Override
+	public void loadNamedGroup(
+			ResultExceptionHandler<G, DbException> handler) {
+		checkGroupId();
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				G groupItem = loadNamedGroup();
+				logDuration(LOG, "Loading group", start);
+				handler.onResult(groupItem);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract G loadNamedGroup() throws DbException;
+
+	@Override
+	public void loadItems(
+			ResultExceptionHandler<ThreadItemList<I>, DbException> handler) {
+		checkGroupId();
+		runOnDbThread(() -> {
+			try {
+				// Load headers
+				long start = now();
+				Collection<H> headers = loadHeaders();
+				logDuration(LOG, "Loading headers", start);
+
+				// Load bodies into cache
+				start = now();
+				for (H header : headers) {
+					if (!textCache.containsKey(header.getId())) {
+						textCache.put(header.getId(),
+								loadMessageText(header));
+					}
+				}
+				logDuration(LOG, "Loading bodies", start);
+
+				// Build and hand over items
+				handler.onResult(buildItems(headers));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract Collection<H> loadHeaders() throws DbException;
+
+	@DatabaseExecutor
+	protected abstract String loadMessageText(H header) throws DbException;
+
+	@Override
+	public void markItemRead(I item) {
+		markItemsRead(Collections.singletonList(item));
+	}
+
+	@Override
+	public void markItemsRead(Collection<I> items) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				for (I i : items) {
+					markRead(i.getId());
+				}
+				logDuration(LOG, "Marking read", start);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract void markRead(MessageId id) throws DbException;
+
+	protected void storePost(M msg, String text,
+			ResultExceptionHandler<I, DbException> resultHandler) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				H header = addLocalMessage(msg);
+				textCache.put(msg.getMessage().getId(), text);
+				logDuration(LOG, "Storing message", start);
+				resultHandler.onResult(buildItem(header, text));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				resultHandler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract H addLocalMessage(M message) throws DbException;
+
+	@Override
+	public void deleteNamedGroup(ExceptionHandler<DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				G groupItem = loadNamedGroup();
+				deleteNamedGroup(groupItem);
+				logDuration(LOG, "Removing group", start);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract void deleteNamedGroup(G groupItem) throws DbException;
+
+	private ThreadItemList<I> buildItems(Collection<H> headers)
+			throws DbException {
+		ThreadItemList<I> items = new ThreadItemListImpl<>();
+		for (H h : headers) {
+			items.add(buildItem(h, textCache.get(h.getId())));
+		}
+		MessageId msgId = messageTracker.loadStoredMessageId(groupId);
+		if (LOG.isLoggable(INFO))
+			LOG.info("Loaded last top visible message id " + msgId);
+		items.setFirstVisibleId(msgId);
+		return items;
+	}
+
+	protected abstract I buildItem(H header, String text);
+
+	protected GroupId getGroupId() {
+		checkGroupId();
+		return groupId;
+	}
+
+	private void checkGroupId() {
+		if (groupId == null) throw new IllegalStateException();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java

@@ -1,256 +0,0 @@
-package org.briarproject.briar.android.threaded;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.TransactionManager;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.sharing.SharingController.SharingInfo;
-import org.briarproject.briar.android.viewmodel.DbViewModel;
-import org.briarproject.briar.android.viewmodel.LiveResult;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTree;
-import org.briarproject.briar.client.MessageTreeImpl;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static java.util.Objects.requireNonNull;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public abstract class ThreadListViewModel<I extends ThreadItem>
-		extends DbViewModel implements EventListener {
-
-	private static final Logger LOG =
-			getLogger(ThreadListViewModel.class.getName());
-
-	protected final IdentityManager identityManager;
-	protected final AndroidNotificationManager notificationManager;
-	protected final SharingController sharingController;
-	protected final Executor cryptoExecutor;
-	protected final Clock clock;
-	private final MessageTracker messageTracker;
-	private final EventBus eventBus;
-
-	// UIThread
-	private final MessageTree<I> messageTree = new MessageTreeImpl<>();
-	private final MutableLiveData<LiveResult<List<I>>> items =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> groupRemoved =
-			new MutableLiveData<>();
-	private final AtomicReference<MessageId> scrollToItem =
-			new AtomicReference<>();
-
-	protected volatile GroupId groupId;
-	@Nullable
-	private MessageId replyId;
-	/**
-	 * Stored list position. Needs to be loaded and set before the list itself.
-	 */
-	private final AtomicReference<MessageId> storedMessageId =
-			new AtomicReference<>();
-
-	public ThreadListViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			EventBus eventBus) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
-		this.identityManager = identityManager;
-		this.notificationManager = notificationManager;
-		this.cryptoExecutor = cryptoExecutor;
-		this.clock = clock;
-		this.sharingController = sharingController;
-		this.messageTracker = messageTracker;
-		this.eventBus = eventBus;
-		this.eventBus.addListener(this);
-	}
-
-	@Override
-	protected void onCleared() {
-		super.onCleared();
-		eventBus.removeListener(this);
-		sharingController.onCleared();
-	}
-
-	/**
-	 * Needs to be called right after initialization,
-	 * before calling any other methods.
-	 */
-	public final void setGroupId(GroupId groupId) {
-		boolean needsInitialLoad = this.groupId == null;
-		this.groupId = groupId;
-		if (needsInitialLoad) performInitialLoad();
-	}
-
-	@CallSuper
-	protected void performInitialLoad() {
-		// load stored MessageId (last list position) before the list itself
-		loadStoredMessageId();
-		loadItems();
-		loadSharingContacts();
-	}
-
-	protected abstract void clearNotifications();
-
-	void blockAndClearNotifications() {
-		notificationManager.blockNotification(groupId);
-		clearNotifications();
-	}
-
-	void unblockNotifications() {
-		notificationManager.unblockNotification(groupId);
-	}
-
-	@Override
-	@CallSuper
-	public void eventOccurred(Event e) {
-		if (e instanceof GroupRemovedEvent) {
-			GroupRemovedEvent s = (GroupRemovedEvent) e;
-			if (s.getGroup().getId().equals(groupId)) {
-				LOG.info("Group removed");
-				groupRemoved.setValue(true);
-			}
-		}
-	}
-
-	private void loadStoredMessageId() {
-		runOnDbThread(() -> {
-			try {
-				storedMessageId
-						.set(messageTracker.loadStoredMessageId(groupId));
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Loaded last top visible message id " +
-							storedMessageId);
-				}
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public abstract void loadItems();
-
-	public abstract void createAndStoreMessage(String text,
-			@Nullable MessageId parentMessageId);
-
-	/**
-	 * Loads the ContactIds of all contacts the group is shared with
-	 * and adds them to {@link SharingController}.
-	 */
-	protected abstract void loadSharingContacts();
-
-	@UiThread
-	protected void setItems(LiveResult<List<I>> items) {
-		if (items.hasError()) {
-			this.items.setValue(items);
-		} else {
-			messageTree.clear();
-			// not null, because hasError() is false
-			messageTree.add(requireNonNull(items.getResultOrNull()));
-			LiveResult<List<I>> result =
-					new LiveResult<>(messageTree.depthFirstOrder());
-			this.items.setValue(result);
-		}
-	}
-
-	/**
-	 * Add a remote item on the UI thread.
-	 *
-	 * @param scrollToItem whether the list will scroll to the newly added item
-	 */
-	@UiThread
-	protected void addItem(I item, boolean scrollToItem) {
-		messageTree.add(item);
-		if (scrollToItem) this.scrollToItem.set(item.getId());
-		items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));
-	}
-
-	@UiThread
-	void setReplyId(@Nullable MessageId id) {
-		replyId = id;
-	}
-
-	@UiThread
-	@Nullable
-	MessageId getReplyId() {
-		return replyId;
-	}
-
-	void storeMessageId(@Nullable MessageId messageId) {
-		if (messageId != null) {
-			runOnDbThread(() -> {
-				try {
-					messageTracker.storeMessageId(groupId, messageId);
-				} catch (DbException e) {
-					logException(LOG, WARNING, e);
-				}
-			});
-		}
-	}
-
-	protected abstract void markItemRead(I item);
-
-	/**
-	 * Returns the {@link MessageId} of the item that was at the top of the
-	 * list last time or null if there has been nothing stored, yet.
-	 */
-	@Nullable
-	MessageId getAndResetRestoredMessageId() {
-		return storedMessageId.getAndSet(null);
-	}
-
-	LiveData<LiveResult<List<I>>> getItems() {
-		return items;
-	}
-
-	LiveData<SharingInfo> getSharingInfo() {
-		return sharingController.getSharingInfo();
-	}
-
-	LiveData<Boolean> getGroupRemoved() {
-		return groupRemoved;
-	}
-
-	@Nullable
-	MessageId getAndResetScrollToItem() {
-		return scrollToItem.getAndSet(null);
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadScrollListener.java

@@ -20,15 +20,15 @@ class ThreadScrollListener<I extends ThreadItem>
 	private static final Logger LOG =
 			getLogger(ThreadScrollListener.class.getName());
 
-	private final ThreadListViewModel<I> viewModel;
+	private final ThreadListController<?, I> controller;
 	private final UnreadMessageButton upButton, downButton;
 
 	ThreadScrollListener(ThreadItemAdapter<I> adapter,
-			ThreadListViewModel<I> viewModel,
+			ThreadListController<?, I> controller,
 			UnreadMessageButton upButton,
 			UnreadMessageButton downButton) {
 		super(adapter);
-		this.viewModel = viewModel;
+		this.controller = controller;
 		this.upButton = upButton;
 		this.downButton = downButton;
 	}
@@ -44,7 +44,7 @@ class ThreadScrollListener<I extends ThreadItem>
 	protected void onItemVisible(I item) {
 		if (!item.isRead()) {
 			item.setRead(true);
-			viewModel.markItemRead(item);
+			controller.markItemRead(item);
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

@@ -54,7 +54,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import static android.content.Context.KEYGUARD_SERVICE;
 import static android.content.Context.POWER_SERVICE;
@@ -89,6 +88,7 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
 import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode;
 import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getDrawable;
 import static androidx.core.content.ContextCompat.getSystemService;
 import static androidx.core.graphics.drawable.DrawableCompat.setTint;
 import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_RTL;
@@ -436,8 +436,7 @@ public class UiUtils {
 	}
 
 	public static Drawable getDialogIcon(Context ctx, @DrawableRes int resId) {
-		Drawable icon =
-				VectorDrawableCompat.create(ctx.getResources(), resId, null);
+		Drawable icon = getDrawable(ctx, resId);
 		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
 		return icon;
 	}

briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.AttributeSet;
@@ -52,8 +53,9 @@ public class BriarRecyclerView extends FrameLayout {
 				R.styleable.BriarRecyclerView);
 		isScrollingToEnd = attributes
 				.getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true);
-		int drawableRes = attributes.getResourceId(R.styleable.BriarRecyclerView_emptyImage, -1);
-		if (drawableRes != -1) setEmptyImage(drawableRes);
+		Drawable drawable = attributes
+				.getDrawable(R.styleable.BriarRecyclerView_emptyImage);
+		if (drawable != null) setEmptyImage(drawable);
 		String emtpyText =
 				attributes.getString(R.styleable.BriarRecyclerView_emptyText);
 		if (emtpyText != null) setEmptyText(emtpyText);
@@ -137,6 +139,11 @@ public class BriarRecyclerView extends FrameLayout {
 		}
 	}
 
+	public void setEmptyImage(Drawable drawable) {
+		if (recyclerView == null) initViews();
+		emptyImage.setImageDrawable(drawable);
+	}
+
 	public void setEmptyImage(@DrawableRes int res) {
 		if (recyclerView == null) initViews();
 		emptyImage.setImageResource(res);

briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java

@@ -5,7 +5,6 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.ProgressBar;
 
 import org.briarproject.briar.R;
@@ -20,7 +19,6 @@ import static java.util.Objects.requireNonNull;
 public class CompositeSendButton extends FrameLayout {
 
 	private final AppCompatImageButton sendButton, imageButton;
-	private final ImageView bombBadge;
 	private final ProgressBar progressBar;
 
 	private boolean hasImageSupport = false;
@@ -34,7 +32,6 @@ public class CompositeSendButton extends FrameLayout {
 
 		sendButton = findViewById(R.id.sendButton);
 		imageButton = findViewById(R.id.imageButton);
-		bombBadge = findViewById(R.id.bombBadge);
 		progressBar = findViewById(R.id.progressBar);
 	}
 
@@ -74,10 +71,6 @@ public class CompositeSendButton extends FrameLayout {
 		return hasImageSupport;
 	}
 
-	public void setBombVisible(boolean visible) {
-		bombBadge.setVisibility(visible ? VISIBLE : INVISIBLE);
-	}
-
 	public void showImageButton(boolean showImageButton, boolean sendEnabled) {
 		if (showImageButton) {
 			imageButton.setVisibility(VISIBLE);

briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -26,9 +25,9 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.customview.view.AbsSavedState;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.os.Build.VERSION.SDK_INT;
@@ -38,7 +37,6 @@ import static androidx.core.content.ContextCompat.getColor;
 import static androidx.customview.view.AbsSavedState.EMPTY_STATE;
 import static androidx.lifecycle.Lifecycle.State.DESTROYED;
 import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACHMENTS_PER_MESSAGE;
 
 @UiThread
@@ -52,6 +50,7 @@ public class TextAttachmentController extends TextSendController
 	private final AttachmentManager attachmentManager;
 
 	private final List<Uri> imageUris = new ArrayList<>();
+	private final CharSequence textHint;
 	private boolean loadingUris = false;
 
 	public TextAttachmentController(TextInputView v, ImagePreview imagePreview,
@@ -65,44 +64,23 @@ public class TextAttachmentController extends TextSendController
 
 		sendButton = (CompositeSendButton) compositeSendButton;
 		sendButton.setOnImageClickListener(view -> onImageButtonClicked());
+
+		textHint = textInput.getHint();
 	}
 
 	@Override
 	protected void updateViewState() {
-		super.updateViewState();
+		textInput.setEnabled(ready && !loadingUris);
+		boolean sendEnabled = ready && !loadingUris &&
+				(!textIsEmpty || canSendEmptyText());
 		if (loadingUris) {
 			sendButton.showProgress(true);
 		} else if (imageUris.isEmpty()) {
 			sendButton.showProgress(false);
-			sendButton.showImageButton(textIsEmpty, isSendButtonEnabled());
+			sendButton.showImageButton(textIsEmpty, sendEnabled);
 		} else {
 			sendButton.showProgress(false);
-			sendButton.showImageButton(false, isSendButtonEnabled());
-		}
-	}
-
-	@Override
-	protected boolean isTextInputEnabled() {
-		return super.isTextInputEnabled() && !loadingUris;
-	}
-
-	@Override
-	protected boolean isSendButtonEnabled() {
-		return super.isSendButtonEnabled() && !loadingUris;
-	}
-
-	@Override
-	protected boolean isBombVisible() {
-		return super.isBombVisible() && (!textIsEmpty || !imageUris.isEmpty());
-	}
-
-	@Override
-	protected CharSequence getCurrentTextHint() {
-		if (imageUris.isEmpty()) {
-			return super.getCurrentTextHint();
-		} else {
-			Context ctx = textInput.getContext();
-			return ctx.getString(R.string.image_caption_hint);
+			sendButton.showImageButton(false, sendEnabled);
 		}
 	}
 
@@ -111,17 +89,11 @@ public class TextAttachmentController extends TextSendController
 		if (canSend()) {
 			if (loadingUris) throw new AssertionError();
 			listener.onSendClick(textInput.getText(),
-					attachmentManager.getAttachmentHeadersForSending(),
-					expectedTimer).observe(listener, this::onSendStateChanged);
+					attachmentManager.getAttachmentHeadersForSending());
+			reset();
 		}
 	}
 
-	@Override
-	protected void onSendStateChanged(SendState sendState) {
-		super.onSendStateChanged(sendState);
-		if (sendState == SENT) reset();
-	}
-
 	@Override
 	protected boolean canSendEmptyText() {
 		return !imageUris.isEmpty();
@@ -180,7 +152,6 @@ public class TextAttachmentController extends TextSendController
 	private void onNewUris(boolean restart, List<Uri> newUris) {
 		if (newUris.isEmpty()) return;
 		if (loadingUris) throw new AssertionError();
-		if (textIsEmpty) onStartingMessage();
 		loadingUris = true;
 		if (newUris.size() > MAX_ATTACHMENTS_PER_MESSAGE) {
 			newUris = newUris.subList(0, MAX_ATTACHMENTS_PER_MESSAGE);
@@ -188,6 +159,7 @@ public class TextAttachmentController extends TextSendController
 		}
 		imageUris.addAll(newUris);
 		updateViewState();
+		textInput.setHint(R.string.image_caption_hint);
 		List<ImagePreviewItem> items = ImagePreviewItem.fromUris(imageUris);
 		imagePreview.showPreview(items);
 		// store attachments and show preview when successful
@@ -233,6 +205,8 @@ public class TextAttachmentController extends TextSendController
 	}
 
 	private void reset() {
+		// restore hint
+		textInput.setHint(textHint);
 		// hide image layout
 		imagePreview.setVisibility(GONE);
 		// reset image URIs
@@ -279,14 +253,12 @@ public class TextAttachmentController extends TextSendController
 
 	public void showImageOnboarding(Activity activity) {
 		int color = resolveColorAttribute(activity, R.attr.colorControlNormal);
-		Drawable drawable = VectorDrawableCompat
-				.create(activity.getResources(), R.drawable.ic_image, null);
 		new MaterialTapTargetPrompt.Builder(activity,
 				R.style.OnboardingDialogTheme).setTarget(sendButton)
 				.setPrimaryText(R.string.dialog_title_image_support)
 				.setSecondaryText(R.string.dialog_message_image_support)
 				.setBackgroundColour(getColor(activity, R.color.briar_primary))
-				.setIconDrawable(drawable)
+				.setIcon(R.drawable.ic_image)
 				.setIconDrawableColourFilter(color)
 				.show();
 	}
@@ -327,7 +299,7 @@ public class TextAttachmentController extends TextSendController
 	}
 
 	@UiThread
-	public interface AttachmentListener extends SendListener {
+	public interface AttachmentListener extends SendListener, LifecycleOwner {
 
 		void onAttachImage(Intent intent);
 

briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java

@@ -1,9 +1,7 @@
 package org.briarproject.briar.android.view;
 
-import android.content.Context;
 import android.os.Parcelable;
 import android.view.View;
-import android.widget.Toast;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -14,20 +12,11 @@ import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.List;
 
-import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
-import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LiveData;
 
-import static android.widget.Toast.LENGTH_LONG;
 import static com.google.android.material.snackbar.Snackbar.LENGTH_SHORT;
 import static java.util.Collections.emptyList;
-import static org.briarproject.briar.android.view.TextSendController.SendState.ERROR;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
-import static org.briarproject.briar.android.view.TextSendController.SendState.UNEXPECTED_TIMER;
-import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
 
 @UiThread
 @NotNullByDefault
@@ -37,12 +26,8 @@ public class TextSendController implements TextInputListener {
 	protected final View compositeSendButton;
 	protected final SendListener listener;
 
-	protected boolean textIsEmpty = true;
-	private boolean ready = true;
-	private long currentTimer = NO_AUTO_DELETE_TIMER;
-	protected long expectedTimer = NO_AUTO_DELETE_TIMER;
+	protected boolean ready = true, textIsEmpty = true;
 
-	private final CharSequence defaultHint;
 	private final boolean allowEmptyText;
 
 	public TextSendController(TextInputView v, SendListener listener,
@@ -51,91 +36,31 @@ public class TextSendController implements TextInputListener {
 		this.compositeSendButton.setOnClickListener(view -> onSendEvent());
 		this.listener = listener;
 		this.textInput = v.getEmojiTextInputView();
-		this.defaultHint = textInput.getHint();
 		this.allowEmptyText = allowEmptyText;
 	}
 
 	@Override
 	public void onTextIsEmptyChanged(boolean isEmpty) {
 		textIsEmpty = isEmpty;
-		if (!isEmpty) onStartingMessage();
 		updateViewState();
 	}
 
 	@Override
 	public void onSendEvent() {
 		if (canSend()) {
-			listener.onSendClick(textInput.getText(), emptyList(),
-					expectedTimer).observe(listener, this::onSendStateChanged);
+			listener.onSendClick(textInput.getText(), emptyList());
 		}
 	}
 
-	@CallSuper
-	protected void onSendStateChanged(SendState sendState) {
-		if (sendState == SENT) {
-			textInput.clearText();
-		} else if (sendState == UNEXPECTED_TIMER) {
-			boolean enabled = expectedTimer == NO_AUTO_DELETE_TIMER;
-			showTimerChangedDialog(enabled);
-		} else if (sendState == ERROR) {
-			Toast.makeText(textInput.getContext(), R.string.message_error,
-					LENGTH_LONG).show();
-		}
-	}
-
-	/**
-	 * Call whenever the user starts a new message,
-	 * either by entering text or adding an attachment.
-	 * This updates the expected auto-delete timer to the current value.
-	 */
-	protected void onStartingMessage() {
-		expectedTimer = currentTimer;
-	}
-
 	public void setReady(boolean ready) {
 		this.ready = ready;
 		updateViewState();
 	}
 
-	/**
-	 * Sets the current auto delete timer and updates the UI accordingly.
-	 */
-	public void setAutoDeleteTimer(long timer) {
-		currentTimer = timer;
-		updateViewState();
-	}
-
-	@CallSuper
 	protected void updateViewState() {
-		textInput.setEnabled(isTextInputEnabled());
-		textInput.setHint(getCurrentTextHint());
-		compositeSendButton.setEnabled(isSendButtonEnabled());
-		if (compositeSendButton instanceof CompositeSendButton) {
-			CompositeSendButton sendButton =
-					(CompositeSendButton) compositeSendButton;
-			sendButton.setBombVisible(isBombVisible());
-		}
-	}
-
-	protected boolean isTextInputEnabled() {
-		return ready;
-	}
-
-	protected boolean isSendButtonEnabled() {
-		return ready && (!textIsEmpty || canSendEmptyText());
-	}
-
-	protected boolean isBombVisible() {
-		return currentTimer != NO_AUTO_DELETE_TIMER;
-	}
-
-	protected CharSequence getCurrentTextHint() {
-		if (currentTimer == NO_AUTO_DELETE_TIMER) {
-			return defaultHint;
-		} else {
-			Context ctx = textInput.getContext();
-			return ctx.getString(R.string.message_hint_auto_delete);
-		}
+		textInput.setEnabled(ready);
+		compositeSendButton
+				.setEnabled(ready && (!textIsEmpty || canSendEmptyText()));
 	}
 
 	protected final boolean canSend() {
@@ -151,23 +76,6 @@ public class TextSendController implements TextInputListener {
 		return allowEmptyText;
 	}
 
-	private void showTimerChangedDialog(boolean enabled) {
-		Context ctx = textInput.getContext();
-		int message =
-				enabled ? R.string.auto_delete_changed_warning_message_enabled :
-						R.string.auto_delete_changed_warning_message_disabled;
-		new AlertDialog.Builder(ctx, R.style.BriarDialogTheme)
-				.setTitle(R.string.auto_delete_changed_warning_title)
-				.setMessage(message)
-				.setPositiveButton(R.string.auto_delete_changed_warning_send,
-						(dialog, which) -> {
-							expectedTimer = currentTimer;
-							onSendEvent();
-						})
-				.setNegativeButton(R.string.cancel, null)
-				.show();
-	}
-
 	@Nullable
 	public Parcelable onSaveInstanceState(@Nullable Parcelable superState) {
 		return superState;
@@ -178,11 +86,9 @@ public class TextSendController implements TextInputListener {
 		return state;
 	}
 
-	public enum SendState {SENT, ERROR, UNEXPECTED_TIMER}
-
-	public interface SendListener extends LifecycleOwner {
-		LiveData<SendState> onSendClick(@Nullable String text,
-				List<AttachmentHeader> headers, long expectedAutoDeleteTimer);
+	@UiThread
+	public interface SendListener {
+		void onSendClick(@Nullable String text, List<AttachmentHeader> headers);
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java

@@ -8,6 +8,7 @@ import org.briarproject.briar.R;
 
 import androidx.annotation.UiThread;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
 
 @UiThread
 public class TrustIndicatorView extends AppCompatImageView {
@@ -43,7 +44,7 @@ public class TrustIndicatorView extends AppCompatImageView {
 			default:
 				res = R.drawable.trust_indicator_unknown;
 		}
-		setImageResource(res);
+		setImageDrawable(ContextCompat.getDrawable(getContext(), res));
 		setVisibility(VISIBLE);
 
 		invalidate();

briar-android/src/main/java/org/briarproject/briar/android/viewmodel/DbViewModel.java

@@ -5,7 +5,6 @@ import android.app.Application;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbCallable;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.DbRunnable;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
@@ -24,7 +23,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.arch.core.util.Function;
-import androidx.core.util.Consumer;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.recyclerview.widget.RecyclerView;
@@ -59,8 +57,8 @@ public abstract class DbViewModel extends AndroidViewModel {
 	}
 
 	/**
-	 * Waits for the DB to open and runs the given task on the
-	 * {@link DatabaseExecutor}.
+	 * Runs the given task on the {@link DatabaseExecutor}
+	 * and waits for the DB to open.
 	 * <p>
 	 * If you need a list of items to be displayed in a
 	 * {@link RecyclerView.Adapter},
@@ -78,29 +76,6 @@ public abstract class DbViewModel extends AndroidViewModel {
 		});
 	}
 
-	/**
-	 * Waits for the DB to open and runs the given task on the
-	 * {@link DatabaseExecutor}.
-	 * <p>
-	 * If you need a list of items to be displayed in a
-	 * {@link RecyclerView.Adapter},
-	 * use {@link #loadList(DbCallable, UiConsumer)} instead.
-	 */
-	protected void runOnDbThread(boolean readOnly,
-			DbRunnable<Exception> task, Consumer<Exception> err) {
-		dbExecutor.execute(() -> {
-			try {
-				lifecycleManager.waitForDatabase();
-				db.transaction(readOnly, task);
-			} catch (InterruptedException e) {
-				LOG.warning("Interrupted while waiting for database");
-				Thread.currentThread().interrupt();
-			} catch (Exception e) {
-				err.accept(e);
-			}
-		});
-	}
-
 	/**
 	 * Loads a list of items on the {@link DatabaseExecutor} within a single
 	 * {@link Transaction} and publishes it as a {@link LiveResult}

briar-android/src/main/java/org/briarproject/briar/android/viewmodel/LiveEvent.java

@@ -39,17 +39,6 @@ public class LiveEvent<T> extends LiveData<LiveEvent.ConsumableEvent<T>> {
 		super.observeForever(observer);
 	}
 
-	/**
-	 * Returns the last value of the event (even if already consumed)
-	 * or null if there hasn't been any value so far.
-	 */
-	@Nullable
-	public T getLastValue() {
-		ConsumableEvent<T> event = getValue();
-		if (event == null) return null;
-		return event.content;
-	}
-
 	static class ConsumableEvent<T> {
 
 		private final T content;

briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-  </group>
-</vector>

briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0,0 1,16 4V6H14V4H5V20H14V18H16V20A2,2 0,0 1,14 22H5A2,2 0,0 1,3 20V4A2,2 0,0 1,5 2H14Z"/>
-  </group>
-</vector>