diff options
Diffstat (limited to 'org_apg/src/org/apg/ui/MainActivity.java')
| -rw-r--r-- | org_apg/src/org/apg/ui/MainActivity.java | 263 |
1 files changed, 148 insertions, 115 deletions
diff --git a/org_apg/src/org/apg/ui/MainActivity.java b/org_apg/src/org/apg/ui/MainActivity.java index 31088cb26..c009b36dd 100644 --- a/org_apg/src/org/apg/ui/MainActivity.java +++ b/org_apg/src/org/apg/ui/MainActivity.java @@ -25,6 +25,7 @@ import org.apg.Id; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.apg.R; +import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; @@ -60,20 +61,22 @@ public class MainActivity extends BaseActivity { } - public void encryptDecryptFileOnClick(View view) { + public void encryptOnClick(View view) { Intent intent = new Intent(MainActivity.this, EncryptActivity.class); - intent.setAction(Apg.Intent.ENCRYPT_FILE); + intent.setAction(Apg.Intent.ENCRYPT); startActivity(intent); - - // intent.setAction(Apg.Intent.DECRYPT_FILE); } - public void encryptDecryptTextOnClick(View view) { + public void decryptOnClick(View view) { Intent intent = new Intent(MainActivity.this, EncryptActivity.class); - intent.setAction(Apg.Intent.ENCRYPT); + intent.setAction(Apg.Intent.DECRYPT); startActivity(intent); + } - // intent.setAction(Apg.Intent.DECRYPT); + public void scanQrcodeOnClick(View view) { + Intent intent = new Intent(this, ImportFromQRCodeActivity.class); + intent.setAction(Apg.Intent.IMPORT_FROM_QR_CODE); + startActivityForResult(intent, Id.request.import_from_qr_code); } public void helpOnClick(View view) { @@ -85,88 +88,92 @@ public class MainActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.main); -// if (!mPreferences.hasSeenHelp()) { -// showDialog(Id.dialog.help); -// } -// -// if (Apg.isReleaseVersion(this) && !mPreferences.hasSeenChangeLog(Apg.getVersion(this))) { -// showDialog(Id.dialog.change_log); -// } + final ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(false); + + // if (!mPreferences.hasSeenHelp()) { + // showDialog(Id.dialog.help); + // } + // + // if (Apg.isReleaseVersion(this) && !mPreferences.hasSeenChangeLog(Apg.getVersion(this))) { + // showDialog(Id.dialog.change_log); + // } } @Override protected Dialog onCreateDialog(int id) { switch (id) { -// case Id.dialog.change_log: { -// AlertDialog.Builder alert = new AlertDialog.Builder(this); -// -// alert.setTitle("Changes " + Apg.getFullVersion(this)); -// LayoutInflater inflater = (LayoutInflater) this -// .getSystemService(Context.LAYOUT_INFLATER_SERVICE); -// View layout = inflater.inflate(R.layout.info, null); -// TextView message = (TextView) layout.findViewById(R.id.message); -// -// message.setText("Changes:\n" + "* \n" + "\n" -// + "WARNING: be careful editing your existing keys, as they " -// + "WILL be stripped of certificates right now.\n" + "\n" -// + "Also: key cross-certification is NOT supported, so signing " -// + "with those keys will get a warning when the signature is " + "checked.\n" -// + "\n" + "I hope APG continues to be useful to you, please send " -// + "bug reports, feature wishes, feedback."); -// alert.setView(layout); -// -// alert.setCancelable(false); -// alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { -// public void onClick(DialogInterface dialog, int id) { -// MainActivity.this.removeDialog(Id.dialog.change_log); -// mPreferences.setHasSeenChangeLog(Apg.getVersion(MainActivity.this), true); -// } -// }); -// -// return alert.create(); -// } - -// case Id.dialog.help: { -// AlertDialog.Builder alert = new AlertDialog.Builder(this); -// -// alert.setTitle(R.string.title_help); -// -// LayoutInflater inflater = (LayoutInflater) this -// .getSystemService(Context.LAYOUT_INFLATER_SERVICE); -// View layout = inflater.inflate(R.layout.info, null); -// TextView message = (TextView) layout.findViewById(R.id.message); -// message.setText(R.string.text_help); -// -// TransformFilter packageNames = new TransformFilter() { -// public final String transformUrl(final Matcher match, String url) { -// String name = match.group(1).toLowerCase(); -// if (name.equals("astro")) { -// return "com.metago.astro"; -// } else if (name.equals("k-9 mail")) { -// return "com.fsck.k9"; -// } else { -// return "org.openintents.filemanager"; -// } -// } -// }; -// -// Pattern pattern = Pattern.compile("(OI File Manager|ASTRO|K-9 Mail)"); -// String scheme = "market://search?q=pname:"; -// message.setAutoLinkMask(0); -// Linkify.addLinks(message, pattern, scheme, null, packageNames); -// -// alert.setView(layout); -// -// alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { -// public void onClick(DialogInterface dialog, int id) { -// MainActivity.this.removeDialog(Id.dialog.help); -// mPreferences.setHasSeenHelp(true); -// } -// }); -// -// return alert.create(); -// } + // case Id.dialog.change_log: { + // AlertDialog.Builder alert = new AlertDialog.Builder(this); + // + // alert.setTitle("Changes " + Apg.getFullVersion(this)); + // LayoutInflater inflater = (LayoutInflater) this + // .getSystemService(Context.LAYOUT_INFLATER_SERVICE); + // View layout = inflater.inflate(R.layout.info, null); + // TextView message = (TextView) layout.findViewById(R.id.message); + // + // message.setText("Changes:\n" + "* \n" + "\n" + // + "WARNING: be careful editing your existing keys, as they " + // + "WILL be stripped of certificates right now.\n" + "\n" + // + "Also: key cross-certification is NOT supported, so signing " + // + "with those keys will get a warning when the signature is " + "checked.\n" + // + "\n" + "I hope APG continues to be useful to you, please send " + // + "bug reports, feature wishes, feedback."); + // alert.setView(layout); + // + // alert.setCancelable(false); + // alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + // public void onClick(DialogInterface dialog, int id) { + // MainActivity.this.removeDialog(Id.dialog.change_log); + // mPreferences.setHasSeenChangeLog(Apg.getVersion(MainActivity.this), true); + // } + // }); + // + // return alert.create(); + // } + + // case Id.dialog.help: { + // AlertDialog.Builder alert = new AlertDialog.Builder(this); + // + // alert.setTitle(R.string.title_help); + // + // LayoutInflater inflater = (LayoutInflater) this + // .getSystemService(Context.LAYOUT_INFLATER_SERVICE); + // View layout = inflater.inflate(R.layout.info, null); + // TextView message = (TextView) layout.findViewById(R.id.message); + // message.setText(R.string.text_help); + // + // TransformFilter packageNames = new TransformFilter() { + // public final String transformUrl(final Matcher match, String url) { + // String name = match.group(1).toLowerCase(); + // if (name.equals("astro")) { + // return "com.metago.astro"; + // } else if (name.equals("k-9 mail")) { + // return "com.fsck.k9"; + // } else { + // return "org.openintents.filemanager"; + // } + // } + // }; + // + // Pattern pattern = Pattern.compile("(OI File Manager|ASTRO|K-9 Mail)"); + // String scheme = "market://search?q=pname:"; + // message.setAutoLinkMask(0); + // Linkify.addLinks(message, pattern, scheme, null, packageNames); + // + // alert.setView(layout); + // + // alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + // public void onClick(DialogInterface dialog, int id) { + // MainActivity.this.removeDialog(Id.dialog.help); + // mPreferences.setHasSeenHelp(true); + // } + // }); + // + // return alert.create(); + // } default: { return super.onCreateDialog(id); @@ -176,55 +183,81 @@ public class MainActivity extends BaseActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, Id.menu.option.manage_public_keys, 0, R.string.menu_managePublicKeys).setIcon( - android.R.drawable.ic_menu_manage); - menu.add(0, Id.menu.option.manage_secret_keys, 1, R.string.menu_manageSecretKeys).setIcon( - android.R.drawable.ic_menu_manage); - menu.add(2, Id.menu.option.preferences, 3, R.string.menu_preferences).setIcon( - android.R.drawable.ic_menu_preferences); - menu.add(2, Id.menu.option.key_server, 4, R.string.menu_keyServer).setIcon( - android.R.drawable.ic_menu_search); - menu.add(3, Id.menu.option.about, 5, R.string.menu_about).setIcon( - android.R.drawable.ic_menu_info_details); - menu.add(3, Id.menu.option.help, 6, R.string.menu_help).setIcon( - android.R.drawable.ic_menu_help); + menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences) + .setIcon(R.drawable.ic_menu_settings_holo_light) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + menu.add(0, Id.menu.option.about, 1, R.string.menu_about).setShowAsAction( + MenuItem.SHOW_AS_ACTION_IF_ROOM); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case Id.menu.option.create: { - showDialog(Id.dialog.new_account); - return true; - } - - case Id.menu.option.manage_public_keys: { - startActivity(new Intent(this, PublicKeyListActivity.class)); - return true; - } - - case Id.menu.option.manage_secret_keys: { - startActivity(new Intent(this, SecretKeyListActivity.class)); + case Id.menu.option.about: { + startActivity(new Intent(this, AboutActivity.class)); return true; } - case Id.menu.option.help: { - showDialog(Id.dialog.help); - return true; - } - - case Id.menu.option.key_server: { - startActivity(new Intent(this, KeyServerQueryActivity.class)); + case Id.menu.option.preferences: { + startActivity(new Intent(this, PreferencesActivity.class)); return true; } default: { - return super.onOptionsItemSelected(item); + break; } } + return false; } + // @Override + // public boolean onCreateOptionsMenu(Menu menu) { + // menu.add(2, Id.menu.option.preferences, 3, R.string.menu_preferences).setIcon( + // android.R.drawable.ic_menu_preferences); + // menu.add(2, Id.menu.option.key_server, 4, R.string.menu_keyServer).setIcon( + // android.R.drawable.ic_menu_search); + // menu.add(3, Id.menu.option.about, 5, R.string.menu_about).setIcon( + // android.R.drawable.ic_menu_info_details); + // menu.add(3, Id.menu.option.help, 6, R.string.menu_help).setIcon( + // android.R.drawable.ic_menu_help); + // return true; + // } + // + // @Override + // public boolean onOptionsItemSelected(MenuItem item) { + // switch (item.getItemId()) { + // case Id.menu.option.create: { + // showDialog(Id.dialog.new_account); + // return true; + // } + // + // case Id.menu.option.manage_public_keys: { + // startActivity(new Intent(this, PublicKeyListActivity.class)); + // return true; + // } + // + // case Id.menu.option.manage_secret_keys: { + // startActivity(new Intent(this, SecretKeyListActivity.class)); + // return true; + // } + // + // case Id.menu.option.help: { + // showDialog(Id.dialog.help); + // return true; + // } + // + // case Id.menu.option.key_server: { + // startActivity(new Intent(this, KeyServerQueryActivity.class)); + // return true; + // } + // + // default: { + // return super.onOptionsItemSelected(item); + // } + // } + // } + @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); |