diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/connectbot/ConsoleActivity.java | 10 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 9 | ||||
| -rw-r--r-- | src/org/connectbot/util/UpdateHelper.java | 7 |
3 files changed, 11 insertions, 15 deletions
diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java index dcd2488..9f13a36 100644 --- a/src/org/connectbot/ConsoleActivity.java +++ b/src/org/connectbot/ConsoleActivity.java @@ -307,18 +307,18 @@ public class ConsoleActivity extends Activity { String rotateDefault; if (Resources.getSystem().getConfiguration().keyboard == Configuration.KEYBOARD_NOKEYS) - rotateDefault = getString(R.string.list_rotation_port); + rotateDefault = "Force portrait"; else - rotateDefault = getString(R.string.list_rotation_land); + rotateDefault = "Force landscape"; String rotate = prefs.getString(getString(R.string.pref_rotation), rotateDefault); - if (getString(R.string.list_rotation_default).equals(rotate)) + if ("Default".equals(rotate)) rotate = rotateDefault; // request a forced orientation if requested by user - if (getString(R.string.list_rotation_land).equals(rotate)) + if ("Force landscape".equals(rotate)) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - else if (getString(R.string.list_rotation_port).equals(rotate)) + else if ("Force portrait".equals(rotate)) setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // TODO find proper way to disable volume key beep if it exists. diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index e0d48a7..4a023c1 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -1064,16 +1064,13 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal // check to see which shortcut the camera button triggers String camera = manager.prefs.getString(manager.res.getString(R.string.pref_camera), manager.res.getString(R.string.list_camera_ctrlaspace)); - if(manager.res.getString(R.string.list_camera_ctrlaspace).equals(camera)) { + if("Ctrl+A then Space".equals(camera)) { stdin.write(0x01); stdin.write(' '); - - } else if(manager.res.getString(R.string.list_camera_ctrla).equals(camera)) { + } else if("Ctrl+A".equals(camera)) { stdin.write(0x01); - - } else if(manager.res.getString(R.string.list_camera_esc).equals(camera)) { + } else if("Esc".equals(camera)) { ((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0); - } break; diff --git a/src/org/connectbot/util/UpdateHelper.java b/src/org/connectbot/util/UpdateHelper.java index 733bcde..33d0322 100644 --- a/src/org/connectbot/util/UpdateHelper.java +++ b/src/org/connectbot/util/UpdateHelper.java @@ -94,22 +94,21 @@ public final class UpdateHelper implements Runnable { } catch(Exception e) { Log.e(TAG, "Couldn't find package information in PackageManager", e); return; - } // decide if we really need to check for update Resources res = context.getResources(); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - String frequency = prefs.getString(res.getString(R.string.pref_update), res.getString(R.string.list_update_daily)); + String frequency = prefs.getString(res.getString(R.string.pref_update), "Daily"); long lastChecked = prefs.getLong(res.getString(R.string.pref_lastchecked), 0); long now = (System.currentTimeMillis() / 1000); long passed = now - lastChecked; boolean shouldCheck = false; - if(frequency.equals(res.getString(R.string.list_update_daily))) { + if ("Daily".equals(frequency)) { shouldCheck = (passed > 60 * 60 * 24); - } else if(frequency.equals(res.getString(R.string.list_update_weekly))) { + } else if ("Weekly".equals(frequency)) { shouldCheck = (passed > 60 * 60 * 24 * 7); } |