diff options
Diffstat (limited to 'org_apg/src/org/apg/ui')
-rw-r--r-- | org_apg/src/org/apg/ui/EditKeyActivity.java | 87 | ||||
-rw-r--r-- | org_apg/src/org/apg/ui/EncryptActivity.java | 144 | ||||
-rw-r--r-- | org_apg/src/org/apg/ui/MainActivity.java | 2 | ||||
-rw-r--r-- | org_apg/src/org/apg/ui/PublicKeyListActivity.java | 19 | ||||
-rw-r--r-- | org_apg/src/org/apg/ui/SecretKeyListActivity.java | 12 |
5 files changed, 175 insertions, 89 deletions
diff --git a/org_apg/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/apg/ui/EditKeyActivity.java index 8d0ed6589..d61260814 100644 --- a/org_apg/src/org/apg/ui/EditKeyActivity.java +++ b/org_apg/src/org/apg/ui/EditKeyActivity.java @@ -29,6 +29,7 @@ import org.spongycastle.openpgp.PGPSecretKeyRing; import org.apg.R; import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; import android.app.AlertDialog; import android.app.Dialog; @@ -51,15 +52,15 @@ import java.security.NoSuchProviderException; import java.security.SignatureException; import java.util.Vector; -public class EditKeyActivity extends BaseActivity implements OnClickListener { +public class EditKeyActivity extends BaseActivity { private PGPSecretKeyRing mKeyRing = null; private SectionView mUserIds; private SectionView mKeys; - private Button mSaveButton; - private Button mDiscardButton; + // private Button mSaveButton; + // private Button mDiscardButton; private String mCurrentPassPhrase = null; private String mNewPassPhrase = null; @@ -67,6 +68,40 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { private Button mChangePassPhrase; @Override + public boolean onCreateOptionsMenu(Menu menu) { + menu.add(2, Id.menu.option.cancel, 0, R.string.btn_doNotSave) + // .setIcon(R.drawable.ic_menu_search_holo_light) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + menu.add(2, Id.menu.option.save, 1, R.string.btn_save) + // .setIcon(R.drawable.ic_suggestions_add) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + + case android.R.id.home: + startActivity(new Intent(this, SecretKeyListActivity.class)); + return true; + + case Id.menu.option.save: + saveClicked(); + return true; + + case Id.menu.option.cancel: + finish(); + return true; + + default: + break; + + } + return false; + } + + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.edit_key); @@ -103,11 +138,11 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { } }); - mSaveButton = (Button) findViewById(R.id.btn_save); - mDiscardButton = (Button) findViewById(R.id.btn_discard); + // mSaveButton = (Button) findViewById(R.id.btn_save); + // mDiscardButton = (Button) findViewById(R.id.btn_discard); - mSaveButton.setOnClickListener(this); - mDiscardButton.setOnClickListener(this); + // mSaveButton.setOnClickListener(this); + // mDiscardButton.setOnClickListener(this); LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -128,9 +163,9 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { updatePassPhraseButtonText(); - Toast.makeText(this, - getString(R.string.warningMessage, getString(R.string.keyEditingIsBeta)), - Toast.LENGTH_LONG).show(); + // Toast.makeText(this, + // getString(R.string.warningMessage, getString(R.string.keyEditingIsBeta)), + // Toast.LENGTH_LONG).show(); } private long getMasterKeyId() { @@ -145,14 +180,14 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { || (mNewPassPhrase != null && !mNewPassPhrase.equals("")); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - 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, 1, R.string.menu_about).setIcon( - android.R.drawable.ic_menu_info_details); - return true; - } + // @Override + // public boolean onCreateOptionsMenu(Menu menu) { + // 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, 1, R.string.menu_about).setIcon( + // android.R.drawable.ic_menu_info_details); + // return true; + // } @Override protected Dialog onCreateDialog(int id) { @@ -210,14 +245,14 @@ public class EditKeyActivity extends BaseActivity implements OnClickListener { } } - public void onClick(View v) { - if (v == mSaveButton) { - // TODO: some warning - saveClicked(); - } else if (v == mDiscardButton) { - finish(); - } - } + // public void onClick(View v) { + // if (v == mSaveButton) { + // // TODO: some warning + // saveClicked(); + // } else if (v == mDiscardButton) { + // finish(); + // } + // } private void saveClicked() { if (!havePassPhrase()) { diff --git a/org_apg/src/org/apg/ui/EncryptActivity.java b/org_apg/src/org/apg/ui/EncryptActivity.java index 8e19e09a1..1f0c39fe5 100644 --- a/org_apg/src/org/apg/ui/EncryptActivity.java +++ b/org_apg/src/org/apg/ui/EncryptActivity.java @@ -76,8 +76,13 @@ public class EncryptActivity extends BaseActivity { private boolean mReturnResult = false; private EditText mMessage = null; private Button mSelectKeysButton = null; - private Button mEncryptButton = null; - private Button mEncryptToClipboardButton = null; +// private Button mEncryptButton = null; + private boolean mEncryptEnabled = false; + private String mEncryptString = ""; +// private Button mEncryptToClipboardButton = null; + private boolean mEncryptToClipboardEnabled = false; + private String mEncryptToClipboardString = ""; + private CheckBox mSign = null; private TextView mMainUserId = null; private TextView mMainUserIdRest = null; @@ -118,24 +123,30 @@ public class EncryptActivity extends BaseActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(1, Id.menu.option.encrypt, 0, R.string.btn_encrypt) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + + if (mEncryptToClipboardEnabled) { + menu.add(1, Id.menu.option.encrypt_to_clipboard, 0, mEncryptToClipboardString) + .setShowAsAction( + MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + } + if (mEncryptEnabled) { + menu.add(1, Id.menu.option.encrypt, 1, mEncryptString).setShowAsAction( + MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + } return true; } - + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case Id.menu.option.key_server: { - startActivity(new Intent(this, KeyServerQueryActivity.class)); + case Id.menu.option.encrypt_to_clipboard: { + encryptToClipboardClicked(); return true; } - case Id.menu.option.scanQRCode: { - Intent intent = new Intent(this, ImportFromQRCodeActivity.class); - intent.setAction(Apg.Intent.IMPORT_FROM_QR_CODE); - startActivityForResult(intent, Id.request.import_from_qr_code); + case Id.menu.option.encrypt: { + encryptClicked(); return true; } @@ -220,8 +231,8 @@ public class EncryptActivity extends BaseActivity { mMessage = (EditText) findViewById(R.id.message); mSelectKeysButton = (Button) findViewById(R.id.btn_selectEncryptKeys); - mEncryptButton = (Button) findViewById(R.id.btn_encrypt); - mEncryptToClipboardButton = (Button) findViewById(R.id.btn_encryptToClipboard); +// mEncryptButton = (Button) findViewById(R.id.btn_encrypt); +// mEncryptToClipboardButton = (Button) findViewById(R.id.btn_encryptToClipboard); mSign = (CheckBox) findViewById(R.id.sign); mMainUserId = (TextView) findViewById(R.id.mainUserId); mMainUserIdRest = (TextView) findViewById(R.id.mainUserIdRest); @@ -275,17 +286,17 @@ public class EncryptActivity extends BaseActivity { } }); - mEncryptToClipboardButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - encryptToClipboardClicked(); - } - }); +// mEncryptToClipboardButton.setOnClickListener(new OnClickListener() { +// public void onClick(View v) { +// encryptToClipboardClicked(); +// } +// }); - mEncryptButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - encryptClicked(); - } - }); +// mEncryptButton.setOnClickListener(new OnClickListener() { +// public void onClick(View v) { +// encryptClicked(); +// } +// }); mSelectKeysButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { @@ -479,57 +490,93 @@ public class EncryptActivity extends BaseActivity { private void updateButtons() { switch (mSource.getCurrentView().getId()) { case R.id.sourceFile: { - mEncryptToClipboardButton.setVisibility(View.INVISIBLE); - mEncryptButton.setText(R.string.btn_encrypt); + mEncryptEnabled = true; + mEncryptToClipboardEnabled = false; + + // mEncryptToClipboardButton.setVisibility(View.INVISIBLE); + // mEncryptButton.setText(R.string.btn_encrypt); break; } case R.id.sourceMessage: { mSourceLabel.setText(R.string.label_message); if (mReturnResult) { - mEncryptToClipboardButton.setVisibility(View.INVISIBLE); + mEncryptToClipboardEnabled = false; + // mEncryptToClipboardButton.setVisibility(View.INVISIBLE); } else { - mEncryptToClipboardButton.setVisibility(View.VISIBLE); + mEncryptToClipboardEnabled = true; + // mEncryptToClipboardButton.setVisibility(View.VISIBLE); } if (mMode.getCurrentView().getId() == R.id.modeSymmetric) { if (mReturnResult) { - mEncryptButton.setText(R.string.btn_encrypt); + mEncryptString = getString(R.string.btn_encrypt); + // mEncryptButton.setText(R.string.btn_encrypt); } else { - mEncryptButton.setText(R.string.btn_encryptAndEmail); + mEncryptString = getString(R.string.btn_encryptAndEmail); + + // mEncryptButton.setText(R.string.btn_encryptAndEmail); } - mEncryptButton.setEnabled(true); - mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); - mEncryptToClipboardButton.setEnabled(true); + mEncryptEnabled = true; + mEncryptToClipboardString = getString(R.string.btn_encryptToClipboard); + mEncryptToClipboardEnabled = true; + + // mEncryptButton.setEnabled(true); + // mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); + // mEncryptToClipboardButton.setEnabled(true); } else { if (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0) { if (getSecretKeyId() == 0) { if (mReturnResult) { - mEncryptButton.setText(R.string.btn_encrypt); + mEncryptString = getString(R.string.btn_encrypt); + // mEncryptButton.setText(R.string.btn_encrypt); } else { - mEncryptButton.setText(R.string.btn_encryptAndEmail); + mEncryptString = getString(R.string.btn_encryptAndEmail); + + // mEncryptButton.setText(R.string.btn_encryptAndEmail); } - mEncryptButton.setEnabled(false); - mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); - mEncryptToClipboardButton.setEnabled(false); + mEncryptEnabled = false; + mEncryptToClipboardString = getString(R.string.btn_encryptToClipboard); + mEncryptToClipboardEnabled = false; + + // mEncryptButton.setEnabled(false); + // mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); + // mEncryptToClipboardButton.setEnabled(false); } else { if (mReturnResult) { - mEncryptButton.setText(R.string.btn_sign); + mEncryptString = getString(R.string.btn_sign); + + // mEncryptButton.setText(R.string.btn_sign); } else { - mEncryptButton.setText(R.string.btn_signAndEmail); + mEncryptString = getString(R.string.btn_signAndEmail); + + // mEncryptButton.setText(R.string.btn_signAndEmail); } - mEncryptButton.setEnabled(true); - mEncryptToClipboardButton.setText(R.string.btn_signToClipboard); - mEncryptToClipboardButton.setEnabled(true); + + mEncryptEnabled = true; + mEncryptToClipboardString = getString(R.string.btn_signToClipboard); + mEncryptToClipboardEnabled = true; + + // mEncryptButton.setEnabled(true); + // mEncryptToClipboardButton.setText(R.string.btn_signToClipboard); + // mEncryptToClipboardButton.setEnabled(true); } } else { if (mReturnResult) { - mEncryptButton.setText(R.string.btn_encrypt); + mEncryptString = getString(R.string.btn_encrypt); + + // mEncryptButton.setText(R.string.btn_encrypt); } else { - mEncryptButton.setText(R.string.btn_encryptAndEmail); + mEncryptString = getString(R.string.btn_encryptAndEmail); + + // mEncryptButton.setText(R.string.btn_encryptAndEmail); } - mEncryptButton.setEnabled(true); - mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); - mEncryptToClipboardButton.setEnabled(true); + + mEncryptEnabled = true; + mEncryptToClipboardString = getString(R.string.btn_encryptToClipboard); + mEncryptToClipboardEnabled = true; + // mEncryptButton.setEnabled(true); + // mEncryptToClipboardButton.setText(R.string.btn_encryptToClipboard); + // mEncryptToClipboardButton.setEnabled(true); } } break; @@ -539,6 +586,9 @@ public class EncryptActivity extends BaseActivity { break; } } + + // build new action bar + invalidateOptionsMenu(); } private void updateMode() { diff --git a/org_apg/src/org/apg/ui/MainActivity.java b/org_apg/src/org/apg/ui/MainActivity.java index c009b36dd..d92cd7e07 100644 --- a/org_apg/src/org/apg/ui/MainActivity.java +++ b/org_apg/src/org/apg/ui/MainActivity.java @@ -68,7 +68,7 @@ public class MainActivity extends BaseActivity { } public void decryptOnClick(View view) { - Intent intent = new Intent(MainActivity.this, EncryptActivity.class); + Intent intent = new Intent(MainActivity.this, DecryptActivity.class); intent.setAction(Apg.Intent.DECRYPT); startActivity(intent); } diff --git a/org_apg/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/apg/ui/PublicKeyListActivity.java index f0e7ce569..f91683748 100644 --- a/org_apg/src/org/apg/ui/PublicKeyListActivity.java +++ b/org_apg/src/org/apg/ui/PublicKeyListActivity.java @@ -49,23 +49,24 @@ public class PublicKeyListActivity extends KeyListActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(1, Id.menu.option.key_server, 0, R.string.menu_keyServer) - .setIcon(R.drawable.ic_menu_find_holo_light) - .setShowAsAction( - MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + menu.add(1, Id.menu.option.search, 0, R.string.menu_search) + .setIcon(R.drawable.ic_menu_search_holo_light) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); menu.add(1, Id.menu.option.scanQRCode, 1, R.string.menu_scanQRCode) // .setIcon(R.drawable.ic_suggestions_add) .setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(0, Id.menu.option.import_keys, 2, R.string.menu_importKeys) + + menu.add(1, Id.menu.option.key_server, 2, R.string.menu_keyServer) + .setIcon(R.drawable.ic_menu_find_holo_light) + .setShowAsAction( + MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); + menu.add(0, Id.menu.option.import_keys, 3, R.string.menu_importKeys) // .setIcon(R.drawable.ic_suggestions_add) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(0, Id.menu.option.export_keys, 3, R.string.menu_exportKeys) + menu.add(0, Id.menu.option.export_keys, 4, R.string.menu_exportKeys) // .setIcon(R.drawable.ic_menu_share_holo_light) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(1, Id.menu.option.search, 4, R.string.menu_search) - .setIcon(R.drawable.ic_menu_search_holo_light) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); return true; } diff --git a/org_apg/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/apg/ui/SecretKeyListActivity.java index db9c2903e..95436565d 100644 --- a/org_apg/src/org/apg/ui/SecretKeyListActivity.java +++ b/org_apg/src/org/apg/ui/SecretKeyListActivity.java @@ -54,20 +54,20 @@ public class SecretKeyListActivity extends KeyListActivity implements OnChildCli @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(1, Id.menu.option.create, 0, R.string.menu_createKey) + menu.add(3, Id.menu.option.search, 0, R.string.menu_search) + .setIcon(R.drawable.ic_menu_search_holo_light) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + menu.add(1, Id.menu.option.create, 1, R.string.menu_createKey) .setIcon(R.drawable.ic_suggestions_add) .setShowAsAction( MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(0, Id.menu.option.import_keys, 1, R.string.menu_importKeys) + menu.add(0, Id.menu.option.import_keys, 2, R.string.menu_importKeys) // .setIcon(R.drawable.ic_menu_find_holo_light) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(0, Id.menu.option.export_keys, 2, R.string.menu_exportKeys) + menu.add(0, Id.menu.option.export_keys, 3, R.string.menu_exportKeys) // .setIcon(R.drawable.ic_menu_find_holo_light) .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT); - menu.add(3, Id.menu.option.search, 3, R.string.menu_search) - .setIcon(R.drawable.ic_menu_search_holo_light) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); return true; } |