From 2407f3b9892ddb0d34cfc5c674b6d4e3a6d06b51 Mon Sep 17 00:00:00 2001
From: Thialfihar <thialfihar@gmail.com>
Date: Fri, 23 Jul 2010 12:57:02 +0000
Subject: have a direct set/change pass phrase button in key creation/editing,
instead of hiding it in the menu, also capitalize user id names automatically
and give the email field an inputType of textEmailAddress
---
.../thialfihar/android/apg/EditKeyActivity.java | 39 +++++++++++-----------
1 file changed, 20 insertions(+), 19 deletions(-)
(limited to 'src')
diff --git a/src/org/thialfihar/android/apg/EditKeyActivity.java b/src/org/thialfihar/android/apg/EditKeyActivity.java
index e71fd8e8c..3fa5a7552 100644
--- a/src/org/thialfihar/android/apg/EditKeyActivity.java
+++ b/src/org/thialfihar/android/apg/EditKeyActivity.java
@@ -60,6 +60,8 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
private String mCurrentPassPhrase = null;
private String mNewPassPhrase = null;
+ private Button mChangePassPhrase;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -90,6 +92,14 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
}
}
+ mChangePassPhrase = (Button) findViewById(R.id.btn_change_pass_phrase);
+ mChangePassPhrase.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showDialog(Id.dialog.new_pass_phrase);
+ }
+ });
+
mSaveButton = (Button) findViewById(R.id.btn_save);
mDiscardButton = (Button) findViewById(R.id.btn_discard);
@@ -114,6 +124,8 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
mCurrentPassPhrase = "";
}
+ updatePassPhraseButtonText();
+
Toast.makeText(this, "Warning: Key editing is still kind of beta.", Toast.LENGTH_LONG).show();
}
@@ -131,30 +143,13 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- menu.add(0, Id.menu.option.new_pass_phrase, 0,
- (havePassPhrase() ? R.string.menu_changePassPhrase : R.string.menu_setPassPhrase))
- .setIcon(android.R.drawable.ic_menu_add);
- menu.add(0, Id.menu.option.preferences, 1, R.string.menu_preferences)
+ menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences)
.setIcon(android.R.drawable.ic_menu_preferences);
- menu.add(0, Id.menu.option.about, 2, R.string.menu_about)
+ menu.add(0, Id.menu.option.about, 1, R.string.menu_about)
.setIcon(android.R.drawable.ic_menu_info_details);
return true;
}
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case Id.menu.option.new_pass_phrase: {
- showDialog(Id.dialog.new_pass_phrase);
- return true;
- }
-
- default: {
- return super.onOptionsItemSelected(item);
- }
- }
- }
-
@Override
protected Dialog onCreateDialog(int id) {
switch (id) {
@@ -194,6 +189,7 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
}
mNewPassPhrase = passPhrase1;
+ updatePassPhraseButtonText();
}
});
@@ -289,4 +285,9 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener {
finish();
}
}
+
+ private void updatePassPhraseButtonText() {
+ mChangePassPhrase.setText(
+ havePassPhrase() ? R.string.btn_changePassPhrase : R.string.btn_setPassPhrase);
+ }
}
\ No newline at end of file
--
cgit v1.2.3