diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index 86267720c51b243d3623c11c0eca25898d0bfd91..baec15faf098b14ea769e2d14b2e3e950c05d6ed 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Briar</string> - <string name="ongoing_notification_title">Briar is running</string> + <string name="ongoing_notification_title">Signed into Briar</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> @@ -21,7 +21,7 @@ <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="sign_out_button">Sign Out</string> <string name="new_identity_item">New identity\u2026</string> <string name="contact_list_title">Contacts</string> <string name="contact_connected">Connected</string> diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java index 4676323eb7f118f5e66585391a8363c02c7e959c..5fe552517842a2d228ef0311bd642e2c72180900 100644 --- a/briar-android/src/org/briarproject/android/BriarActivity.java +++ b/briar-android/src/org/briarproject/android/BriarActivity.java @@ -67,7 +67,7 @@ public class BriarActivity extends RoboFragmentActivity { if(bound) unbindService(serviceConnection); } - protected void quit() { + protected void signOut() { new Thread() { @Override public void run() { diff --git a/briar-android/src/org/briarproject/android/DashboardActivity.java b/briar-android/src/org/briarproject/android/DashboardActivity.java index ea43f6c4c7f473383dd2dc17b1adebc8c370bbd3..b6699664e258ade799bb56ac1bb74537b2d4d827 100644 --- a/briar-android/src/org/briarproject/android/DashboardActivity.java +++ b/briar-android/src/org/briarproject/android/DashboardActivity.java @@ -135,19 +135,19 @@ public class DashboardActivity extends BriarActivity { }); buttons.add(syncButton); - Button quitButton = new Button(this); - quitButton.setLayoutParams(matchMatch); - quitButton.setBackgroundResource(0); - quitButton.setCompoundDrawablesWithIntrinsicBounds(0, + Button signOutButton = new Button(this); + signOutButton.setLayoutParams(matchMatch); + signOutButton.setBackgroundResource(0); + signOutButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.device_access_accounts, 0, 0); - quitButton.setText(R.string.quit_button); - quitButton.setOnClickListener(new OnClickListener() { + signOutButton.setText(R.string.sign_out_button); + signOutButton.setOnClickListener(new OnClickListener() { public void onClick(View view) { showSpinner(); - quit(); + signOut(); } }); - buttons.add(quitButton); + buttons.add(signOutButton); int pad = LayoutUtils.getPadding(this);