Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 16:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Renamed method that now runs on IoExecutor.

Browse Source
This commit is contained in:
akwizgran
2018-04-24 17:43:28 +01:00
parent b9cf1da861
commit 615f527270
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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