diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index 1d3e63578..c7169ed8b 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -27,7 +27,7 @@ @@ -59,10 +59,10 @@ android:name=".android.contact.ContactListActivity" android:logo="@drawable/logo" android:label="@string/contact_list_title" - android:parentActivityName=".android.HomeScreenActivity" > + android:parentActivityName=".android.DashboardActivity" > + android:parentActivityName=".android.DashboardActivity" > Briar Briar is running - Touch to show the home screen. + Touch to show the dashboard. Briar Setup Choose your nickname: Choose your password: diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java index 702282acb..2781d2a7b 100644 --- a/briar-android/src/org/briarproject/android/BriarService.java +++ b/briar-android/src/org/briarproject/android/BriarService.java @@ -83,7 +83,7 @@ public class BriarService extends RoboService implements EventListener { b.setContentText(getText(R.string.ongoing_notification_text)); b.setWhen(0); // Don't show the time b.setOngoing(true); - Intent i = new Intent(this, HomeScreenActivity.class); + Intent i = new Intent(this, DashboardActivity.class); i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); b.setContentIntent(PendingIntent.getActivity(this, 0, i, 0)); @@ -109,14 +109,14 @@ public class BriarService extends RoboService implements EventListener { b.setSmallIcon(android.R.drawable.stat_notify_error); b.setContentTitle(getText(R.string.startup_failed_notification_title)); b.setContentText(getText(R.string.startup_failed_notification_text)); - Intent i = new Intent(this, HomeScreenActivity.class); + Intent i = new Intent(this, DashboardActivity.class); i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP); b.setContentIntent(PendingIntent.getActivity(this, 0, i, 0)); Object o = getSystemService(NOTIFICATION_SERVICE); NotificationManager nm = (NotificationManager) o; nm.notify(FAILURE_NOTIFICATION_ID, b.build()); - // Bring HomeScreenActivity to the front to clear all other activities - i = new Intent(this, HomeScreenActivity.class); + // Bring the dashboard to the front to clear all other activities + i = new Intent(this, DashboardActivity.class); i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP); i.putExtra("briar.STARTUP_FAILED", true); startActivity(i); diff --git a/briar-android/src/org/briarproject/android/HomeScreenActivity.java b/briar-android/src/org/briarproject/android/DashboardActivity.java similarity index 95% rename from briar-android/src/org/briarproject/android/HomeScreenActivity.java rename to briar-android/src/org/briarproject/android/DashboardActivity.java index 21828df67..b808d2732 100644 --- a/briar-android/src/org/briarproject/android/HomeScreenActivity.java +++ b/briar-android/src/org/briarproject/android/DashboardActivity.java @@ -38,10 +38,10 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.Toast; -public class HomeScreenActivity extends BriarActivity { +public class DashboardActivity extends BriarActivity { private static final Logger LOG = - Logger.getLogger(HomeScreenActivity.class.getName()); + Logger.getLogger(DashboardActivity.class.getName()); @Inject private ReferenceManager referenceManager; @Inject @DatabaseUiExecutor private Executor dbUiExecutor; @@ -91,7 +91,7 @@ public class HomeScreenActivity extends BriarActivity { contactsButton.setText(R.string.contact_list_button); contactsButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { - startActivity(new Intent(HomeScreenActivity.this, + startActivity(new Intent(DashboardActivity.this, ContactListActivity.class)); } }); @@ -105,7 +105,7 @@ public class HomeScreenActivity extends BriarActivity { forumsButton.setText(R.string.forums_button); forumsButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { - startActivity(new Intent(HomeScreenActivity.this, + startActivity(new Intent(DashboardActivity.this, GroupListActivity.class)); } }); @@ -120,7 +120,7 @@ public class HomeScreenActivity extends BriarActivity { syncButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { // FIXME: Hook this button up to an activity - Toast.makeText(HomeScreenActivity.this, + Toast.makeText(DashboardActivity.this, R.string.not_implemented_toast, LENGTH_SHORT).show(); } }); diff --git a/briar-android/src/org/briarproject/android/SetupActivity.java b/briar-android/src/org/briarproject/android/SetupActivity.java index 84ef23185..455cf30e6 100644 --- a/briar-android/src/org/briarproject/android/SetupActivity.java +++ b/briar-android/src/org/briarproject/android/SetupActivity.java @@ -228,7 +228,7 @@ public class SetupActivity extends RoboActivity implements OnClickListener { for(int i = 0; i < password.length; i++) password[i] = 0; storeEncryptedDatabaseKey(encrypted); LocalAuthor localAuthor = createLocalAuthor(nickname); - showHomeScreen(referenceManager.putReference(localAuthor, + showDashboard(referenceManager.putReference(localAuthor, LocalAuthor.class)); } }); @@ -271,11 +271,11 @@ public class SetupActivity extends RoboActivity implements OnClickListener { return localAuthor; } - private void showHomeScreen(final long handle) { + private void showDashboard(final long handle) { runOnUiThread(new Runnable() { public void run() { Intent i = new Intent(SetupActivity.this, - HomeScreenActivity.class); + DashboardActivity.class); i.putExtra("briar.LOCAL_AUTHOR_HANDLE", handle); i.setFlags(FLAG_ACTIVITY_NEW_TASK); startActivity(i); diff --git a/briar-android/src/org/briarproject/android/SplashScreenActivity.java b/briar-android/src/org/briarproject/android/SplashScreenActivity.java index a01baa441..bcb2e7f47 100644 --- a/briar-android/src/org/briarproject/android/SplashScreenActivity.java +++ b/briar-android/src/org/briarproject/android/SplashScreenActivity.java @@ -58,7 +58,7 @@ public class SplashScreenActivity extends RoboSplashActivity { LOG.info("Guice startup took " + duration + " ms"); Injector guice = RoboGuice.getBaseApplicationInjector(getApplication()); if(guice.getInstance(DatabaseConfig.class).databaseExists()) { - Intent i = new Intent(this, HomeScreenActivity.class); + Intent i = new Intent(this, DashboardActivity.class); i.setFlags(FLAG_ACTIVITY_NEW_TASK); startActivity(i); } else {