2 files changed, 16 insertions, 31 deletions

diff --git a/src/org/connectbot/GeneratePubkeyActivity.java b/src/org/connectbot/GeneratePubkeyActivity.java
index aa004cf..94910e4 100644
--- a/src/org/connectbot/GeneratePubkeyActivity.java
+++ b/src/org/connectbot/GeneratePubkeyActivity.java
@@ -34,8 +34,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -261,14 +259,6 @@ public class GeneratePubkeyActivity extends Activity implements OnEntropyGathere
 		keyGenThread.start();
 	}
 
-	private Handler handler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-			progress.dismiss();
-			GeneratePubkeyActivity.this.finish();
-		}
-	};
-
 	final private Runnable mKeyGen = new Runnable() {
 		public void run() {
 			try {
@@ -313,7 +303,12 @@ public class GeneratePubkeyActivity extends Activity implements OnEntropyGathere
 				e.printStackTrace();
 			}
 
-			handler.sendEmptyMessage(0);
+			GeneratePubkeyActivity.this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.dismiss();
+					GeneratePubkeyActivity.this.finish();
+				}
+			});
 		}
 
 	};
diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java
index 4c97b71..9961a4e 100644
--- a/src/org/connectbot/PubkeyListActivity.java
+++ b/src/org/connectbot/PubkeyListActivity.java
@@ -49,9 +49,7 @@ import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
 import android.os.IBinder;
-import android.os.Message;
 import android.text.ClipboardManager;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -162,7 +160,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				// handle toggling key in-memory on/off
 				if(loaded) {
 					bound.removeKey(pubkey.getNickname());
-					updateHandler.sendEmptyMessage(-1);
+					updateList();
 				} else {
 					handleAddKey(pubkey);
 				}
@@ -266,7 +264,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 			} catch(Exception e) {
 				String message = getResources().getString(R.string.pubkey_failed_add, keybean.getNickname());
 				Log.e(TAG, message, e);
-				Toast.makeText(PubkeyListActivity.this, message, Toast.LENGTH_LONG);
+				Toast.makeText(PubkeyListActivity.this, message, Toast.LENGTH_LONG).show();
 			}
 		} else {
 			// load using internal generated format
@@ -279,7 +277,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 			} catch (Exception e) {
 				String message = getResources().getString(R.string.pubkey_failed_add, keybean.getNickname());
 				Log.e(TAG, message, e);
-				Toast.makeText(PubkeyListActivity.this, message, Toast.LENGTH_LONG);
+				Toast.makeText(PubkeyListActivity.this, message, Toast.LENGTH_LONG).show();
 				return;
 			}
 		}
@@ -293,7 +291,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 		// save this key in memory
 		bound.addKey(keybean, pair, true);
 
-		updateHandler.sendEmptyMessage(-1);
+		updateList();
 	}
 
 	@Override
@@ -316,7 +314,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 			public boolean onMenuItemClick(MenuItem item) {
 				if(loaded) {
 					bound.removeKey(pubkey.getNickname());
-					updateHandler.sendEmptyMessage(-1);
+					updateList();
 				} else {
 					handleAddKey(pubkey);
 					//bound.addKey(nickname, trileadKey);
@@ -334,7 +332,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				// toggle onstart status
 				pubkey.setStartup(!pubkey.isStartup());
 				pubkeydb.savePubkey(pubkey);
-				updateHandler.sendEmptyMessage(-1);
+				updateList();
 				return true;
 			}
 		});
@@ -408,7 +406,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 										.create().show();
 								else {
 									pubkeydb.savePubkey(pubkey);
-									updateHandler.sendEmptyMessage(-1);
+									updateList();
 								}
 							} catch (Exception e) {
 								Log.e(TAG, "Could not change private key password", e);
@@ -433,7 +431,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				// toggle confirm use
 				pubkey.setConfirmUse(!pubkey.isConfirmUse());
 				pubkeydb.savePubkey(pubkey);
-				updateHandler.sendEmptyMessage(-1);
+				updateList();
 				return true;
 			}
 		});
@@ -453,7 +451,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 
 							// delete from backend database and update gui
 							pubkeydb.deletePubkey(pubkey);
-							updateHandler.sendEmptyMessage(-1);
+							updateList();
 						}
 					})
 					.setNegativeButton(R.string.delete_neg, null).create().show();
@@ -464,14 +462,6 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 
 	}
 
-
-	protected Handler updateHandler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-			updateList();
-		}
-	};
-
 	protected void updateList() {
 		if (pubkeydb == null) return;
 
@@ -559,7 +549,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 				pubkeydb = new PubkeyDatabase(this);
 			pubkeydb.savePubkey(pubkey);
 
-			updateHandler.sendEmptyMessage(-1);
+			updateList();
 		} catch(Exception e) {
 			Log.e(TAG, "Problem parsing imported private key", e);
 			Toast.makeText(PubkeyListActivity.this, R.string.pubkey_import_parse_problem, Toast.LENGTH_LONG).show();