diff options
author | Kenny Root <kenny@the-b.org> | 2010-03-13 06:24:23 +0000 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2010-03-13 06:24:23 +0000 |
commit | 9ab2523393d73123742acfc01a4358350e2bbcbb (patch) | |
tree | 86fc96a8a28bc6c7ae187f73d73189189b746bf1 /src/org/connectbot/service/TerminalManager.java | |
parent | 4bdec83807da6c0f10222e0bd9f86a6e3f87075e (diff) | |
download | connectbot-9ab2523393d73123742acfc01a4358350e2bbcbb.tar.gz connectbot-9ab2523393d73123742acfc01a4358350e2bbcbb.tar.bz2 connectbot-9ab2523393d73123742acfc01a4358350e2bbcbb.zip |
Remove isSavingKeys() from TerminalManager
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@488 df292f66-193f-0410-a5fc-6d59da041ff2
Diffstat (limited to 'src/org/connectbot/service/TerminalManager.java')
-rw-r--r-- | src/org/connectbot/service/TerminalManager.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java index 1b7b91d..0f302f7 100644 --- a/src/org/connectbot/service/TerminalManager.java +++ b/src/org/connectbot/service/TerminalManager.java @@ -110,6 +110,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen private boolean resizeAllowed = true; + private boolean savingKeys; + protected List<WeakReference<TerminalBridge>> mPendingReconnect = new LinkedList<WeakReference<TerminalBridge>>(); @@ -153,6 +155,12 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen final boolean lockingWifi = prefs.getBoolean(PreferenceConstants.WIFI_LOCK, true); connectivityManager = new ConnectivityReceiver(this, lockingWifi); + + updateSavingKeys(); + } + + private void updateSavingKeys() { + savingKeys = prefs.getBoolean(PreferenceConstants.MEMKEYS, true); } @Override @@ -251,10 +259,6 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen return scrollback; } - public boolean isSavingKeys() { - return prefs.getBoolean(PreferenceConstants.MEMKEYS, true); - } - public String getKeyMode() { return prefs.getString(PreferenceConstants.KEYMODE, PreferenceConstants.KEYMODE_RIGHT); // "Use right-side keys" } @@ -344,6 +348,9 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen } public void addKey(PubkeyBean pubkey, Object trileadKey) { + if (!savingKeys) + return; + removeKey(pubkey.getNickname()); byte[] sshPubKey = PubkeyUtils.extractOpenSSHPublic(trileadKey); @@ -604,6 +611,8 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen } else if (PreferenceConstants.WIFI_LOCK.equals(key)) { final boolean lockingWifi = prefs.getBoolean(PreferenceConstants.WIFI_LOCK, true); connectivityManager.setWantWifiLock(lockingWifi); + } else if (PreferenceConstants.MEMKEYS.equals(key)) { + updateSavingKeys(); } } |