diff options
Diffstat (limited to 'org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java')
-rw-r--r-- | org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java | 117 |
1 files changed, 4 insertions, 113 deletions
diff --git a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java index 51cba35db..dbcdfcdcb 100644 --- a/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java +++ b/org_apg/src/org/thialfihar/android/apg/ui/MainActivity.java @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de> * Copyright (C) 2010 Thialfihar <thi@thialfihar.org> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,13 +29,9 @@ import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import android.app.Dialog; import android.content.Intent; import android.os.Bundle; -import android.view.ContextMenu; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View; -import android.widget.TextView; public class MainActivity extends SherlockActivity { static { @@ -80,94 +77,6 @@ public class MainActivity extends SherlockActivity { actionBar.setDisplayShowTitleEnabled(true); actionBar.setDisplayHomeAsUpEnabled(false); actionBar.setHomeButtonEnabled(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(); - // } - - default: { - return super.onCreateDialog(id); - } - } } @Override @@ -175,40 +84,22 @@ public class MainActivity extends SherlockActivity { menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences) .setIcon(R.drawable.ic_menu_settings) .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - menu.add(0, Id.menu.option.about, 1, R.string.menu_about).setIcon(R.drawable.ic_menu_about) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case Id.menu.option.about: { - startActivity(new Intent(this, AboutActivity.class)); - return true; - } - case Id.menu.option.preferences: { + case Id.menu.option.preferences: startActivity(new Intent(this, PreferencesActivity.class)); return true; - } - default: { + default: break; - } - } - return false; - } - - @Override - public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { - super.onCreateContextMenu(menu, v, menuInfo); - TextView nameTextView = (TextView) v.findViewById(R.id.accountName); - if (nameTextView != null) { - menu.setHeaderTitle(nameTextView.getText()); - menu.add(0, Id.menu.delete, 0, R.string.menu_deleteAccount); } + return false; } }
\ No newline at end of file |