diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index 92ae565c5..6901075a3 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -29,7 +29,7 @@ (this) { + new UiResultHandler(this) { @Override public void onResultUi(Void result) { hideLoadingScreen(); } - - @Override - public void onExceptionUi(DbException exception) { - - } }); } @@ -245,21 +239,21 @@ public class NavDrawerActivity extends BriarFragmentActivity implements Transport tor = new Transport(); tor.id = new TransportId("tor"); - tor.enabled = controller.transportRunning(tor.id); + tor.enabled = controller.isTransportRunning(tor.id); tor.iconId = R.drawable.transport_tor; tor.textId = R.string.transport_tor; transports.add(tor); Transport bt = new Transport(); bt.id = new TransportId("bt"); - bt.enabled = controller.transportRunning(bt.id); + bt.enabled = controller.isTransportRunning(bt.id); bt.iconId = R.drawable.transport_bt; bt.textId = R.string.transport_bt; transports.add(bt); Transport lan = new Transport(); lan.id = new TransportId("lan"); - lan.enabled = controller.transportRunning(lan.id); + lan.enabled = controller.isTransportRunning(lan.id); lan.iconId = R.drawable.transport_lan; lan.textId = R.string.transport_lan; transports.add(lan); @@ -326,7 +320,7 @@ public class NavDrawerActivity extends BriarFragmentActivity implements private void updateTransports() { if (transports == null || transportsAdapter == null) return; for (Transport t : transports) { - t.enabled = controller.transportRunning(t.id); + t.enabled = controller.isTransportRunning(t.id); } transportsAdapter.notifyDataSetChanged(); } diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java index e2b8dcc8b..e4ff0b941 100644 --- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java +++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java @@ -69,6 +69,7 @@ public class SplashScreenActivity extends BaseActivity { startActivity(new Intent(this, NavDrawerActivity.class)); } else { configController.clearPrefs(); + // TODO replace this static call with a controller method AndroidUtils.deleteAppData(this); startActivity(new Intent(this, SetupActivity.class)); } diff --git a/briar-android/src/org/briarproject/android/controller/BriarController.java b/briar-android/src/org/briarproject/android/controller/BriarController.java index 2ed024ee9..4be89b108 100644 --- a/briar-android/src/org/briarproject/android/controller/BriarController.java +++ b/briar-android/src/org/briarproject/android/controller/BriarController.java @@ -8,7 +8,7 @@ public interface BriarController extends ActivityLifecycleController { void startAndBindService(); - boolean encryptionKey(); + boolean hasEncryptionKey(); void signOut(ResultHandler eventHandler); } diff --git a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java b/briar-android/src/org/briarproject/android/controller/BriarControllerImpl.java similarity index 93% rename from briar-android/src/org/briarproject/android/controller/BriarControllerImp.java rename to briar-android/src/org/briarproject/android/controller/BriarControllerImpl.java index 9e7cadeae..fd24291c7 100644 --- a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java +++ b/briar-android/src/org/briarproject/android/controller/BriarControllerImpl.java @@ -17,10 +17,10 @@ import java.util.logging.Logger; import javax.inject.Inject; -public class BriarControllerImp implements BriarController { +public class BriarControllerImpl implements BriarController { private static final Logger LOG = - Logger.getLogger(BriarControllerImp.class.getName()); + Logger.getLogger(BriarControllerImpl.class.getName()); @Inject protected BriarServiceConnection serviceConnection; @@ -38,7 +38,7 @@ public class BriarControllerImp implements BriarController { private boolean bound = false; @Inject - public BriarControllerImp() { + public BriarControllerImpl() { } @@ -71,7 +71,7 @@ public class BriarControllerImp implements BriarController { } @Override - public boolean encryptionKey() { + public boolean hasEncryptionKey() { return databaseConfig.getEncryptionKey() != null; } diff --git a/briar-android/src/org/briarproject/android/controller/ConfigControllerImp.java b/briar-android/src/org/briarproject/android/controller/ConfigControllerImpl.java similarity index 88% rename from briar-android/src/org/briarproject/android/controller/ConfigControllerImp.java rename to briar-android/src/org/briarproject/android/controller/ConfigControllerImpl.java index d37ab8f1b..b823b98e2 100644 --- a/briar-android/src/org/briarproject/android/controller/ConfigControllerImp.java +++ b/briar-android/src/org/briarproject/android/controller/ConfigControllerImpl.java @@ -6,7 +6,7 @@ import org.briarproject.api.db.DatabaseConfig; import javax.inject.Inject; -public class ConfigControllerImp implements ConfigController { +public class ConfigControllerImpl implements ConfigController { private final static String PREF_DB_KEY = "key"; @@ -16,7 +16,7 @@ public class ConfigControllerImp implements ConfigController { protected volatile DatabaseConfig databaseConfig; @Inject - public ConfigControllerImp() { + public ConfigControllerImpl() { } diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java index 2669cc455..56d48b1ca 100644 --- a/briar-android/src/org/briarproject/android/controller/NavDrawerController.java +++ b/briar-android/src/org/briarproject/android/controller/NavDrawerController.java @@ -1,17 +1,16 @@ package org.briarproject.android.controller; -import org.briarproject.android.controller.handler.ResultExceptionHandler; +import org.briarproject.android.controller.handler.UiResultHandler; import org.briarproject.api.TransportId; -import org.briarproject.api.db.DbException; import org.briarproject.api.identity.LocalAuthor; public interface NavDrawerController extends BriarController { void setTransportListener(TransportStateListener transportListener); - boolean transportRunning(TransportId transportId); + boolean isTransportRunning(TransportId transportId); void storeLocalAuthor(LocalAuthor author, - ResultExceptionHandler resultHandler); + UiResultHandler resultHandler); LocalAuthor removeAuthorHandle(long handle); } diff --git a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImp.java b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java similarity index 88% rename from briar-android/src/org/briarproject/android/controller/NavDrawerControllerImp.java rename to briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java index 0a5d2c865..4be03f949 100644 --- a/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImp.java +++ b/briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java @@ -3,7 +3,7 @@ package org.briarproject.android.controller; import android.app.Activity; import org.briarproject.android.api.ReferenceManager; -import org.briarproject.android.controller.handler.ResultExceptionHandler; +import org.briarproject.android.controller.handler.UiResultHandler; import org.briarproject.api.TransportId; import org.briarproject.api.db.DbException; import org.briarproject.api.event.Event; @@ -25,11 +25,11 @@ import javax.inject.Inject; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -public class NavDrawerControllerImp extends BriarControllerImp +public class NavDrawerControllerImpl extends BriarControllerImpl implements NavDrawerController, EventListener { private static final Logger LOG = - Logger.getLogger(NavDrawerControllerImp.class.getName()); + Logger.getLogger(NavDrawerControllerImpl.class.getName()); @Inject protected ReferenceManager referenceManager; @@ -38,7 +38,7 @@ public class NavDrawerControllerImp extends BriarControllerImp @Inject protected PluginManager pluginManager; @Inject - protected volatile EventBus eventBus; + protected EventBus eventBus; @Inject protected Activity activity; @@ -47,7 +47,7 @@ public class NavDrawerControllerImp extends BriarControllerImp private TransportStateListener transportStateListener; @Inject - public NavDrawerControllerImp() { + public NavDrawerControllerImpl() { } @@ -103,15 +103,14 @@ public class NavDrawerControllerImp extends BriarControllerImp } @Override - public boolean transportRunning(TransportId transportId) { + public boolean isTransportRunning(TransportId transportId) { Plugin plugin = pluginManager.getPlugin(transportId); return plugin != null && plugin.isRunning(); } @Override public void storeLocalAuthor(final LocalAuthor author, - final ResultExceptionHandler resultHandler) { - + final UiResultHandler resultHandler) { runOnDbThread(new Runnable() { public void run() { try { @@ -124,7 +123,6 @@ public class NavDrawerControllerImp extends BriarControllerImp } catch (final DbException e) { if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e); - resultHandler.onException(e); } } }); diff --git a/briar-android/src/org/briarproject/android/controller/PasswordControllerImp.java b/briar-android/src/org/briarproject/android/controller/PasswordControllerImpl.java similarity index 83% rename from briar-android/src/org/briarproject/android/controller/PasswordControllerImp.java rename to briar-android/src/org/briarproject/android/controller/PasswordControllerImpl.java index 8a85fc51b..12f7e4240 100644 --- a/briar-android/src/org/briarproject/android/controller/PasswordControllerImp.java +++ b/briar-android/src/org/briarproject/android/controller/PasswordControllerImpl.java @@ -12,7 +12,7 @@ import java.util.concurrent.Executor; import javax.inject.Inject; -public class PasswordControllerImp extends ConfigControllerImp +public class PasswordControllerImpl extends ConfigControllerImpl implements PasswordController { @Inject @@ -24,7 +24,7 @@ public class PasswordControllerImp extends ConfigControllerImp protected Activity activity; @Inject - public PasswordControllerImp() { + public PasswordControllerImpl() { } @@ -47,6 +47,8 @@ public class PasswordControllerImp extends ConfigControllerImp private byte[] getEncryptedKey() { String hex = getEncryptedDatabaseKey(); - return hex == null ? null : StringUtils.fromHexString(hex); + if (hex == null) + throw new IllegalStateException("Encrypted database key is null."); + return StringUtils.fromHexString(hex); } } diff --git a/briar-android/src/org/briarproject/android/controller/SetupControllerImp.java b/briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java similarity index 93% rename from briar-android/src/org/briarproject/android/controller/SetupControllerImp.java rename to briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java index 61a933e67..29bed6d19 100644 --- a/briar-android/src/org/briarproject/android/controller/SetupControllerImp.java +++ b/briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java @@ -22,10 +22,10 @@ import javax.inject.Inject; import static java.util.logging.Level.INFO; -public class SetupControllerImp implements SetupController { +public class SetupControllerImpl implements SetupController { private static final Logger LOG = - Logger.getLogger(SetupControllerImp.class.getName()); + Logger.getLogger(SetupControllerImpl.class.getName()); private final static String PREF_DB_KEY = "key"; @@ -50,7 +50,7 @@ public class SetupControllerImp implements SetupController { protected SharedPreferences briarPrefs; @Inject - public SetupControllerImp() { + public SetupControllerImpl() { } @@ -90,7 +90,7 @@ public class SetupControllerImp implements SetupController { databaseConfig.setEncryptionKey(key); String hex = encryptDatabaseKey(key, password); storeEncryptedDatabaseKey(hex); - final LocalAuthor localAuthor = createLocalAuthor(nickname); + LocalAuthor localAuthor = createLocalAuthor(nickname); long handle = referenceManager.putReference(localAuthor, LocalAuthor.class); resultHandler.onResult(handle); diff --git a/briar-android/src/org/briarproject/android/panic/PanicResponderActivity.java b/briar-android/src/org/briarproject/android/panic/PanicResponderActivity.java index 0b08f7f5a..fbe549e6e 100644 --- a/briar-android/src/org/briarproject/android/panic/PanicResponderActivity.java +++ b/briar-android/src/org/briarproject/android/panic/PanicResponderActivity.java @@ -112,6 +112,7 @@ public class PanicResponderActivity extends BriarActivity { public void run() { configController.clearPrefs(); // TODO somehow delete/shred the database more thoroughly + // TODO replace this static call with a controller method AndroidUtils.deleteAppData(PanicResponderActivity.this); PanicResponder.deleteAllAppData(PanicResponderActivity.this); diff --git a/briar-android/src/org/briarproject/android/util/BriarReportSenderFactory.java b/briar-android/src/org/briarproject/android/util/BriarReportSenderFactory.java index 73108ae4a..6dc106f74 100644 --- a/briar-android/src/org/briarproject/android/util/BriarReportSenderFactory.java +++ b/briar-android/src/org/briarproject/android/util/BriarReportSenderFactory.java @@ -7,7 +7,6 @@ import org.acra.config.ACRAConfiguration; import org.acra.sender.ReportSender; import org.acra.sender.ReportSenderFactory; import org.briarproject.android.BriarApplication; -import org.briarproject.android.BriarApplicationImp; public class BriarReportSenderFactory implements ReportSenderFactory { @NonNull diff --git a/briar-android/src/org/briarproject/system/AndroidSeedProvider.java b/briar-android/src/org/briarproject/system/AndroidSeedProvider.java index 1b51be767..59c7a6e3a 100644 --- a/briar-android/src/org/briarproject/system/AndroidSeedProvider.java +++ b/briar-android/src/org/briarproject/system/AndroidSeedProvider.java @@ -37,7 +37,7 @@ class AndroidSeedProvider extends LinuxSeedProvider { String str = Settings.Secure.getString(contentResolver, ANDROID_ID); if (str != null) { out.writeUTF(str); - super.writeToEntropyPool(out); } + super.writeToEntropyPool(out); } } diff --git a/briar-android/test/java/briarproject/activity/SetupActivityTest.java b/briar-android/test/java/briarproject/activity/SetupActivityTest.java index 5adf7483d..b58d033b2 100644 --- a/briar-android/test/java/briarproject/activity/SetupActivityTest.java +++ b/briar-android/test/java/briarproject/activity/SetupActivityTest.java @@ -144,13 +144,13 @@ public class SetupActivityTest { } @Test - public void testNickUI() { + public void testNicknameUI() { Assert.assertNotNull(setupActivity); String longNick = Strings.padEnd("*", AuthorConstants.MAX_AUTHOR_NAME_LENGTH + 1, '*'); nicknameEntry.setText(longNick); - // Password should be too long + // Nickname should be too long assertEquals(nicknameEntryWrapper.getError(), setupActivity.getString(R.string.name_too_long)); }