From 884ccec12b0cac55b00787ed7c2c2831d3e47e29 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 3 Aug 2010 22:34:53 +0000
Subject: Fix loading of pubkeys into memory

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@509 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                             | 2 +-
 src/org/connectbot/PubkeyListActivity.java      | 2 +-
 src/org/connectbot/service/TerminalManager.java | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e103e5b..ed542ef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7.0-rc1"
-	android:versionCode="303"
+	android:versionCode="304"
 	android:installLocation="auto">
 
 	<application
diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java
index 9106e1a..3579980 100644
--- a/src/org/connectbot/PubkeyListActivity.java
+++ b/src/org/connectbot/PubkeyListActivity.java
@@ -293,7 +293,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 		Log.d(TAG, String.format("Unlocked key '%s'", pubkey.getNickname()));
 
 		// save this key in memory
-		bound.addKey(pubkey, trileadKey);
+		bound.addKey(pubkey, trileadKey, true);
 
 		updateHandler.sendEmptyMessage(-1);
 	}
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java
index 521ce4b..d3316b4 100644
--- a/src/org/connectbot/service/TerminalManager.java
+++ b/src/org/connectbot/service/TerminalManager.java
@@ -135,6 +135,7 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 		pubkeydb = new PubkeyDatabase(this);
 
 		// load all marked pubkeys into memory
+		updateSavingKeys();
 		List<PubkeyBean> pubkeys = pubkeydb.getAllStartPubkeys();
 
 		for (PubkeyBean pubkey : pubkeys) {
@@ -162,7 +163,6 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 
 		connectivityManager = new ConnectivityReceiver(this, lockingWifi);
 
-		updateSavingKeys();
 	}
 
 	private void updateSavingKeys() {
@@ -364,7 +364,11 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 	}
 
 	public void addKey(PubkeyBean pubkey, Object trileadKey) {
-		if (!savingKeys)
+		addKey(pubkey, trileadKey, false);
+	}
+
+	public void addKey(PubkeyBean pubkey, Object trileadKey, boolean force) {
+		if (!savingKeys && !force)
 			return;
 
 		removeKey(pubkey.getNickname());
-- 
cgit v1.2.3