diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml
index 1d3e635789fe07d52a9178519323e23856547b6c..c7169ed8ba71faf4c1f525826121e6f88e6261ba 100644
--- a/briar-android/AndroidManifest.xml
+++ b/briar-android/AndroidManifest.xml
@@ -27,7 +27,7 @@
</intent-filter>
</service>
<activity
- android:name=".android.HomeScreenActivity"
+ android:name=".android.DashboardActivity"
android:logo="@drawable/logo"
android:label="@string/app_name" >
</activity>
@@ -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" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value=".android.HomeScreenActivity"
+ android:value=".android.DashboardActivity"
/>
</activity>
<activity
@@ -99,10 +99,10 @@
android:name=".android.groups.GroupListActivity"
android:logo="@drawable/logo"
android:label="@string/forums_title"
- android:parentActivityName=".android.HomeScreenActivity" >
+ android:parentActivityName=".android.DashboardActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
- android:value=".android.HomeScreenActivity"
+ android:value=".android.DashboardActivity"
/>
</activity>
<activity
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index f620adeef5986612c7fe0a47a5f75447d0ff8ec3..ab5f4d87c483d613525a876a15a278c70691aded 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -2,7 +2,7 @@
<resources>
<string name="app_name">Briar</string>
<string name="ongoing_notification_title">Briar is running</string>
- <string name="ongoing_notification_text">Touch to show the home screen.</string>
+ <string name="ongoing_notification_text">Touch to show the dashboard.</string>
<string name="setup_title">Briar Setup</string>
<string name="choose_nickname">Choose your nickname:</string>
<string name="choose_password">Choose your password:</string>
diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index 702282acb2cab644a1afa9125b3f03c270616a1c..2781d2a7b915685aa6d1e4a1aadf003bc05b8494 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 21828df67c8c95eafc4dc742ff6f2d82485c4020..b808d27326c5411f655ea2074d95773138bdd91c 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 84ef23185793f3de86cae6149b0b461cf1d45790..455cf30e64f4411f0080d66b69a1499ef281b529 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 a01baa441c028097058fdb4fa9d6d28db8d37aab..bcb2e7f47d299fdf3c8ab7284e6668db5e7e1d04 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 {