From e92b6fce4c2fd7c1df27373adc4c40819f6f2b74 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Sun, 9 Feb 2014 11:54:48 +0000
Subject: [PATCH] Use signed in, signed out to describe whether the DB is open
or closed.
Hopefully this gives users a better understanding of whether their
messages and contacts are accessible than "Briar is running" and "Quit".
---
briar-android/res/values/strings.xml | 4 ++--
.../org/briarproject/android/BriarActivity.java | 2 +-
.../briarproject/android/DashboardActivity.java | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 86267720c5..baec15faf0 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 4676323eb7..5fe5525178 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 ea43f6c4c7..b6699664e2 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);
--
GitLab