aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-19 10:46:19 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-19 10:46:19 +0200
commitef27055434489aa09b1d4b0597249a869a505639 (patch)
treec4e6ace031e94fde82da3317ff4f215763f89701 /src
parent3f65b0e985db52a38b639ca8bbad9167b1cc8d1a (diff)
show password dialog when account was magic created
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java22
-rw-r--r--src/main/res/layout/dialog_show_password.xml19
-rw-r--r--src/main/res/menu/editaccount.xml5
-rw-r--r--src/main/res/values/strings.xml1
4 files changed, 47 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 41d12d89a..1ba7dd3d0 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -507,6 +507,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
final MenuItem showBlocklist = menu.findItem(R.id.action_show_block_list);
final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
final MenuItem changePassword = menu.findItem(R.id.action_change_password_on_server);
+ final MenuItem showPassword = menu.findItem(R.id.action_show_password);
final MenuItem clearDevices = menu.findItem(R.id.action_clear_devices);
final MenuItem renewCertificate = menu.findItem(R.id.action_renew_certificate);
final MenuItem mamPrefs = menu.findItem(R.id.action_mam_prefs);
@@ -535,6 +536,13 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
mamPrefs.setVisible(false);
changePresence.setVisible(false);
}
+
+ if (mAccount != null) {
+ showPassword.setVisible(mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE)
+ && !mAccount.isOptionSet(Account.OPTION_REGISTER));
+ } else {
+ showPassword.setVisible(false);
+ }
return super.onCreateOptionsMenu(menu);
}
@@ -642,6 +650,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
case R.id.action_change_presence:
changePresence();
break;
+ case R.id.action_show_password:
+ showPassword();
+ break;
}
return super.onOptionsItemSelected(item);
}
@@ -900,6 +911,17 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
xmppConnectionService.fetchMamPreferences(mAccount, this);
}
+ private void showPassword() {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ View view = getLayoutInflater().inflate(R.layout.dialog_show_password, null);
+ TextView password = (TextView) view.findViewById(R.id.password);
+ password.setText(mAccount.getPassword());
+ builder.setTitle(R.string.password);
+ builder.setView(view);
+ builder.setPositiveButton(R.string.cancel, null);
+ builder.create().show();
+ }
+
@Override
public void onKeyStatusUpdated(AxolotlService.FetchStatus report) {
refreshUi();
diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml
new file mode 100644
index 000000000..dba0690cb
--- /dev/null
+++ b/src/main/res/layout/dialog_show_password.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="16dp" >
+
+ <TextView
+ android:id="@+id/password"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:typeface="monospace"
+ android:textSize="?attr/TextSizeHeadline"
+ android:fontFamily="monospace"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/black87" >
+ </TextView>
+
+</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index ef9f17323..9ab1788b3 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -34,6 +34,11 @@
android:title="@string/mam_prefs"/>
<item
+ android:id="@+id/action_show_password"
+ android:showAsAction="never"
+ android:title="@string/show_password"/>
+
+ <item
android:id="@+id/action_change_password_on_server"
android:showAsAction="never"
android:title="@string/change_password"/>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index cb8aa303a..aa5f5a386 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -640,4 +640,5 @@
<string name="presence_dnd">Busy</string>
<string name="secure_password_generated">A secure password has been generated</string>
<string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
+ <string name="show_password">Show password</string>
</resources>