Skip to content
Snippets Groups Projects
Unverified Commit 1528aa0d authored by akwizgran's avatar akwizgran
Browse files

Code review nitpicks.

parent eac17e74
No related branches found
No related tags found
No related merge requests found
......@@ -10,8 +10,8 @@ import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.BriarControllerImpl;
import org.briarproject.android.controller.ConfigController;
import org.briarproject.android.controller.ConfigControllerImpl;
import org.briarproject.android.controller.DBController;
import org.briarproject.android.controller.DBControllerImpl;
import org.briarproject.android.controller.DbController;
import org.briarproject.android.controller.DbControllerImpl;
import org.briarproject.android.controller.NavDrawerController;
import org.briarproject.android.controller.NavDrawerControllerImpl;
import org.briarproject.android.controller.PasswordController;
......@@ -93,8 +93,8 @@ public class ActivityModule {
@ActivityScope
@Provides
protected DBController provideDBController(
DBControllerImpl dbController) {
protected DbController provideDBController(
DbControllerImpl dbController) {
return dbController;
}
......
......@@ -5,7 +5,7 @@ import android.content.Intent;
import android.os.Build;
import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.DBController;
import org.briarproject.android.controller.DbController;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.panic.ExitActivity;
......@@ -36,7 +36,7 @@ public abstract class BriarActivity extends BaseActivity {
protected BriarController briarController;
// TODO remove this when the deprecated method runOnDbThread is removed
@Inject
protected DBController dbController;
protected DbController dbController;
@Override
protected void onActivityResult(int request, int result, Intent data) {
......
......@@ -67,14 +67,13 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (!isStartupFailed(intent)) {
checkAuthorHandle(intent);
clearBackStack();
if (intent.getBooleanExtra(INTENT_FORUMS, false))
startFragment(activityComponent.newForumListFragment());
else if (intent.getBooleanExtra(INTENT_CONTACTS, false))
startFragment(activityComponent.newContactListFragment());
}
exitIfStartupFailed(intent);
checkAuthorHandle(intent);
clearBackStack();
if (intent.getBooleanExtra(INTENT_FORUMS, false))
startFragment(activityComponent.newForumListFragment());
else if (intent.getBooleanExtra(INTENT_CONTACTS, false))
startFragment(activityComponent.newContactListFragment());
}
@Override
......@@ -86,10 +85,7 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
if (isStartupFailed(getIntent()))
return;
exitIfStartupFailed(getIntent());
setContentView(R.layout.activity_nav_drawer);
toolbar = (Toolbar) findViewById(R.id.toolbar);
......@@ -106,7 +102,6 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
R.string.nav_drawer_open_description,
R.string.nav_drawer_close_description);
drawerLayout.setDrawerListener(drawerToggle);
LOG.info("NavDrawerActivity created: " + (state == null));
if (state == null) {
startFragment(activityComponent.newContactListFragment());
} else {
......@@ -154,14 +149,12 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
}
}
private boolean isStartupFailed(Intent intent) {
private void exitIfStartupFailed(Intent intent) {
if (intent.getBooleanExtra(KEY_STARTUP_FAILED, false)) {
finish();
LOG.info("Exiting");
System.exit(0);
return true;
}
return false;
}
private void storeLocalAuthor(LocalAuthor a) {
......
package org.briarproject.android.controller;
public interface DBController {
public interface DbController {
void runOnDbThread(Runnable task);
}
......@@ -8,10 +8,10 @@ import java.util.logging.Logger;
import javax.inject.Inject;
public class DBControllerImpl implements DBController {
public class DbControllerImpl implements DbController {
private static final Logger LOG =
Logger.getLogger(BriarControllerImpl.class.getName());
Logger.getLogger(DbControllerImpl.class.getName());
// Fields that are accessed from background threads must be volatile
@Inject
......@@ -21,7 +21,7 @@ public class DBControllerImpl implements DBController {
protected volatile LifecycleManager lifecycleManager;
@Inject
public DBControllerImpl() {
public DbControllerImpl() {
}
......
......@@ -23,7 +23,7 @@ import javax.inject.Inject;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
public class NavDrawerControllerImpl extends DBControllerImpl
public class NavDrawerControllerImpl extends DbControllerImpl
implements NavDrawerController, EventListener {
private static final Logger LOG =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment