diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 2f6f1d7d11cf359db1f7725c2b383594b9b7c46c..a5a51a51885af7243abe72f002bed5a1bbddba5f 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -1,94 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">Briar</string>
- <string name="notification_title">Briar is running</string>
- <string name="notification_text">Touch to show the home screen.</string>
- <string name="setup_title">Briar Setup</string>
- <string name="choose_nickname">Choose your nickname:</string>
- <string name="choose_password">Choose your password:</string>
- <string name="confirm_password">Confirm your password:</string>
- <string name="password_too_weak">Password is too weak</string>
- <string name="password_weak">Password is weak</string>
- <string name="password_quite_weak">Password is quite weak</string>
- <string name="password_quite_strong">Password is quite strong</string>
- <string name="password_strong">Password is strong</string>
- <string name="passwords_do_not_match">Passwords do not match</string>
- <string name="enter_password">Enter your password:</string>
- <string name="try_again">Wrong password, try again:</string>
- <string name="startup_failed_notification_title">Briar could not start up</string>
- <string name="startup_failed_notification_text">You may need to reinstall Briar.</string>
- <string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
- <string name="contact_list_button">Contacts</string>
- <string name="forums_button">Forums</string>
- <string name="synchronize_button">Synchronize</string>
- <string name="quit_button">Quit</string>
- <string name="new_identity_item">New identity\u2026</string>
- <string name="contact_list_title">Contacts</string>
- <string name="contact_connected">Connected</string>
- <string name="format_last_connected">Last connected <br /> %1$s</string>
- <string name="add_contact_title">Add a Contact</string>
- <string name="your_nickname">Your nickname: </string>
- <string name="wifi_not_available">Wi-Fi is NOT AVAILABLE</string>
- <string name="wifi_disabled">Wi-Fi is OFF</string>
- <string name="wifi_disconnected">Wi-Fi is DISCONNECTED</string>
- <string name="format_wifi_connected">Wi-Fi is connected to %1$s</string>
- <string name="bluetooth_not_available">Bluetooth is NOT AVAILABLE</string>
- <string name="bluetooth_disabled">Bluetooth is OFF</string>
- <string name="bluetooth_not_discoverable">Bluetooth is NOT DISCOVERABLE</string>
- <string name="bluetooth_discoverable">Bluetooth is discoverable</string>
- <string name="fact_to_face">For security reasons you must be face-to-face with someone to add them as a contact</string>
- <string name="continue_button">Continue</string>
- <string name="your_invitation_code">Your invitation code is</string>
- <string name="enter_invitation_code">Please enter your contact\'s invitation code:</string>
- <string name="format_connecting_wifi">Searching via %1$s\u2026</string>
- <string name="connecting_bluetooth">Searching via Bluetooth\u2026</string>
- <string name="connection_failed">Connection failed</string>
- <string name="check_same_network">Please check that you are both using the same network</string>
- <string name="try_again_button">Try again</string>
- <string name="connected_to_contact">Connected to contact</string>
- <string name="calculating_confirmation_code">Calculating confirmation code\u2026</string>
- <string name="your_confirmation_code">Your confirmation code is</string>
- <string name="enter_confirmation_code">Please enter your contact\'s confirmation code:</string>
- <string name="waiting_for_contact">Waiting for contact\u2026</string>
- <string name="exchanging_contact_details">Exchanging contact details\u2026</string>
- <string name="codes_do_not_match">Codes do not match</string>
- <string name="interfering">This could mean that someone is trying to interfere with your connection</string>
- <string name="contact_added_toast">Contact added</string>
- <string name="done_button">Done</string>
- <string name="messages_title">Messages</string>
- <string name="no_messages">(No messages)</string>
- <string name="format_from">From: %1$s</string>
- <string name="format_to">To: %1$s</string>
- <string name="new_message_title">New Message</string>
- <string name="from">From:</string>
- <string name="to">To:</string>
- <string name="anonymous">Anonymous</string>
- <string name="new_contact_item">New contact\u2026</string>
- <string name="forums_title">Forums</string>
- <plurals name="forums_available">
- <item quantity="one">%1$d forum available from contacts</item>
- <item quantity="other">%1$d forums available from contacts</item>
- </plurals>
- <string name="no_posts">No posts</string>
- <string name="subscribe_to_this_forum">Subscribe to this forum</string>
- <string name="create_forum_title">New Forum</string>
- <string name="choose_forum_name">Choose a name for your forum:</string>
- <string name="forum_visible_to_all">Share this forum with all contacts</string>
- <string name="forum_visible_to_some">Share this forum with chosen contacts</string>
- <string name="new_post_title">New Post</string>
- <string name="new_forum_item">New forum\u2026</string>
- <string name="manage_subscriptions_title">Available Forums</string>
- <string name="no_forums_available">No forums available from contacts</string>
- <string name="subscribed_all">Subscribed, shared with all contacts</string>
- <string name="subscribed_some">Subscribed, shared with chosen contacts</string>
- <string name="not_subscribed">Not subscribed</string>
- <string name="create_nickname_item">New nickname\u2026</string>
- <string name="new_identity_title">New Nickname</string>
- <string name="create_button">Create</string>
- <string name="no_contacts">You don\'t have any contacts. Add a contact now?</string>
- <string name="add_button">Add</string>
- <string name="cancel_button">Cancel</string>
- <string name="message_sent_toast">Message sent</string>
- <string name="post_sent_toast">Post sent</string>
- <string name="not_implemented_toast">Not implemented yet!</string>
-</resources>
+ <string name="app_name">Briar</string>
+ <string name="notification_title">Briar is running</string>
+ <string name="notification_text">Touch to show the home screen.</string>
+ <string name="setup_title">Briar Setup</string>
+ <string name="choose_nickname">Choose your nickname:</string>
+ <string name="choose_password">Choose your password:</string>
+ <string name="confirm_password">Confirm your password:</string>
+ <string name="password_too_weak">Password is too weak</string>
+ <string name="password_weak">Password is weak</string>
+ <string name="password_quite_weak">Password is quite weak</string>
+ <string name="password_quite_strong">Password is quite strong</string>
+ <string name="password_strong">Password is strong</string>
+ <string name="passwords_do_not_match">Passwords do not match</string>
+ <string name="enter_password">Enter your password:</string>
+ <string name="try_again">Wrong password, try again:</string>
+ <string name="startup_failed_notification_title">Briar could not start up</string>
+ <string name="startup_failed_notification_text">You may need to reinstall Briar.</string>
+ <string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
+ <string name="contact_list_button">Contacts</string>
+ <string name="forums_button">Forums</string>
+ <string name="synchronize_button">Synchronize</string>
+ <string name="quit_button">Quit</string>
+ <string name="new_identity_item">New identity\u2026</string>
+ <string name="contact_list_title">Contacts</string>
+ <string name="contact_connected">Connected</string>
+ <string name="format_last_connected">Last connected <br /> %1$s</string>
+ <string name="add_contact_title">Add a Contact</string>
+ <string name="your_nickname">Your nickname: </string>
+ <string name="wifi_not_available">Wi-Fi is NOT AVAILABLE</string>
+ <string name="wifi_disabled">Wi-Fi is OFF</string>
+ <string name="wifi_disconnected">Wi-Fi is DISCONNECTED</string>
+ <string name="format_wifi_connected">Wi-Fi is connected to %1$s</string>
+ <string name="bluetooth_not_available">Bluetooth is NOT AVAILABLE</string>
+ <string name="bluetooth_disabled">Bluetooth is OFF</string>
+ <string name="bluetooth_not_discoverable">Bluetooth is NOT DISCOVERABLE</string>
+ <string name="bluetooth_discoverable">Bluetooth is discoverable</string>
+ <string name="fact_to_face">For security reasons you must be face-to-face with someone to add them as a contact</string>
+ <string name="continue_button">Continue</string>
+ <string name="your_invitation_code">Your invitation code is</string>
+ <string name="enter_invitation_code">Please enter your contact\'s invitation code:</string>
+ <string name="format_connecting_wifi">Searching via %1$s\u2026</string>
+ <string name="connecting_bluetooth">Searching via Bluetooth\u2026</string>
+ <string name="connection_failed">Connection failed</string>
+ <string name="check_same_network">Please check that you are both using the same network</string>
+ <string name="try_again_button">Try again</string>
+ <string name="connected_to_contact">Connected to contact</string>
+ <string name="calculating_confirmation_code">Calculating confirmation code\u2026</string>
+ <string name="your_confirmation_code">Your confirmation code is</string>
+ <string name="enter_confirmation_code">Please enter your contact\'s confirmation code:</string>
+ <string name="waiting_for_contact">Waiting for contact\u2026</string>
+ <string name="exchanging_contact_details">Exchanging contact details\u2026</string>
+ <string name="codes_do_not_match">Codes do not match</string>
+ <string name="interfering">This could mean that someone is trying to interfere with your connection</string>
+ <string name="contact_added_toast">Contact added</string>
+ <string name="done_button">Done</string>
+ <string name="messages_title">Messages</string>
+ <string name="no_messages">(No messages)</string>
+ <string name="format_from">From: %1$s</string>
+ <string name="format_to">To: %1$s</string>
+ <string name="new_message_title">New Message</string>
+ <string name="from">From:</string>
+ <string name="to">To:</string>
+ <string name="anonymous">Anonymous</string>
+ <string name="new_contact_item">New contact\u2026</string>
+ <string name="forums_title">Forums</string>
+ <plurals name="forums_available">
+ <item quantity="one">%1$d forum available from contacts</item>
+ <item quantity="other">%1$d forums available from contacts</item>
+ </plurals>
+ <string name="no_posts">No posts</string>
+ <string name="subscribe_to_this_forum">Subscribe to this forum</string>
+ <string name="create_forum_title">New Forum</string>
+ <string name="choose_forum_name">Choose a name for your forum:</string>
+ <string name="forum_visible_to_all">Share this forum with all contacts</string>
+ <string name="forum_visible_to_some">Share this forum with chosen contacts</string>
+ <string name="new_post_title">New Post</string>
+ <string name="new_forum_item">New forum\u2026</string>
+ <string name="manage_subscriptions_title">Available Forums</string>
+ <string name="no_forums_available">No forums available from contacts</string>
+ <string name="subscribed_all">Subscribed, shared with all contacts</string>
+ <string name="subscribed_some">Subscribed, shared with chosen contacts</string>
+ <string name="not_subscribed">Not subscribed</string>
+ <string name="create_nickname_item">New nickname\u2026</string>
+ <string name="new_identity_title">New Nickname</string>
+ <string name="create_button">Create</string>
+ <string name="no_contacts">You don\'t have any contacts. Add a contact now?</string>
+ <string name="add_button">Add</string>
+ <string name="cancel_button">Cancel</string>
+ <string name="message_sent_toast">Message sent</string>
+ <string name="post_sent_toast">Post sent</string>
+ <string name="not_implemented_toast">Not implemented yet!</string>
+</resources>
\ No newline at end of file
diff --git a/briar-android/src/org/briarproject/android/AndroidExecutorImpl.java b/briar-android/src/org/briarproject/android/AndroidExecutorImpl.java
index 6fcb2a9a834e4589681521792e2d2c36e5a9e0fd..5d9c4709156887957a8112ebb43abae5790ba85d 100644
--- a/briar-android/src/org/briarproject/android/AndroidExecutorImpl.java
+++ b/briar-android/src/org/briarproject/android/AndroidExecutorImpl.java
@@ -10,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
import org.briarproject.api.android.AndroidExecutor;
+
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index c56714bdf571808cdf37e2f01bbf50c77d177344..9e42fefe53f026dc03b69ff9c27910ada77b75c0 100644
--- a/briar-android/src/org/briarproject/android/BriarService.java
+++ b/briar-android/src/org/briarproject/android/BriarService.java
@@ -6,12 +6,15 @@ import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
import static java.util.logging.Level.INFO;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.api.android.AndroidExecutor;
+import org.briarproject.api.android.DatabaseUiExecutor;
+import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.lifecycle.LifecycleManager;
@@ -26,6 +29,7 @@ import android.support.v4.app.NotificationCompat;
public class BriarService extends RoboService {
+ private static final int NOTIFICATION_ID = 1;
private static final Logger LOG =
Logger.getLogger(BriarService.class.getName());
@@ -36,6 +40,8 @@ public class BriarService extends RoboService {
// Fields that are accessed from background threads must be volatile
@Inject private volatile LifecycleManager lifecycleManager;
@Inject private volatile AndroidExecutor androidExecutor;
+ @Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
+ @Inject private volatile DatabaseComponent db;
private volatile boolean started = false;
@Override
@@ -54,12 +60,11 @@ public class BriarService extends RoboService {
b.setContentText(getText(R.string.notification_text));
b.setWhen(0); // Don't show the time
b.setOngoing(true);
- // Touch the notification to show the home screen
Intent i = new Intent(this, HomeScreenActivity.class);
i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP |
FLAG_ACTIVITY_SINGLE_TOP);
b.setContentIntent(PendingIntent.getActivity(this, 0, i, 0));
- startForeground(1, b.build());
+ startForeground(NOTIFICATION_ID, b.build());
// Start the services in a background thread
new Thread() {
@Override
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index cb854dedf6d57f9d43de85a8e584f0504849c465..585f4281a406ce9b67273e65170bb0701584ad93 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -32,6 +32,7 @@ import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
+
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java b/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java
index 68350324dfd8c5dbad160953dafea7d16b4b3152..c717c7732bcb9df593b1f91ce3867211b5dc7c72 100644
--- a/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java
+++ b/briar-android/src/org/briarproject/android/contact/SelectContactsDialog.java
@@ -7,6 +7,7 @@ import java.util.Set;
import org.briarproject.R;
import org.briarproject.api.Contact;
import org.briarproject.api.ContactId;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
diff --git a/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java b/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
index 91eb34ec26f11d60adcfb43971d5ca80f4be32c7..eff2c6d26b406ece58d0d57a68a7de70af5d139a 100644
--- a/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
@@ -27,6 +27,7 @@ import org.briarproject.api.db.DbException;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
+
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/org/briarproject/android/groups/GroupActivity.java b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
index 629a73b4396beba931c8b162494ef3e8c05eb141..f5023b8be8410412c4a8264304ec9e3215539da6 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
@@ -34,6 +34,7 @@ import org.briarproject.api.event.MessageExpiredEvent;
import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.GroupId;
+
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
index e1187e545102528a0946a88fc543143652ee2f20..b2d0ba00578e6d07b5dbd1f08a6beb0da5bfe4a4 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java
@@ -23,8 +23,8 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.R;
-import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ElasticHorizontalSpace;
+import org.briarproject.android.util.HorizontalBorder;
import org.briarproject.android.util.ListLoadingProgressBar;
import org.briarproject.api.android.DatabaseUiExecutor;
import org.briarproject.api.db.DatabaseComponent;
@@ -42,6 +42,7 @@ import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.GroupStatus;
+
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java b/briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java
index 9eca0b78a337d9380befffe319262ad127d95d0a..b5d14f6975e82e02348024797867089eb3018a0c 100644
--- a/briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ManageGroupsActivity.java
@@ -24,6 +24,7 @@ import org.briarproject.api.event.SubscriptionRemovedEvent;
import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupStatus;
+
import roboguice.activity.RoboFragmentActivity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/briar-android/src/org/briarproject/android/groups/NoContactsDialog.java b/briar-android/src/org/briarproject/android/groups/NoContactsDialog.java
index 0468a7812b59e6df5860072b1e5c7a94fd246ec3..a5be07741fccfb1f51d17668f33861d89d68d48a 100644
--- a/briar-android/src/org/briarproject/android/groups/NoContactsDialog.java
+++ b/briar-android/src/org/briarproject/android/groups/NoContactsDialog.java
@@ -1,6 +1,7 @@
package org.briarproject.android.groups;
import org.briarproject.R;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
diff --git a/briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java b/briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java
index 09f535c6294a8e59affb7476f31c828e800c56e4..b8b9e30ce6e8a4c5b75c631886f0714ad8614dc9 100644
--- a/briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java
+++ b/briar-android/src/org/briarproject/android/identity/LocalAuthorSpinnerAdapter.java
@@ -9,6 +9,7 @@ import java.util.Comparator;
import java.util.List;
import org.briarproject.R;
+
import android.content.Context;
import android.content.res.Resources;
import android.view.View;
diff --git a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
index b767b18b28bf52e9d8060e7053ffef0f0f39c847..61a26caab25a22010f06d21d384733ffa637ed45 100644
--- a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
+++ b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
@@ -31,6 +31,7 @@ import org.briarproject.api.invitation.InvitationState;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.lifecycle.LifecycleManager;
+
import roboguice.activity.RoboActivity;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
diff --git a/briar-android/src/org/briarproject/android/invitation/ConnectedView.java b/briar-android/src/org/briarproject/android/invitation/ConnectedView.java
index d91b7ca410262260814dd6e09b12490f4a00d2cb..b9a51abec686244cf8044856933bcc958b16cfdb 100644
--- a/briar-android/src/org/briarproject/android/invitation/ConnectedView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ConnectedView.java
@@ -1,7 +1,9 @@
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
+
import org.briarproject.R;
+
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;
diff --git a/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java b/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
index 0a0da9a402836d80b5a62c4c97bbf3b390470d4f..1c31bba2cee00966af3b7e62a8ff09d6df880e82 100644
--- a/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
+++ b/briar-android/src/org/briarproject/android/invitation/ContactDetailsView.java
@@ -2,7 +2,9 @@ package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
+
import org.briarproject.R;
+
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;
diff --git a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
index 795eb529d85d620c84048b281ff4654a0ee02b56..afd4669c3c191ca62ec082ea16667b3c1beb19e5 100644
--- a/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
+++ b/briar-android/src/org/briarproject/android/invitation/InvitationCodeView.java
@@ -1,7 +1,9 @@
package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER_HORIZONTAL;
+
import org.briarproject.R;
+
import android.content.Context;
import android.content.res.Resources;
import android.widget.TextView;
diff --git a/briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java b/briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java
index 9fc38961bf38b98d6daaf492720e479d1d45f6d6..c494dac92d8adcb497d93a9ef83e0ef000711bba 100644
--- a/briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java
+++ b/briar-android/src/org/briarproject/android/invitation/NetworkSetupView.java
@@ -4,11 +4,13 @@ import static android.view.Gravity.CENTER;
import static org.briarproject.android.identity.LocalAuthorItem.NEW;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP;
+
import org.briarproject.R;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.api.AuthorId;
+
import android.content.Context;
import android.content.Intent;
import android.view.View;
diff --git a/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java b/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
index 625c4576cd91a73832e978fb104a00118ed13021..2ee3f392a292800db59c819be4c5aed3c9a626a0 100644
--- a/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
+++ b/briar-android/src/org/briarproject/android/invitation/WaitForContactView.java
@@ -2,7 +2,9 @@ package org.briarproject.android.invitation;
import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_HORIZONTAL;
+
import org.briarproject.R;
+
import android.content.Context;
import android.widget.ImageView;
import android.widget.LinearLayout;
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index d2a17d476e5a514dff985d4ce46bc3f681c83560..b2609f435d8718ceff9771235a6f972ad756a42c 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -35,6 +35,7 @@ import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.Clock;
import org.briarproject.util.LatchedReference;
import org.briarproject.util.StringUtils;
+
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothServerSocket;
diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java
index bc365fcf78e6185565ec68088313e18a721b2375..50cd9db82cc1ff059c6e5e05e867a8c4923a53a5 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothTransportConnection.java
@@ -6,6 +6,7 @@ import java.io.OutputStream;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+
import android.bluetooth.BluetoothSocket;
class DroidtoothTransportConnection implements DuplexTransportConnection {
diff --git a/briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPlugin.java b/briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPlugin.java
index 2c4f27a5e788a9d0adf121c7909769ff0addfcbb..064199dca6a89019a02962ab5403dbc25b204e29 100644
--- a/briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/tcp/DroidLanTcpPlugin.java
@@ -8,6 +8,7 @@ import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.system.Clock;
+
import android.content.Context;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.MulticastLock;
diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
index 5500fe146b996774fc21c5832e45daa0b6b03529..91720ff9f587270275d9997ac26f6f58edda6a70 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
@@ -7,6 +7,7 @@ import org.briarproject.api.lifecycle.ShutdownManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
+
import android.content.Context;
import android.os.Build;
diff --git a/briar-android/src/org/briarproject/system/AndroidFileUtils.java b/briar-android/src/org/briarproject/system/AndroidFileUtils.java
index 80efdc2a4785e208d20c195ea93d9e3562cf3bd8..f4b49144e4faf4addf2129a2351881284216f7c7 100644
--- a/briar-android/src/org/briarproject/system/AndroidFileUtils.java
+++ b/briar-android/src/org/briarproject/system/AndroidFileUtils.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException;
import org.briarproject.api.system.FileUtils;
+
import android.os.Build;
import android.os.StatFs;