diff options
| author | Kenny Root <kenny@the-b.org> | 2009-08-12 22:43:40 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2009-08-12 22:43:40 +0000 |
| commit | 1a47eab6b2692a880cea5c7df343ecf5655c1292 (patch) | |
| tree | 8e905eaab69709c34c94bc7495af3389c1c33e26 | |
| parent | bb338001612bcb08af57f18191f9c11d0ebf4d35 (diff) | |
| download | connectbot-1a47eab6b2692a880cea5c7df343ecf5655c1292.tar.gz connectbot-1a47eab6b2692a880cea5c7df343ecf5655c1292.tar.bz2 connectbot-1a47eab6b2692a880cea5c7df343ecf5655c1292.zip | |
Fix logic error in last commit
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@393 df292f66-193f-0410-a5fc-6d59da041ff2
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f1e353e..f6dd0f2 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.6-dev" - android:versionCode="189"> + android:versionCode="190"> <application android:icon="@drawable/icon" diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 1d69989..1880d26 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -492,8 +492,11 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener { Configuration.HARDKEYBOARDHIDDEN_YES; // Ignore all key-up events except for the special keys - if (event.getAction() == KeyEvent.ACTION_UP && - hardKeyboard && !hardKeyboardHidden) { + if (event.getAction() == KeyEvent.ACTION_UP) { + // There's nothing here for virtual keyboard users. + if (!hardKeyboard || (hardKeyboard && hardKeyboardHidden)) + return false; + // skip keys if we aren't connected yet or have been disconnected if (disconnected || transport == null) return false; |