Create up to 10k max length forum posts for load testing.

Allow forums to be removed without opening them

See merge request briar/briar!1841

bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java

@@ -89,11 +89,17 @@ class H2Database extends JdbcDatabase {
 		try {
 			c = createConnection();
 			closeAllConnections();
-			setDirty(c, false);
+			LOG.info("Compacting DB");
 			s = c.createStatement();
 			s.execute("SHUTDOWN COMPACT");
+			LOG.info("Finished compacting DB");
 			s.close();
 			c.close();
+			// Reopen the DB to mark it as clean after compacting
+			c = createConnection();
+			setDirty(c, false);
+			LOG.info("Marked DB as clean");
+			c.close();
 		} catch (SQLException e) {
 			tryToClose(s, LOG, WARNING);
 			tryToClose(c, LOG, WARNING);
@@ -126,6 +132,7 @@ class H2Database extends JdbcDatabase {
 			closeAllConnections();
 			s = c.createStatement();
 			s.execute("SHUTDOWN COMPACT");
+			LOG.info("Finished compacting DB");
 			s.close();
 			c.close();
 		} catch (SQLException e) {

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

@@ -217,19 +217,14 @@ public class BriarService extends Service {
 
 	@Override
 	public void onDestroy() {
-		// Hold a wake lock during shutdown
+		super.onDestroy();
-		wakeLockManager.runWakefully(() -> {
+		LOG.info("Destroyed");
-			super.onDestroy();
+		// Stop the lifecycle, if not already stopped
-			LOG.info("Destroyed");
+		shutdown(false);
-			stopForeground(true);
+		stopForeground(true);
-			if (receiver != null) {
+		if (receiver != null) {
-				getApplicationContext().unregisterReceiver(receiver);
+			getApplicationContext().unregisterReceiver(receiver);
-			}
+		}
-			// Stop the services in a background thread
-			wakeLockManager.executeWakefully(() -> {
-				if (started) lifecycleManager.stopServices();
-			}, "LifecycleShutdown");
-		}, "LifecycleShutdown");
 	}
 
 	@Override
@@ -299,8 +294,8 @@ public class BriarService extends Service {
 	private void shutdownFromBackground() {
 		// Hold a wake lock during shutdown
 		wakeLockManager.runWakefully(() -> {
-			// Stop the service
+			// Begin lifecycle shutdown
-			stopSelf();
+			shutdown(true);
 			// Hide the UI
 			hideUi();
 			// Wait for shutdown to complete, then exit
@@ -335,8 +330,18 @@ public class BriarService extends Service {
 	/**
 	 * Starts the shutdown process.
 	 */
-	public void shutdown() {
+	public void shutdown(boolean stopAndroidService) {
-		stopSelf(); // This will call onDestroy()
+		// Hold a wake lock during shutdown
+		wakeLockManager.runWakefully(() -> {
+			// Stop the lifecycle services in a background thread,
+			// then stop this Android service if needed
+			wakeLockManager.executeWakefully(() -> {
+				if (started) lifecycleManager.stopServices();
+				if (stopAndroidService) {
+					androidExecutor.runOnUiThread(() -> stopSelf());
+				}
+			}, "LifecycleShutdown");
+		}, "LifecycleShutdown");
 	}
 
 	public class BriarBinder extends Binder {

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

@@ -147,7 +147,7 @@ public class BriarControllerImpl implements BriarController {
 				service.waitForStartup();
 				// Shut down the service and wait for it to shut down
 				LOG.info("Shutting down service");
-				service.shutdown();
+				service.shutdown(true);
 				service.waitForShutdown();
 			} catch (InterruptedException e) {
 				LOG.warning("Interrupted while waiting for service");

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

@@ -13,15 +13,18 @@ import androidx.recyclerview.widget.ListAdapter;
 @NotNullByDefault
 class ForumListAdapter extends ListAdapter<ForumListItem, ForumViewHolder> {
 
-	ForumListAdapter() {
+	private final ForumListViewModel viewModel;
+
+	ForumListAdapter(ForumListViewModel viewModel) {
 		super(new ForumListCallback());
+		this.viewModel = viewModel;
 	}
 
 	@Override
 	public ForumViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 		View v = LayoutInflater.from(parent.getContext()).inflate(
 				R.layout.list_item_forum, parent, false);
-		return new ForumViewHolder(v);
+		return new ForumViewHolder(v, viewModel);
 	}
 
 	@Override

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

@@ -40,7 +40,7 @@ public class ForumListFragment extends BaseFragment implements
 	private ForumListViewModel viewModel;
 	private BriarRecyclerView list;
 	private Snackbar snackbar;
-	private final ForumListAdapter adapter = new ForumListAdapter();
+	private ForumListAdapter adapter;
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -54,6 +54,7 @@ public class ForumListFragment extends BaseFragment implements
 		component.inject(this);
 		viewModel = new ViewModelProvider(this, viewModelFactory)
 				.get(ForumListViewModel.class);
+		adapter = new ForumListAdapter(viewModel);
 	}
 
 	@Nullable

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

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.forum;
 
 import android.app.Application;
+import android.widget.Toast;
 
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -15,6 +16,7 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.event.GroupAddedEvent;
 import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
 import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.R;
 import org.briarproject.briar.android.viewmodel.DbViewModel;
 import org.briarproject.briar.android.viewmodel.LiveResult;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -40,6 +42,7 @@ import androidx.annotation.UiThread;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
+import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
@@ -180,4 +183,17 @@ class ForumListViewModel extends DbViewModel implements EventListener {
 		return numInvitations;
 	}
 
+	void deleteForum(GroupId groupId) {
+		runOnDbThread(() -> {
+			try {
+				Forum f = forumManager.getForum(groupId);
+				forumManager.removeForum(f);
+				androidExecutor.runOnUiThread(() -> Toast
+						.makeText(getApplication(), R.string.forum_left_toast,
+								LENGTH_SHORT).show());
+			} catch (DbException e) {
+				handleException(e);
+			}
+		});
+	}
 }

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.PopupMenu;
 import android.widget.TextView;
 
 import org.briarproject.briar.R;
@@ -20,6 +21,7 @@ import static org.briarproject.briar.android.activity.BriarActivity.GROUP_NAME;
 
 class ForumViewHolder extends RecyclerView.ViewHolder {
 
+	private final ForumListViewModel viewModel;
 	private final Context ctx;
 	private final ViewGroup layout;
 	private final TextAvatarView avatar;
@@ -27,8 +29,9 @@ class ForumViewHolder extends RecyclerView.ViewHolder {
 	private final TextView postCount;
 	private final TextView date;
 
-	ForumViewHolder(View v) {
+	ForumViewHolder(View v, ForumListViewModel viewModel) {
 		super(v);
+		this.viewModel = viewModel;
 		ctx = v.getContext();
 		layout = (ViewGroup) v;
 		avatar = v.findViewById(R.id.avatarView);
@@ -64,6 +67,21 @@ class ForumViewHolder extends RecyclerView.ViewHolder {
 			date.setVisibility(VISIBLE);
 		}
 
+		// Open popup menu on long click
+		layout.setOnLongClickListener(v -> {
+			PopupMenu pm = new PopupMenu(ctx, v);
+			pm.getMenuInflater().inflate(R.menu.forum_list_item_actions,
+					pm.getMenu());
+			pm.setOnMenuItemClickListener(it -> {
+				if (it.getItemId() == R.id.action_forum_delete) {
+					viewModel.deleteForum(item.getForum().getId());
+				}
+				return true;
+			});
+			pm.show();
+			return true;
+		});
+
 		// Open Forum on Click
 		layout.setOnClickListener(v -> {
 			Intent i = new Intent(ctx, ForumActivity.class);

briar-android/src/main/res/layout/activity_test_data.xml

@@ -174,7 +174,7 @@
 			android:id="@+id/seekBarForumMessages"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:max="50"
+			android:max="10000"
 			android:paddingTop="5dp"
 			android:progress="20"
 			app:layout_constraintEnd_toStartOf="@+id/TextViewForumMessagesSb"

briar-android/src/main/res/layout/list_item_forum.xml

@@ -11,7 +11,6 @@
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"
 		android:layout_marginStart="@dimen/listitem_horizontal_margin"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toTopOf="@+id/divider"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
@@ -38,7 +37,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/margin_medium"
 		android:layout_marginEnd="8dp"
-		android:layout_marginRight="8dp"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintEnd_toStartOf="@+id/dateView"
@@ -51,7 +49,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:textColor="?android:attr/textColorSecondary"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBaseline_toBaselineOf="@+id/postCountView"
@@ -63,7 +60,6 @@
 		style="@style/Divider.ThreadItem"
 		android:layout_width="0dp"
 		android:layout_marginStart="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/listitem_horizontal_margin"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"

briar-android/src/main/res/menu/forum_list_item_actions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/action_forum_delete"
+		android:title="@string/forum_leave" />
+
+</menu>

briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java

@@ -470,20 +470,19 @@ public class TestDataCreatorImpl implements TestDataCreator {
 
 	private void createRandomForumPosts(Forum forum, List<Contact> contacts,
 			int numForumPosts) throws DbException {
-		List<ForumPost> posts = new ArrayList<>();
+		List<MessageId> postIds = new ArrayList<>();
 		for (int i = 0; i < numForumPosts; i++) {
 			Contact contact = contacts.get(random.nextInt(contacts.size()));
 			LocalAuthor author = localAuthors.get(contact);
 			long timestamp = clock.currentTimeMillis() - (long) i * 60 * 1000;
 			String text = getRandomText();
 			MessageId parent = null;
-			if (random.nextBoolean() && posts.size() > 0) {
+			if (random.nextBoolean() && !postIds.isEmpty()) {
-				ForumPost parentPost = posts.get(random.nextInt(posts.size()));
+				parent = postIds.get(random.nextInt(postIds.size()));
-				parent = parentPost.getMessage().getId();
 			}
 			ForumPost post = forumManager.createLocalPost(forum.getId(), text,
 					timestamp, parent, author);
-			posts.add(post);
+			postIds.add(post.getMessage().getId());
 			db.transaction(false, txn ->
 					db.receiveMessage(txn, contact.getId(), post.getMessage()));
 		}
@@ -573,7 +572,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	}
 
 	private String getRandomText() {
-		int minLength = 3 + random.nextInt(500);
+		int minLength = 30_000;
 		int maxWordLength = 15;
 		StringBuilder sb = new StringBuilder();
 		while (sb.length() < minLength) {

dagger.gradle

@@ -6,9 +6,9 @@ sourceSets.configureEach { sourceSet ->
 
 idea {
 	module {
-		sourceDirs += compileJava.options.generatedSourceOutputDirectory
+		sourceDirs += compileJava.options.generatedSourceOutputDirectory.get().getAsFile()
-		generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory
+		generatedSourceDirs += compileJava.options.generatedSourceOutputDirectory.get().getAsFile()
-		testSourceDirs += compileTestJava.options.generatedSourceOutputDirectory
+		testSourceDirs += compileTestJava.options.generatedSourceOutputDirectory.get().getAsFile()
-		generatedSourceDirs += compileTestJava.options.generatedSourceOutputDirectory
+		generatedSourceDirs += compileTestJava.options.generatedSourceOutputDirectory.get().getAsFile()
 	}
 }