Renamed method that now runs on IoExecutor.

briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java

@@ -16,6 +16,8 @@ import org.briarproject.briar.api.test.TestDataCreator;
 
 import javax.inject.Inject;
 
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+
 public class TestDataActivity extends BriarActivity {
 
 	@Inject
@@ -52,9 +54,8 @@ public class TestDataActivity extends BriarActivity {
 					new OnSeekBarChangeListener() {
 						@Override
 						public void onProgressChanged(SeekBar seekBar,
-								int progress,
+								int progress, boolean fromUser) {
-								boolean fromUser) {
+							textView.setText(String.valueOf(progress));
-							textView.setText("" + progress);
 						}
 
 						@Override
@@ -64,14 +65,11 @@ public class TestDataActivity extends BriarActivity {
 						@Override
 						public void onStopTrackingTouch(SeekBar seekBar) {
 						}
-
 					});
 		}
 
 		findViewById(R.id.buttonCreateTestData).setOnClickListener(
-				v -> {
+				v -> createTestData());
-					createTestData();
-				});
 	}
 
 	private void createTestData() {
@@ -79,7 +77,7 @@ public class TestDataActivity extends BriarActivity {
 				seekBars[1].getProgress(), seekBars[2].getProgress(),
 				seekBars[3].getProgress(), seekBars[4].getProgress());
 		Intent intent = new Intent(this, NavDrawerActivity.class);
-		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+		intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP);
 		startActivity(intent);
 		finish();
 	}

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

@@ -117,7 +117,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 			int numBlogPosts, int numForums, int numForumPosts) {
 		ioExecutor.execute(() -> {
 			try {
-				createTestDataOnDbExecutor(numContacts, numPrivateMsgs,
+				createTestDataOnIoExecutor(numContacts, numPrivateMsgs,
 						numBlogPosts, numForums, numForumPosts);
 			} catch (DbException e) {
 				if (LOG.isLoggable(WARNING))
@@ -127,7 +127,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	}
 
 	@IoExecutor
-	private void createTestDataOnDbExecutor(int numContacts, int numPrivateMsgs,
+	private void createTestDataOnIoExecutor(int numContacts, int numPrivateMsgs,
 			int numBlogPosts, int numForums, int numForumPosts)
 			throws DbException {
 		List<Contact> contacts = createContacts(numContacts);
@@ -261,17 +261,14 @@ public class TestDataCreatorImpl implements TestDataCreator {
 		StringBuilder sb = new StringBuilder();
 		// address
 		for (int i = 0; i < 16; i++) {
-			if (random.nextBoolean())
+			if (random.nextBoolean()) sb.append(2 + random.nextInt(5));
-				sb.append(2 + random.nextInt(5));
+			else sb.append((char) (random.nextInt(26) + 'a'));
-			else
-				sb.append((char) (random.nextInt(26) + 'a'));
 		}
 		return sb.toString();
 	}
 
 	private void createPrivateMessages(List<Contact> contacts,
-			int numPrivateMsgs)
+			int numPrivateMsgs) throws DbException {
-			throws DbException {
 		for (Contact contact : contacts) {
 			Group group = messagingManager.getContactGroup(contact);
 			for (int i = 0; i < numPrivateMsgs; i++) {
@@ -329,9 +326,8 @@ public class TestDataCreatorImpl implements TestDataCreator {
 		long timestamp = clock.currentTimeMillis() - num * 60 * 1000;
 		String body = getRandomText();
 		try {
-			BlogPost blogPost = blogPostFactory
+			BlogPost blogPost = blogPostFactory.createBlogPost(blog.getId(),
-					.createBlogPost(blog.getId(), timestamp, null, author,
+					timestamp, null, author, body);
-							body);
 			blogManager.addLocalPost(blogPost);
 		} catch (FormatException | GeneralSecurityException e) {
 			throw new RuntimeException(e);
@@ -339,8 +335,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	}
 
 	private List<Forum> createForums(List<Contact> contacts, int numForums,
-			int numForumPosts)
+			int numForumPosts) throws DbException {
-			throws DbException {
 		List<Forum> forums = new ArrayList<>(numForums);
 		for (int i = 0; i < numForums; i++) {
 			// create forum
@@ -368,8 +363,7 @@ public class TestDataCreatorImpl implements TestDataCreator {
 	}
 
 	private void createRandomForumPosts(Forum forum, List<Contact> contacts,
-			int numForumPosts)
+			int numForumPosts) throws DbException {
-			throws DbException {
 		List<ForumPost> posts = new ArrayList<>();
 		for (int i = 0; i < numForumPosts; i++) {
 			Contact contact = contacts.get(random.nextInt(contacts.size()));
@@ -382,15 +376,13 @@ public class TestDataCreatorImpl implements TestDataCreator {
 						posts.get(random.nextInt(posts.size()));
 				parent = parentPost.getMessage().getId();
 			}
-			ForumPost post = forumManager
+			ForumPost post = forumManager.createLocalPost(forum.getId(), body,
-					.createLocalPost(forum.getId(), body, timestamp, parent,
+					timestamp, parent, author);
-							author);
 			posts.add(post);
 			forumManager.addLocalPost(post);
 			if (random.nextBoolean()) {
-				forumManager
+				forumManager.setReadFlag(forum.getId(),
-						.setReadFlag(forum.getId(), post.getMessage().getId(),
+						post.getMessage().getId(), false);
-								false);
 			}
 		}
 	}