From 09741b02863b138846f3747a19dc40a3518b9aa0 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 17 Apr 2010 23:36:47 +0000 Subject: use OI File Manager intents to handle open/save file selection --- src/org/thialfihar/android/apg/MainActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 531441c1d..1c0361dec 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -72,6 +72,8 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.main); + Apg.initialize(this); + Button encryptMessageButton = (Button) findViewById(R.id.btn_encryptMessage); Button decryptMessageButton = (Button) findViewById(R.id.btn_decryptMessage); mAccounts = (ListView) findViewById(R.id.account_list); @@ -220,9 +222,7 @@ public class MainActivity extends Activity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - " * display signed-only mails\n" + - " * verify signed-only mails\n" + - " * bug fixes, layout fixes\n" + + " * OI File Manager support\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From d5c5a2c43b3ffda4183cf8d57eb585613ed4906e Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Mon, 19 Apr 2010 02:12:13 +0000 Subject: major restructuring, moving dialog, message, menu, option menu, task, type IDs into Id in a similar structure as the generated R, also introducing a BaseActivity class that almost all activities derive from, which generates some common dialogs, handles the progress update, thread management, and thread communication also adding first draft of encrypt file activity, not very functional yet --- src/org/thialfihar/android/apg/MainActivity.java | 80 ++++++++++++++---------- 1 file changed, 46 insertions(+), 34 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 1c0361dec..8cd9df6bf 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -51,17 +51,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.AdapterView.OnItemClickListener; -public class MainActivity extends Activity { - private static final int DIALOG_NEW_ACCOUNT = 1; - private static final int DIALOG_ABOUT = 2; - private static final int DIALOG_CHANGE_LOG = 3; - - private static final int OPTION_MENU_ADD_ACCOUNT = 1; - private static final int OPTION_MENU_ABOUT = 2; - private static final int OPTION_MENU_MANAGE_PUBLIC_KEYS = 3; - private static final int OPTION_MENU_MANAGE_SECRET_KEYS = 4; - - private static final int MENU_DELETE_ACCOUNT = 1; +public class MainActivity extends BaseActivity { private static String PREF_SEEN_CHANGE_LOG = "seenChangeLogDialog" + Apg.VERSION; @@ -72,10 +62,10 @@ public class MainActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.main); - Apg.initialize(this); - Button encryptMessageButton = (Button) findViewById(R.id.btn_encryptMessage); Button decryptMessageButton = (Button) findViewById(R.id.btn_decryptMessage); + Button encryptFileButton = (Button) findViewById(R.id.btn_encryptFile); + Button decryptFileButton = (Button) findViewById(R.id.btn_decryptFile); mAccounts = (ListView) findViewById(R.id.account_list); encryptMessageButton.setOnClickListener(new OnClickListener() { @@ -92,6 +82,20 @@ public class MainActivity extends Activity { } }); + encryptFileButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + startEncryptFileActivity(); + } + }); + + decryptFileButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + startDecryptFileActivity(); + } + }); + Cursor accountCursor = managedQuery(Accounts.CONTENT_URI, null, null, null, null); mAccounts.setAdapter(new AccountListAdapter(this, accountCursor)); @@ -113,14 +117,14 @@ public class MainActivity extends Activity { SharedPreferences prefs = getPreferences(MODE_PRIVATE); if (!prefs.getBoolean(PREF_SEEN_CHANGE_LOG, false)) { - showDialog(DIALOG_CHANGE_LOG); + showDialog(Id.dialog.change_log); } } @Override protected Dialog onCreateDialog(int id) { switch (id) { - case DIALOG_NEW_ACCOUNT: { + case Id.dialog.new_account: { AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle("Add Account"); @@ -132,7 +136,7 @@ public class MainActivity extends Activity { alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(DIALOG_NEW_ACCOUNT); + MainActivity.this.removeDialog(Id.dialog.new_account); String accountName = "" + input.getText(); Cursor testCursor = @@ -165,14 +169,14 @@ public class MainActivity extends Activity { alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(DIALOG_NEW_ACCOUNT); + MainActivity.this.removeDialog(Id.dialog.new_account); } }); return alert.create(); } - case DIALOG_ABOUT: { + case Id.dialog.about: { AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle("About " + Apg.FULL_VERSION); @@ -205,14 +209,14 @@ public class MainActivity extends Activity { alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(DIALOG_ABOUT); + MainActivity.this.removeDialog(Id.dialog.about); } }); return alert.create(); } - case DIALOG_CHANGE_LOG: { + case Id.dialog.change_log: { AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle("Changes " + Apg.FULL_VERSION); @@ -246,7 +250,7 @@ public class MainActivity extends Activity { alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(DIALOG_CHANGE_LOG); + MainActivity.this.removeDialog(Id.dialog.change_log); SharedPreferences prefs = getPreferences(MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); editor.putBoolean(PREF_SEEN_CHANGE_LOG, true); @@ -261,18 +265,19 @@ public class MainActivity extends Activity { break; } } + return super.onCreateDialog(id); } @Override public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, OPTION_MENU_MANAGE_PUBLIC_KEYS, 0, R.string.menu_managePublicKeys) + menu.add(0, Id.menu.option.manage_public_keys, 0, R.string.menu_managePublicKeys) .setIcon(android.R.drawable.ic_menu_manage); - menu.add(0, OPTION_MENU_MANAGE_SECRET_KEYS, 1, R.string.menu_manageSecretKeys) + menu.add(0, Id.menu.option.manage_secret_keys, 1, R.string.menu_manageSecretKeys) .setIcon(android.R.drawable.ic_menu_manage); - menu.add(1, OPTION_MENU_ADD_ACCOUNT, 2, R.string.menu_addAccount) + menu.add(1, Id.menu.option.create, 2, R.string.menu_addAccount) .setIcon(android.R.drawable.ic_menu_add); - menu.add(1, OPTION_MENU_ABOUT, 3, R.string.menu_about) + menu.add(1, Id.menu.option.about, 3, R.string.menu_about) .setIcon(android.R.drawable.ic_menu_info_details); return true; } @@ -280,22 +285,22 @@ public class MainActivity extends Activity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case OPTION_MENU_ADD_ACCOUNT: { - showDialog(DIALOG_NEW_ACCOUNT); + case Id.menu.option.create: { + showDialog(Id.dialog.new_account); return true; } - case OPTION_MENU_ABOUT: { - showDialog(DIALOG_ABOUT); + case Id.menu.option.about: { + showDialog(Id.dialog.about); return true; } - case OPTION_MENU_MANAGE_PUBLIC_KEYS: { + case Id.menu.option.manage_public_keys: { startPublicKeyManager(); return true; } - case OPTION_MENU_MANAGE_SECRET_KEYS: { + case Id.menu.option.manage_secret_keys: { startSecretKeyManager(); return true; } @@ -314,7 +319,7 @@ public class MainActivity extends Activity { TextView nameTextView = (TextView) v.findViewById(R.id.account_name); if (nameTextView != null) { menu.setHeaderTitle(nameTextView.getText()); - menu.add(0, MENU_DELETE_ACCOUNT, 0, "Delete Account"); + menu.add(0, Id.menu.delete, 0, "Delete Account"); } } @@ -324,7 +329,7 @@ public class MainActivity extends Activity { (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo(); switch (menuItem.getItemId()) { - case MENU_DELETE_ACCOUNT: { + case Id.menu.delete: { Uri uri = Uri.withAppendedPath(Accounts.CONTENT_URI, "" + info.id); this.getContentResolver().delete(uri, null, null); return true; @@ -342,7 +347,6 @@ public class MainActivity extends Activity { public void startSecretKeyManager() { startActivity(new Intent(this, SecretKeyListActivity.class)); - //startActivity(new Intent(this, EditKeyActivity.class)); } public void startEncryptMessageActivity() { @@ -353,6 +357,14 @@ public class MainActivity extends Activity { startActivity(new Intent(this, DecryptMessageActivity.class)); } + public void startEncryptFileActivity() { + startActivity(new Intent(this, EncryptFileActivity.class)); + } + + public void startDecryptFileActivity() { + //startActivity(new Intent(this, DecryptFileActivity.class)); + } + public void startMailListActivity(String account) { startActivity(new Intent(this, MailListActivity.class).putExtra("account", account)); } -- cgit v1.2.3 From 26cf672d67219ea81c920ef96f6c0756682a7635 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Mon, 19 Apr 2010 13:56:43 +0000 Subject: set svn:ignore for bin directory and .project/.classpath asymmetric file encryption working, some more cleanup, introduced an application directory to encrypt to by default --- src/org/thialfihar/android/apg/MainActivity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 8cd9df6bf..b1c656207 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -52,9 +52,6 @@ import android.widget.Toast; import android.widget.AdapterView.OnItemClickListener; public class MainActivity extends BaseActivity { - - private static String PREF_SEEN_CHANGE_LOG = "seenChangeLogDialog" + Apg.VERSION; - private ListView mAccounts = null; @Override @@ -116,7 +113,7 @@ public class MainActivity extends BaseActivity { registerForContextMenu(mAccounts); SharedPreferences prefs = getPreferences(MODE_PRIVATE); - if (!prefs.getBoolean(PREF_SEEN_CHANGE_LOG, false)) { + if (!prefs.getBoolean(Constants.pref.has_seen_change_log, false)) { showDialog(Id.dialog.change_log); } } @@ -227,6 +224,7 @@ public class MainActivity extends BaseActivity { new SpannableString("Read the warnings!\n\n" + "Changes:\n" + " * OI File Manager support\n" + + " * file encryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + @@ -253,7 +251,7 @@ public class MainActivity extends BaseActivity { MainActivity.this.removeDialog(Id.dialog.change_log); SharedPreferences prefs = getPreferences(MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean(PREF_SEEN_CHANGE_LOG, true); + editor.putBoolean(Constants.pref.has_seen_change_log, true); editor.commit(); } }); -- cgit v1.2.3 From 78193007b209a4e40867f1096972f96e2794c0c9 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 22 Apr 2010 15:30:19 +0000 Subject: added file decryption, rewrote the various "Choice" derivations to us the Id structure as well --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index b1c656207..d6b04ce92 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -360,7 +360,7 @@ public class MainActivity extends BaseActivity { } public void startDecryptFileActivity() { - //startActivity(new Intent(this, DecryptFileActivity.class)); + startActivity(new Intent(this, DecryptFileActivity.class)); } public void startMailListActivity(String account) { -- cgit v1.2.3 From 0e14dcb290d5b3c7acae1da5a64e611e293c7f06 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Fri, 23 Apr 2010 17:00:52 +0000 Subject: layout adjustments, force portrait layout for EncryptFileActivity for now, (En|De)cryptFileActivity can now handle symmetric algorithms --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index d6b04ce92..5562d6a7a 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -224,7 +224,7 @@ public class MainActivity extends BaseActivity { new SpannableString("Read the warnings!\n\n" + "Changes:\n" + " * OI File Manager support\n" + - " * file encryption\n" + + " * file encryption/decryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 2c093b3e0de564df52f08b525ffd042763a4fce8 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 24 Apr 2010 02:16:45 +0000 Subject: clean up for release, AsciiArmour was a Button instead of CheckBox... fixed --- src/org/thialfihar/android/apg/MainActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 5562d6a7a..e98601333 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -18,7 +18,6 @@ package org.thialfihar.android.apg; import org.thialfihar.android.apg.provider.Accounts; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.ContentValues; @@ -223,7 +222,7 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - " * OI File Manager support\n" + + " * OI File Manager support (install from Market)\n" + " * file encryption/decryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + -- cgit v1.2.3 From 25b8eb9d7749975bd8efe6a87cf8a304e4b2fd9e Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 24 Apr 2010 13:30:22 +0000 Subject: reset changelog for 0.9.1 --- src/org/thialfihar/android/apg/MainActivity.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index e98601333..33d79ecda 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -222,8 +222,6 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - " * OI File Manager support (install from Market)\n" + - " * file encryption/decryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 81cdd6b9433c2dd15467de780b3a584d18609070 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 24 Apr 2010 17:40:09 +0000 Subject: ElGamal support added, fix of some minor GUI bugs, added a bunch of safe primes for ElGamal key creation --- src/org/thialfihar/android/apg/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 33d79ecda..92e9bcfd2 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -222,6 +222,8 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + + "* ElGamal subkey support\n" + + "* bug fixes\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From b01a47a115ae4288f6b6e2f642837cbad3fbeaf0 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 24 Apr 2010 18:10:53 +0000 Subject: set branch to next version, reset changelog --- src/org/thialfihar/android/apg/MainActivity.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 92e9bcfd2..33d79ecda 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -222,8 +222,6 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - "* ElGamal subkey support\n" + - "* bug fixes\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 86192e39d90a329b327e6b9255b08a17ae5ede0b Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Mon, 26 Apr 2010 17:41:06 +0000 Subject: file encrypt layout entirely rewritten, should be much more userfriendly and work on more devices, changed message encrypt layout to match --- src/org/thialfihar/android/apg/MainActivity.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 33d79ecda..30551c4ad 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -222,6 +222,8 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + + "* new layout for encrypt file\n" + + "* layout more consistent\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From e83a5311aed0671c044287ca571cb88fe2bcd522 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Wed, 28 Apr 2010 23:35:11 +0000 Subject: add preferences, use them where applicable --- src/org/thialfihar/android/apg/MainActivity.java | 65 ++++++++---------------- 1 file changed, 21 insertions(+), 44 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 30551c4ad..baa875ee2 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -67,28 +67,28 @@ public class MainActivity extends BaseActivity { encryptMessageButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startEncryptMessageActivity(); + startActivity(new Intent(MainActivity.this, EncryptMessageActivity.class)); } }); decryptMessageButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startDecryptMessageActivity(); + startActivity(new Intent(MainActivity.this, DecryptMessageActivity.class)); } }); encryptFileButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startEncryptFileActivity(); + startActivity(new Intent(MainActivity.this, EncryptFileActivity.class)); } }); decryptFileButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startDecryptFileActivity(); + startActivity(new Intent(MainActivity.this, DecryptFileActivity.class)); } }); @@ -105,14 +105,14 @@ public class MainActivity extends BaseActivity { cursor.moveToFirst(); int nameIndex = cursor.getColumnIndex(Accounts.NAME); String accountName = cursor.getString(nameIndex); - startMailListActivity(accountName); + startActivity(new Intent(MainActivity.this, MailListActivity.class) + .putExtra("account", accountName)); } } }); registerForContextMenu(mAccounts); - SharedPreferences prefs = getPreferences(MODE_PRIVATE); - if (!prefs.getBoolean(Constants.pref.has_seen_change_log, false)) { + if (!hasSeenChangeLog()) { showDialog(Id.dialog.change_log); } } @@ -248,10 +248,7 @@ public class MainActivity extends BaseActivity { new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { MainActivity.this.removeDialog(Id.dialog.change_log); - SharedPreferences prefs = getPreferences(MODE_PRIVATE); - SharedPreferences.Editor editor = prefs.edit(); - editor.putBoolean(Constants.pref.has_seen_change_log, true); - editor.commit(); + setHasSeenChangeLog(true); } }); @@ -268,13 +265,15 @@ 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) + menu.add(0, Id.menu.option.preferences, 0, R.string.menu_preferences) + .setIcon(android.R.drawable.ic_menu_preferences); + menu.add(1, Id.menu.option.manage_public_keys, 1, 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) + menu.add(1, Id.menu.option.manage_secret_keys, 2, R.string.menu_manageSecretKeys) .setIcon(android.R.drawable.ic_menu_manage); - menu.add(1, Id.menu.option.create, 2, R.string.menu_addAccount) + menu.add(2, Id.menu.option.create, 3, R.string.menu_addAccount) .setIcon(android.R.drawable.ic_menu_add); - menu.add(1, Id.menu.option.about, 3, R.string.menu_about) + menu.add(2, Id.menu.option.about, 4, R.string.menu_about) .setIcon(android.R.drawable.ic_menu_info_details); return true; } @@ -293,12 +292,17 @@ public class MainActivity extends BaseActivity { } case Id.menu.option.manage_public_keys: { - startPublicKeyManager(); + startActivity(new Intent(this, PublicKeyListActivity.class)); return true; } case Id.menu.option.manage_secret_keys: { - startSecretKeyManager(); + startActivity(new Intent(this, SecretKeyListActivity.class)); + return true; + } + + case Id.menu.option.preferences: { + startActivity(new Intent(this, PreferencesActivity.class)); return true; } @@ -338,33 +342,6 @@ public class MainActivity extends BaseActivity { } } - public void startPublicKeyManager() { - startActivity(new Intent(this, PublicKeyListActivity.class)); - } - - public void startSecretKeyManager() { - startActivity(new Intent(this, SecretKeyListActivity.class)); - } - - public void startEncryptMessageActivity() { - startActivity(new Intent(this, EncryptMessageActivity.class)); - } - - public void startDecryptMessageActivity() { - startActivity(new Intent(this, DecryptMessageActivity.class)); - } - - public void startEncryptFileActivity() { - startActivity(new Intent(this, EncryptFileActivity.class)); - } - - public void startDecryptFileActivity() { - startActivity(new Intent(this, DecryptFileActivity.class)); - } - - public void startMailListActivity(String account) { - startActivity(new Intent(this, MailListActivity.class).putExtra("account", account)); - } private static class AccountListAdapter extends CursorAdapter { private LayoutInflater minflater; -- cgit v1.2.3 From a03781545413d65182b911a1d61fe71595544ac4 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 29 Apr 2010 01:18:42 +0000 Subject: removed some useless imports --- src/org/thialfihar/android/apg/MainActivity.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index baa875ee2..76c5341b9 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -24,7 +24,6 @@ import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.SharedPreferences; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; -- cgit v1.2.3 From f01c1a6679168791c729a760747023a8613aa1f0 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 29 Apr 2010 01:47:04 +0000 Subject: updated changes dialog --- src/org/thialfihar/android/apg/MainActivity.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 76c5341b9..3e3ef6831 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -223,6 +223,7 @@ public class MainActivity extends BaseActivity { "Changes:\n" + "* new layout for encrypt file\n" + "* layout more consistent\n" + + "* settings for preferred algorithms\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From a6fe3364d10b978f0de3fc785bf2461c10ed9c8d Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 29 Apr 2010 10:55:50 +0000 Subject: changed the option menu item order --- src/org/thialfihar/android/apg/MainActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 3e3ef6831..71619fb1f 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -265,14 +265,14 @@ public class MainActivity extends BaseActivity { @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.create, 0, R.string.menu_addAccount) + .setIcon(android.R.drawable.ic_menu_add); menu.add(1, Id.menu.option.manage_public_keys, 1, R.string.menu_managePublicKeys) .setIcon(android.R.drawable.ic_menu_manage); menu.add(1, Id.menu.option.manage_secret_keys, 2, R.string.menu_manageSecretKeys) .setIcon(android.R.drawable.ic_menu_manage); - menu.add(2, Id.menu.option.create, 3, R.string.menu_addAccount) - .setIcon(android.R.drawable.ic_menu_add); + 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.about, 4, R.string.menu_about) .setIcon(android.R.drawable.ic_menu_info_details); return true; -- cgit v1.2.3 From dc5125787d51da22374699718e72a1979243dc1b Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 29 Apr 2010 11:51:34 +0000 Subject: updated changes dialog --- src/org/thialfihar/android/apg/MainActivity.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 71619fb1f..72780fb53 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -224,6 +224,7 @@ public class MainActivity extends BaseActivity { "* new layout for encrypt file\n" + "* layout more consistent\n" + "* settings for preferred algorithms\n" + + "* fixed hushmail key bugs\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 95e02158d866c67b281f12d66fc5b147eb1eb137 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 29 Apr 2010 13:31:10 +0000 Subject: increased app version and cleared change log for 0.9.3 --- src/org/thialfihar/android/apg/MainActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 72780fb53..9b1f7afa4 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -221,10 +221,6 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - "* new layout for encrypt file\n" + - "* layout more consistent\n" + - "* settings for preferred algorithms\n" + - "* fixed hushmail key bugs\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From e542c37eb3a673e72775f4eab26ca093281e5656 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 4 May 2010 14:07:18 +0000 Subject: use buffers for encryption, so large files work as well... also showing encryption progress with better accuracy, which is especially useful for large encryptions Fixes issue 18. --- src/org/thialfihar/android/apg/MainActivity.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 9b1f7afa4..31035a5d9 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -221,6 +221,9 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + + "* fixed several crashes\n" + + "* can encrypt large files\n" + + "* better progress bar calculation\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 3008f2c51f00e4e948cb330ad6f74b1b4e734620 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 4 May 2010 15:56:55 +0000 Subject: added an option to delete files after encryption or decryption, also no longer delete the output file if either fails --- src/org/thialfihar/android/apg/MainActivity.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 31035a5d9..3e15b45c9 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -221,6 +221,7 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + + "* option to delete file after encryption/decryption\n" + "* fixed several crashes\n" + "* can encrypt large files\n" + "* better progress bar calculation\n" + -- cgit v1.2.3 From 2e1aad0f81c1511c741b391b4d8254f92ba56271 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 4 May 2010 23:19:39 +0000 Subject: reset changelog for 0.9.4 --- src/org/thialfihar/android/apg/MainActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 3e15b45c9..9b1f7afa4 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -221,10 +221,6 @@ public class MainActivity extends BaseActivity { SpannableString info = new SpannableString("Read the warnings!\n\n" + "Changes:\n" + - "* option to delete file after encryption/decryption\n" + - "* fixed several crashes\n" + - "* can encrypt large files\n" + - "* better progress bar calculation\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 73888622f4d4d73c80cf877444dade3cf9470831 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 9 May 2010 13:29:30 +0000 Subject: added a button to encrypt to clipboard, change log and about window got their own layout now with proper linkification --- src/org/thialfihar/android/apg/MainActivity.java | 84 ++++++++++-------------- 1 file changed, 35 insertions(+), 49 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 9b1f7afa4..3a2493315 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -24,6 +24,7 @@ import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.res.ColorStateList; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; @@ -175,31 +176,19 @@ public class MainActivity extends BaseActivity { AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle("About " + Apg.FULL_VERSION); - ScrollView scrollView = new ScrollView(this); - TextView message = new TextView(this); - - SpannableString info = - new SpannableString("This is an attempt to bring OpenPGP to Android. " + - "It is far from complete, but more features are " + - "planned (see website).\n" + - "\n" + - "Feel free to send bug reports, suggestions, feature " + - "requests, feedback, photographs.\n" + - "\n" + - "mail: thi@thialfihar.org\n" + - "site: http://apg.thialfihar.org\n" + - "\n" + - "This software is provided \"as is\", without " + - "warranty of any kind."); - Linkify.addLinks(info, Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES); - message.setMovementMethod(LinkMovementMethod.getInstance()); - message.setText(info); - // 5dip padding - int padding = (int) (10 * getResources().getDisplayMetrics().densityDpi / 160); - message.setPadding(padding, padding, padding, padding); - message.setTextAppearance(this, android.R.style.TextAppearance_Medium); - scrollView.addView(message); - alert.setView(scrollView); + + 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("This is an attempt to bring OpenPGP to Android. " + + "It is far from complete, but more features are planned (see website).\n\n" + + "Feel free to send bug reports, suggestions, feature requests, feedback, " + + "photographs.\n\n" + + "mail: thi@thialfihar.org\n" + + "site: http://apg.thialfihar.org\n\n" + + "This software is provided \"as is\", without warranty of any kind."); + alert.setView(layout); alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @@ -215,30 +204,27 @@ public class MainActivity extends BaseActivity { AlertDialog.Builder alert = new AlertDialog.Builder(this); alert.setTitle("Changes " + Apg.FULL_VERSION); - ScrollView scrollView = new ScrollView(this); - TextView message = new TextView(this); - - SpannableString info = - new SpannableString("Read the warnings!\n\n" + - "Changes:\n" + - "\n" + - "WARNING: be careful editing your existing keys, as they " + - "WILL be stripped of certificates right now.\n" + - "WARNING: key creation/editing doesn't support all " + - "GPG features yet. In particular: " + - "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."); - message.setText(info); - // 5dip padding - int padding = (int) (10 * getResources().getDisplayMetrics().densityDpi / 160); - message.setPadding(padding, padding, padding, padding); - message.setTextAppearance(this, android.R.style.TextAppearance_Medium); - scrollView.addView(message); - alert.setView(scrollView); + 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("Read the warnings!\n\n" + + "Changes:\n" + + "* encrypt to clipboard\n" + + "\n" + + "WARNING: be careful editing your existing keys, as they " + + "WILL be stripped of certificates right now.\n" + + "\n" + + "WARNING: key creation/editing doesn't support all " + + "GPG features yet. In particular: " + + "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, -- cgit v1.2.3 From 6e3f1822915c40e1f24822b667ce8dcfcd5c7258 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 9 May 2010 13:38:05 +0000 Subject: minor --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 3a2493315..376b47e78 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -195,7 +195,7 @@ public class MainActivity extends BaseActivity { public void onClick(DialogInterface dialog, int id) { MainActivity.this.removeDialog(Id.dialog.about); } - }); + }); return alert.create(); } -- cgit v1.2.3 From 5e73b696d1ff7d39df933a6de5f89b46f8ace22a Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sun, 9 May 2010 19:51:21 +0000 Subject: new EncryptActivity to handle message and file encryption all in one --- src/org/thialfihar/android/apg/MainActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 376b47e78..8a8d57a89 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -24,14 +24,10 @@ import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.res.ColorStateList; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; import android.os.Bundle; -import android.text.SpannableString; -import android.text.method.LinkMovementMethod; -import android.text.util.Linkify; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.Menu; @@ -45,7 +41,6 @@ import android.widget.Button; import android.widget.CursorAdapter; import android.widget.EditText; import android.widget.ListView; -import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; import android.widget.AdapterView.OnItemClickListener; @@ -67,7 +62,9 @@ public class MainActivity extends BaseActivity { encryptMessageButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this, EncryptMessageActivity.class)); + Intent intent = new Intent(MainActivity.this, EncryptActivity.class); + intent.setAction(Apg.Intent.ENCRYPT); + startActivity(intent); } }); @@ -81,7 +78,9 @@ public class MainActivity extends BaseActivity { encryptFileButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this, EncryptFileActivity.class)); + Intent intent = new Intent(MainActivity.this, EncryptActivity.class); + intent.setAction(Apg.Intent.ENCRYPT_FILE); + startActivity(intent); } }); @@ -212,6 +211,7 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + "* encrypt to clipboard\n" + + "* new encrypt GUI to handle everything\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From e36e8f1deaccd35e48bbb4080c744695e915dc4c Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 11 May 2010 14:07:15 +0000 Subject: merged DecryptMessageActivity and DecryptFileActivity into one DecryptActivity as well --- src/org/thialfihar/android/apg/MainActivity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 8a8d57a89..049022656 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -71,7 +71,9 @@ public class MainActivity extends BaseActivity { decryptMessageButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this, DecryptMessageActivity.class)); + Intent intent = new Intent(MainActivity.this, DecryptActivity.class); + intent.setAction(Apg.Intent.DECRYPT); + startActivity(intent); } }); @@ -87,7 +89,9 @@ public class MainActivity extends BaseActivity { decryptFileButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(MainActivity.this, DecryptFileActivity.class)); + Intent intent = new Intent(MainActivity.this, DecryptActivity.class); + intent.setAction(Apg.Intent.DECRYPT_FILE); + startActivity(intent); } }); @@ -211,7 +215,7 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + "* encrypt to clipboard\n" + - "* new encrypt GUI to handle everything\n" + + "* new encrypt/decrypt GUI to handle everything\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 5a7e3e39380a1166808c7a486f37650b086a7bbe Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 11 May 2010 17:36:10 +0000 Subject: brought change log up to date --- src/org/thialfihar/android/apg/MainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 049022656..9bc358ae7 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -214,8 +214,10 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* encrypt to clipboard\n" + + "* Android 1.5 support, please let me know if there are problems\n" + "* new encrypt/decrypt GUI to handle everything\n" + + "* symmetric encryption of messages\n" + + "* encrypt to clipboard\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 5f6a0989142665682024e155ea016c786033cd48 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Tue, 11 May 2010 21:34:00 +0000 Subject: lifted version to 0.9.5 and cleared change log --- src/org/thialfihar/android/apg/MainActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 9bc358ae7..39e9b7aa9 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -214,10 +214,6 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* Android 1.5 support, please let me know if there are problems\n" + - "* new encrypt/decrypt GUI to handle everything\n" + - "* symmetric encryption of messages\n" + - "* encrypt to clipboard\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From b527ae8b6d3239dc5ade65dec424d30856bc77e5 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 13 May 2010 20:41:32 +0000 Subject: a lot of renaming of IDs, following a strict naming scheme again, moved most strings into string.xml in preparation for internationalization, APG.java still has to be changed to allow that, as it isn't Context aware in most methods --- src/org/thialfihar/android/apg/MainActivity.java | 76 ++++++++++++------------ 1 file changed, 39 insertions(+), 37 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 39e9b7aa9..4bf585df4 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -57,7 +57,7 @@ public class MainActivity extends BaseActivity { Button decryptMessageButton = (Button) findViewById(R.id.btn_decryptMessage); Button encryptFileButton = (Button) findViewById(R.id.btn_encryptFile); Button decryptFileButton = (Button) findViewById(R.id.btn_decryptFile); - mAccounts = (ListView) findViewById(R.id.account_list); + mAccounts = (ListView) findViewById(R.id.accounts); encryptMessageButton.setOnClickListener(new OnClickListener() { @Override @@ -126,44 +126,46 @@ public class MainActivity extends BaseActivity { case Id.dialog.new_account: { AlertDialog.Builder alert = new AlertDialog.Builder(this); - alert.setTitle("Add Account"); - alert.setMessage("Specify the Google Mail account you want to add."); + alert.setTitle(R.string.title_addAccount); + alert.setMessage(R.string.specifyGoogleMailAccount); final EditText input = new EditText(this); alert.setView(input); alert.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(Id.dialog.new_account); - String accountName = "" + input.getText(); - - Cursor testCursor = - managedQuery(Uri.parse("content://gmail-ls/conversations/" + - accountName), - null, null, null, null); - if (testCursor == null) { - Toast.makeText(MainActivity.this, - "Error: account '" + accountName + - "' not found", - Toast.LENGTH_SHORT).show(); - return; - } - - ContentValues values = new ContentValues(); - values.put(Accounts.NAME, accountName); - try { - MainActivity.this.getContentResolver() - .insert(Accounts.CONTENT_URI, - values); - } catch (SQLException e) { - Toast.makeText(MainActivity.this, - "Error: failed to add account '" + - accountName + "'", - Toast.LENGTH_SHORT).show(); - } - } - }); + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + MainActivity.this.removeDialog(Id.dialog.new_account); + String accountName = "" + input.getText(); + + Cursor testCursor = + managedQuery(Uri.parse("content://gmail-ls/conversations/" + + accountName), + null, null, null, null); + if (testCursor == null) { + Toast.makeText(MainActivity.this, + getString(R.string.errorMessage, + getString(R.string.error_accountNotFound, + accountName)), + Toast.LENGTH_SHORT).show(); + return; + } + + ContentValues values = new ContentValues(); + values.put(Accounts.NAME, accountName); + try { + MainActivity.this.getContentResolver() + .insert(Accounts.CONTENT_URI, + values); + } catch (SQLException e) { + Toast.makeText(MainActivity.this, + getString(R.string.errorMessage, + getString(R.string.error_addingAccountFailed, + accountName)), + Toast.LENGTH_SHORT).show(); + } + } + }); alert.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @@ -302,10 +304,10 @@ public class MainActivity extends BaseActivity { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); - TextView nameTextView = (TextView) v.findViewById(R.id.account_name); + TextView nameTextView = (TextView) v.findViewById(R.id.accountName); if (nameTextView != null) { menu.setHeaderTitle(nameTextView.getText()); - menu.add(0, Id.menu.delete, 0, "Delete Account"); + menu.add(0, Id.menu.delete, 0, R.string.menu_deleteAccount); } } @@ -348,7 +350,7 @@ public class MainActivity extends BaseActivity { @Override public void bindView(View view, Context context, Cursor cursor) { - TextView nameTextView = (TextView) view.findViewById(R.id.account_name); + TextView nameTextView = (TextView) view.findViewById(R.id.accountName); int nameIndex = cursor.getColumnIndex(Accounts.NAME); final String account = cursor.getString(nameIndex); nameTextView.setText(account); -- cgit v1.2.3 From 2c5a80a16f3699287971b3fcdf38fbb4c42b84ae Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Sat, 15 May 2010 16:09:49 +0000 Subject: added pass phrase cache to preferences, not used yet, but preference and about menu item now show up in every activity --- src/org/thialfihar/android/apg/MainActivity.java | 45 ++---------------------- 1 file changed, 2 insertions(+), 43 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 4bf585df4..a4d584304 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -177,34 +177,6 @@ public class MainActivity extends BaseActivity { return alert.create(); } - case Id.dialog.about: { - AlertDialog.Builder alert = new AlertDialog.Builder(this); - - alert.setTitle("About " + Apg.FULL_VERSION); - - 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("This is an attempt to bring OpenPGP to Android. " + - "It is far from complete, but more features are planned (see website).\n\n" + - "Feel free to send bug reports, suggestions, feature requests, feedback, " + - "photographs.\n\n" + - "mail: thi@thialfihar.org\n" + - "site: http://apg.thialfihar.org\n\n" + - "This software is provided \"as is\", without warranty of any kind."); - alert.setView(layout); - - alert.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - MainActivity.this.removeDialog(Id.dialog.about); - } - }); - - return alert.create(); - } - case Id.dialog.change_log: { AlertDialog.Builder alert = new AlertDialog.Builder(this); @@ -243,11 +215,9 @@ public class MainActivity extends BaseActivity { } default: { - break; + return super.onCreateDialog(id); } } - - return super.onCreateDialog(id); } @Override @@ -273,11 +243,6 @@ public class MainActivity extends BaseActivity { return true; } - case Id.menu.option.about: { - showDialog(Id.dialog.about); - return true; - } - case Id.menu.option.manage_public_keys: { startActivity(new Intent(this, PublicKeyListActivity.class)); return true; @@ -288,16 +253,10 @@ public class MainActivity extends BaseActivity { return true; } - case Id.menu.option.preferences: { - startActivity(new Intent(this, PreferencesActivity.class)); - return true; - } - default: { - break; + return super.onOptionsItemSelected(item); } } - return false; } @Override -- cgit v1.2.3 From b6ac47e46c70d46c3479014ba827fb4bc36ce738 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Wed, 19 May 2010 14:12:13 +0000 Subject: updated change log --- src/org/thialfihar/android/apg/MainActivity.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index a4d584304..2d793277e 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,6 +188,10 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + + "* pass phrase cache\n" + + "* decrypt emails from k9mail via More -> Forward (alternate)\n" + + "* compression preferences\n" + + "* accurate decrypt progress bar\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 6d107f3498c4ad092e88771439c4b0032bf540d2 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Wed, 19 May 2010 16:33:02 +0000 Subject: promoted to next version --- src/org/thialfihar/android/apg/MainActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 2d793277e..a4d584304 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,10 +188,6 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* pass phrase cache\n" + - "* decrypt emails from k9mail via More -> Forward (alternate)\n" + - "* compression preferences\n" + - "* accurate decrypt progress bar\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From e9785168de72179154f4a8f75b3aa59941992905 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 20 May 2010 22:06:26 +0000 Subject: added changes of 0.9.5 back and added the import fix, gonna release this on its own, as it is definitely a bug that affected many --- src/org/thialfihar/android/apg/MainActivity.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index a4d584304..b9409a80d 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,6 +188,11 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + + "* pass phrase cache\n" + + "* decrypt emails from k9mail via More -> Forward (alternate)\n" + + "* compression preferences\n" + + "* accurate decrypt progress bar\n" + + "* fixed import of keys from Enigmail (and others)" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 0cda18e3577c15ed86c40920b518e0f0ccff7f66 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 20 May 2010 22:17:17 +0000 Subject: preparing for version 0.9.7 --- src/org/thialfihar/android/apg/MainActivity.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index b9409a80d..a4d584304 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,11 +188,6 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* pass phrase cache\n" + - "* decrypt emails from k9mail via More -> Forward (alternate)\n" + - "* compression preferences\n" + - "* accurate decrypt progress bar\n" + - "* fixed import of keys from Enigmail (and others)" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From e72cd83286c111050bd3c039be73e9c37723aa18 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Fri, 21 May 2010 02:50:07 +0000 Subject: added changes of 0.9.6 back, will release this as another quickfix due to the decryption bug --- src/org/thialfihar/android/apg/MainActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index a4d584304..ed08262b8 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,6 +188,12 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + + "* pass phrase cache\n" + + "* decrypt emails from k9mail via More -> Forward (alternate)\n" + + "* compression preferences\n" + + "* accurate decrypt progress bar\n" + + "* fixed import of keys from Enigmail (and others)\n" + + "* fixed recent decryption bug for symmetric encryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From 97745873e73c0b740b9966948fbff96f4935f82c Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Fri, 21 May 2010 03:04:02 +0000 Subject: lifting branch to 0.9.8 --- src/org/thialfihar/android/apg/MainActivity.java | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index ed08262b8..a4d584304 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -188,12 +188,6 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* pass phrase cache\n" + - "* decrypt emails from k9mail via More -> Forward (alternate)\n" + - "* compression preferences\n" + - "* accurate decrypt progress bar\n" + - "* fixed import of keys from Enigmail (and others)\n" + - "* fixed recent decryption bug for symmetric encryption\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From eed42b2e34d6ba7e6eda43640eb3bb1555d9e24f Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Fri, 28 May 2010 07:04:01 +0000 Subject: fully removed old DataProvider for now, manage queries, clean up old database stuff --- src/org/thialfihar/android/apg/MainActivity.java | 45 +++++++++++++++--------- 1 file changed, 29 insertions(+), 16 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index a4d584304..cdb79f1bf 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -47,6 +47,8 @@ import android.widget.AdapterView.OnItemClickListener; public class MainActivity extends BaseActivity { private ListView mAccounts = null; + private AccountListAdapter mListAdapter = null; + private Cursor mAccountCursor; @Override public void onCreate(Bundle savedInstanceState) { @@ -95,22 +97,22 @@ public class MainActivity extends BaseActivity { } }); - Cursor accountCursor = managedQuery(Accounts.CONTENT_URI, null, null, null, null); + mAccountCursor = + Apg.getDatabase().db().query(Accounts.TABLE_NAME, + new String[] { + Accounts._ID, + Accounts.NAME, + }, null, null, null, null, Accounts.NAME + " ASC"); + startManagingCursor(mAccountCursor); - mAccounts.setAdapter(new AccountListAdapter(this, accountCursor)); + mListAdapter = new AccountListAdapter(this, mAccountCursor); + mAccounts.setAdapter(mListAdapter); mAccounts.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView arg0, View view, int index, long id) { - Cursor cursor = - managedQuery(Uri.withAppendedPath(Accounts.CONTENT_URI, "" + id), null, - null, null, null); - if (cursor != null && cursor.getCount() > 0) { - cursor.moveToFirst(); - int nameIndex = cursor.getColumnIndex(Accounts.NAME); - String accountName = cursor.getString(nameIndex); - startActivity(new Intent(MainActivity.this, MailListActivity.class) + String accountName = (String) mAccounts.getSelectedItem(); + startActivity(new Intent(MainActivity.this, MailListActivity.class) .putExtra("account", accountName)); - } } }); registerForContextMenu(mAccounts); @@ -154,9 +156,10 @@ public class MainActivity extends BaseActivity { ContentValues values = new ContentValues(); values.put(Accounts.NAME, accountName); try { - MainActivity.this.getContentResolver() - .insert(Accounts.CONTENT_URI, - values); + Apg.getDatabase().db().insert(Accounts.TABLE_NAME, + Accounts.NAME, values); + mAccountCursor.requery(); + mListAdapter.notifyDataSetChanged(); } catch (SQLException e) { Toast.makeText(MainActivity.this, getString(R.string.errorMessage, @@ -277,8 +280,11 @@ public class MainActivity extends BaseActivity { switch (menuItem.getItemId()) { case Id.menu.delete: { - Uri uri = Uri.withAppendedPath(Accounts.CONTENT_URI, "" + info.id); - this.getContentResolver().delete(uri, null, null); + Apg.getDatabase().db().delete(Accounts.TABLE_NAME, + Accounts._ID + " = ?", + new String[] { "" + info.id }); + mAccountCursor.requery(); + mListAdapter.notifyDataSetChanged(); return true; } @@ -297,6 +303,13 @@ public class MainActivity extends BaseActivity { minflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } + @Override + public Object getItem(int position) { + Cursor c = getCursor(); + c.moveToPosition(position); + return c.getString(c.getColumnIndex(Accounts.NAME)); + } + @Override public int getCount() { return super.getCount(); -- cgit v1.2.3 From 24a53d548b1b2b8e09d72491197228248da2fa41 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Mon, 31 May 2010 23:15:20 +0000 Subject: use string constants for bundle keys, first Intent for k9mail --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index cdb79f1bf..ef3623ecb 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -112,7 +112,7 @@ public class MainActivity extends BaseActivity { public void onItemClick(AdapterView arg0, View view, int index, long id) { String accountName = (String) mAccounts.getSelectedItem(); startActivity(new Intent(MainActivity.this, MailListActivity.class) - .putExtra("account", accountName)); + .putExtra(Apg.EXTRA_ACCOUNT, accountName)); } }); registerForContextMenu(mAccounts); -- cgit v1.2.3 From c2ecd48d195e64b6971033999a742e8e165c59d0 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Wed, 2 Jun 2010 19:46:01 +0000 Subject: added changes for 1.0.0 --- src/org/thialfihar/android/apg/MainActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index ef3623ecb..236562e93 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -191,6 +191,12 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + + "* support of other file managers (including ASTRO)\n" + + "* new database, much faster, less memory usage\n" + + "* defined Intents and content provider for other apps\n" + + "* more k9mail integration, see k9mail website for beta build\n" + + "* Slovenian translation (thanks, 359)\n" + + "* bugfixes\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + "WILL be stripped of certificates right now.\n" + -- cgit v1.2.3 From c9b49f5ecef7ed5720b718ec8260ee9a85423dff Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Wed, 2 Jun 2010 19:49:46 +0000 Subject: changes adjusted --- src/org/thialfihar/android/apg/MainActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 236562e93..77c3cf6ee 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -191,11 +191,11 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + - "* support of other file managers (including ASTRO)\n" + + "* support of other file managers (e.g. ASTRO)\n" + + "* more k9mail integration, k9mail beta builds coming soon on k9mail or APG website\n" + + "* Slovenian translation (thanks, 359)\n" + "* new database, much faster, less memory usage\n" + "* defined Intents and content provider for other apps\n" + - "* more k9mail integration, see k9mail website for beta build\n" + - "* Slovenian translation (thanks, 359)\n" + "* bugfixes\n" + "\n" + "WARNING: be careful editing your existing keys, as they " + -- cgit v1.2.3 From 371dc31b97621fabed643d75157222f98de30fbc Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Thu, 3 Jun 2010 15:08:06 +0000 Subject: changes adjusted once more --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 77c3cf6ee..61b714499 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -191,8 +191,8 @@ public class MainActivity extends BaseActivity { message.setText("Read the warnings!\n\n" + "Changes:\n" + + "* k9mail integration, k9mail beta build is available on the k9mail website\n" + "* support of other file managers (e.g. ASTRO)\n" + - "* more k9mail integration, k9mail beta builds coming soon on k9mail or APG website\n" + "* Slovenian translation (thanks, 359)\n" + "* new database, much faster, less memory usage\n" + "* defined Intents and content provider for other apps\n" + -- cgit v1.2.3 From e334a36194b10dca03de4a87e0c2e75582e30163 Mon Sep 17 00:00:00 2001 From: Thialfihar Date: Fri, 4 Jun 2010 20:21:51 +0000 Subject: fix the inbox list for GMail account --- src/org/thialfihar/android/apg/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/thialfihar/android/apg/MainActivity.java') diff --git a/src/org/thialfihar/android/apg/MainActivity.java b/src/org/thialfihar/android/apg/MainActivity.java index 61b714499..65dd20d95 100644 --- a/src/org/thialfihar/android/apg/MainActivity.java +++ b/src/org/thialfihar/android/apg/MainActivity.java @@ -110,7 +110,7 @@ public class MainActivity extends BaseActivity { mAccounts.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(AdapterView arg0, View view, int index, long id) { - String accountName = (String) mAccounts.getSelectedItem(); + String accountName = (String) mAccounts.getItemAtPosition(index); startActivity(new Intent(MainActivity.this, MailListActivity.class) .putExtra(Apg.EXTRA_ACCOUNT, accountName)); } -- cgit v1.2.3