diff options
author | Jeremy Klein <jklein24@gmail.com> | 2015-10-14 14:52:37 -0700 |
---|---|---|
committer | Jeremy Klein <jklein24@gmail.com> | 2015-10-14 14:52:37 -0700 |
commit | 34cb0aac6364ef744e1326e054d292ecde1d7096 (patch) | |
tree | 9ec4f7b6eb8b9cd0a630664a6b95a4ceefafc163 /app/src/main/java/org | |
parent | 2e72e617be8964240961d6faa7af50d39f70622f (diff) | |
parent | 538150e8674dd67b18385aeb2b19f5086d38c6ef (diff) | |
download | connectbot-34cb0aac6364ef744e1326e054d292ecde1d7096.tar.gz connectbot-34cb0aac6364ef744e1326e054d292ecde1d7096.tar.bz2 connectbot-34cb0aac6364ef744e1326e054d292ecde1d7096.zip |
Merge pull request #294 from khorimoto/pubkey-menu
Change PubkeyListActivity's options menu.
Diffstat (limited to 'app/src/main/java/org')
-rw-r--r-- | app/src/main/java/org/connectbot/PubkeyListActivity.java | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java index 9f8521f..df00333 100644 --- a/app/src/main/java/org/connectbot/PubkeyListActivity.java +++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java @@ -61,6 +61,7 @@ import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; import android.view.View; @@ -169,52 +170,53 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi } + @Override public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - - MenuItem generatekey = menu.add(R.string.pubkey_generate); - generatekey.setIcon(android.R.drawable.ic_menu_manage); - generatekey.setIntent(new Intent(PubkeyListActivity.this, GeneratePubkeyActivity.class)); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.pubkey_list_activity_menu, menu); + return super.onCreateOptionsMenu(menu); + } - MenuItem importkey = menu.add(R.string.pubkey_import); - importkey.setIcon(android.R.drawable.ic_menu_upload); - importkey.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - Uri sdcard = Uri.fromFile(Environment.getExternalStorageDirectory()); - String pickerTitle = getString(R.string.pubkey_list_pick); + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.add_new_key_icon: + startActivity(new Intent(this, GeneratePubkeyActivity.class)); + return true; + case R.id.import_existing_key_icon: + Uri sdcard = Uri.fromFile(Environment.getExternalStorageDirectory()); + String pickerTitle = getString(R.string.pubkey_list_pick); + + // Try to use OpenIntent's file browser to pick a file + Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE); + intent.setData(sdcard); + intent.putExtra(FileManagerIntents.EXTRA_TITLE, pickerTitle); + intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getString(android.R.string.ok)); - // Try to use OpenIntent's file browser to pick a file - Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE); - intent.setData(sdcard); - intent.putExtra(FileManagerIntents.EXTRA_TITLE, pickerTitle); - intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getString(android.R.string.ok)); + try { + startActivityForResult(intent, REQUEST_CODE_PICK_FILE); + } catch (ActivityNotFoundException e) { + // If OI didn't work, try AndExplorer + intent = new Intent(Intent.ACTION_PICK); + intent.setDataAndType(sdcard, MIME_TYPE_ANDEXPLORER_FILE); + intent.putExtra(ANDEXPLORER_TITLE, pickerTitle); try { startActivityForResult(intent, REQUEST_CODE_PICK_FILE); - } catch (ActivityNotFoundException e) { - // If OI didn't work, try AndExplorer - intent = new Intent(Intent.ACTION_PICK); - intent.setDataAndType(sdcard, MIME_TYPE_ANDEXPLORER_FILE); - intent.putExtra(ANDEXPLORER_TITLE, pickerTitle); - - try { - startActivityForResult(intent, REQUEST_CODE_PICK_FILE); - } catch (ActivityNotFoundException e1) { - pickFileSimple(); - } + } catch (ActivityNotFoundException e1) { + pickFileSimple(); } - - return true; } - }); - - return true; + return true; + default: + return super.onOptionsItemSelected(item); + } } protected void handleAddKey(final PubkeyBean pubkey) { if (pubkey.isEncrypted()) { - final View view = inflater.inflate(R.layout.dia_password, null); + final View view = View.inflate(this, R.layout.dia_password, null); final EditText passwordField = (EditText) view.findViewById(android.R.id.text1); new AlertDialog.Builder(PubkeyListActivity.this) @@ -521,7 +523,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi changePassword.setEnabled(!imported); changePassword.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { - final View changePasswordView = inflater.inflate(R.layout.dia_changepassword, null, false); + final View changePasswordView = + View.inflate(PubkeyListActivity.this, R.layout.dia_changepassword, null); ((TableRow) changePasswordView.findViewById(R.id.old_password_prompt)) .setVisibility(pubkey.isEncrypted() ? View.VISIBLE : View.GONE); new AlertDialog.Builder(PubkeyListActivity.this) |