Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Use signed in, signed out to describe whether the DB is open or closed.

Browse Source 
Hopefully this gives users a better understanding of whether their
messages and contacts are accessible than "Briar is running" and "Quit".
This commit is contained in:
akwizgran
2014-02-09 11:54:48 +00:00
parent 4178353c02
commit e92b6fce4c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/res/values/strings.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Briar</string> <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="ongoing_notification_text">Touch to show the dashboard.</string>
<string name="setup_title">Briar Setup</string> <string name="setup_title">Briar Setup</string>
<string name="choose_nickname">Choose your nickname:</string> <string name="choose_nickname">Choose your nickname:</string>
@@ -21,7 +21,7 @@
<string name="contact_list_button">Contacts</string> <string name="contact_list_button">Contacts</string>
<string name="forums_button">Forums</string> <string name="forums_button">Forums</string>
<string name="synchronize_button">Synchronize</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="new_identity_item">New identity\u2026</string>
<string name="contact_list_title">Contacts</string> <string name="contact_list_title">Contacts</string>
<string name="contact_connected">Connected</string> <string name="contact_connected">Connected</string>

2
briar-android/src/org/briarproject/android/BriarActivity.java
View File

@@ -67,7 +67,7 @@ public class BriarActivity extends RoboFragmentActivity {
if(bound) unbindService(serviceConnection); if(bound) unbindService(serviceConnection);
} }
protected void quit() { protected void signOut() {
new Thread() { new Thread() {
@Override @Override
public void run() { public void run() {

16
briar-android/src/org/briarproject/android/DashboardActivity.java
View File

@@ -135,19 +135,19 @@ public class DashboardActivity extends BriarActivity {
}); });
buttons.add(syncButton); buttons.add(syncButton);
Button quitButton = new Button(this); Button signOutButton = new Button(this);
quitButton.setLayoutParams(matchMatch); signOutButton.setLayoutParams(matchMatch);
quitButton.setBackgroundResource(0); signOutButton.setBackgroundResource(0);
quitButton.setCompoundDrawablesWithIntrinsicBounds(0, signOutButton.setCompoundDrawablesWithIntrinsicBounds(0,
R.drawable.device_access_accounts, 0, 0); R.drawable.device_access_accounts, 0, 0);
quitButton.setText(R.string.quit_button); signOutButton.setText(R.string.sign_out_button);
quitButton.setOnClickListener(new OnClickListener() { signOutButton.setOnClickListener(new OnClickListener() {
public void onClick(View view) { public void onClick(View view) {
showSpinner(); showSpinner();
quit(); signOut();
} }
}); });
buttons.add(quitButton); buttons.add(signOutButton);
int pad = LayoutUtils.getPadding(this); int pad = LayoutUtils.getPadding(this);