Move preference keys to their own class so they can be easily tracked for usage in other classes

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@247 df292f66-193f-0410-a5fc-6d59da041ff2

5 files changed, 34 insertions, 43 deletions

diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 9f13a36..ae410fb 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -24,6 +24,7 @@ import org.connectbot.bean.SelectionArea;
 import org.connectbot.service.PromptHelper;
 import org.connectbot.service.TerminalBridge;
 import org.connectbot.service.TerminalManager;
+import org.connectbot.util.PreferenceConstants;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -82,8 +83,6 @@ public class ConsoleActivity extends Activity {
 
 	private PowerManager.WakeLock wakelock = null;
 
-	private String PREF_KEEPALIVE = null;
-
 	protected Uri requested;
 
 	protected ClipboardManager clipboard;
@@ -300,25 +299,25 @@ public class ConsoleActivity extends Activity {
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
 		// hide status bar if requested by user
-		if (prefs.getBoolean(getString(R.string.pref_fullscreen), false)) {
+		if (prefs.getBoolean(PreferenceConstants.FULLSCREEN, false)) {
 			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
 					WindowManager.LayoutParams.FLAG_FULLSCREEN);
 		}
 
 		String rotateDefault;
 		if (Resources.getSystem().getConfiguration().keyboard == Configuration.KEYBOARD_NOKEYS)
-			rotateDefault = "Force portrait";
+			rotateDefault = PreferenceConstants.ROTATION_PORTRAIT;
 		else
-			rotateDefault = "Force landscape";
+			rotateDefault = PreferenceConstants.ROTATION_LANDSCAPE;
 
-		String rotate = prefs.getString(getString(R.string.pref_rotation), rotateDefault);
-		if ("Default".equals(rotate))
+		String rotate = prefs.getString(PreferenceConstants.ROTATION, rotateDefault);
+		if (PreferenceConstants.ROTATION_DEFAULT.equals(rotate))
 			rotate = rotateDefault;
 
 		// request a forced orientation if requested by user
-		if ("Force landscape".equals(rotate))
+		if (PreferenceConstants.ROTATION_LANDSCAPE.equals(rotate))
 			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-		else if ("Force portrait".equals(rotate))
+		else if (PreferenceConstants.ROTATION_PORTRAIT.equals(rotate))
 			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
 		// TODO find proper way to disable volume key beep if it exists.
@@ -327,8 +326,6 @@ public class ConsoleActivity extends Activity {
 		PowerManager manager = (PowerManager)getSystemService(Context.POWER_SERVICE);
 		wakelock = manager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, TAG);
 
-		PREF_KEEPALIVE = getResources().getString(R.string.pref_keepalive);
-
 		// handle requested console from incoming intent
 		requested = getIntent().getData();
 
@@ -704,7 +701,7 @@ public class ConsoleActivity extends Activity {
 
 		// make sure we dont let the screen fall asleep
 		// this also keeps the wifi chipset from disconnecting us
-		if(wakelock != null && prefs.getBoolean(PREF_KEEPALIVE, true))
+		if(wakelock != null && prefs.getBoolean(PreferenceConstants.KEEP_ALIVE, true))
 			wakelock.acquire();
 
 	}
diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java
index abd2215..b9ac4c1 100644
--- a/src/org/connectbot/HostListActivity.java
+++ b/src/org/connectbot/HostListActivity.java
@@ -26,6 +26,7 @@ import org.connectbot.bean.HostBean;
 import org.connectbot.service.TerminalBridge;
 import org.connectbot.service.TerminalManager;
 import org.connectbot.util.HostDatabase;
+import org.connectbot.util.PreferenceConstants;
 import org.connectbot.util.UpdateHelper;
 
 import android.app.Activity;
@@ -123,10 +124,6 @@ public class HostListActivity extends ListActivity {
 
 	}
 
-
-
-	public final static String PREF_EULA = "eula", PREF_SORTBYCOLOR = "sortByColor";
-
 	public final static int REQUEST_EDIT = 1;
 	public final static int REQUEST_EULA = 2;
 
@@ -138,7 +135,7 @@ public class HostListActivity extends ListActivity {
 			if(resultCode == Activity.RESULT_OK) {
 				// yay they agreed, so store that info
 				Editor edit = prefs.edit();
-				edit.putBoolean(PREF_EULA, true);
+				edit.putBoolean(PreferenceConstants.EULA, true);
 				edit.commit();
 			} else {
 				// user didnt agree, so close
@@ -163,7 +160,7 @@ public class HostListActivity extends ListActivity {
 		// check for eula agreement
 		this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-		boolean agreed = prefs.getBoolean(PREF_EULA, false);
+		boolean agreed = prefs.getBoolean(PreferenceConstants.EULA, false);
 		if(!agreed) {
 			this.startActivityForResult(new Intent(this, WizardActivity.class), REQUEST_EULA);
 		}
@@ -177,7 +174,7 @@ public class HostListActivity extends ListActivity {
 		this.hostdb = new HostDatabase(this);
 		ListView list = this.getListView();
 
-		this.sortedByColor = prefs.getBoolean(PREF_SORTBYCOLOR, false);
+		this.sortedByColor = prefs.getBoolean(PreferenceConstants.SORT_BY_COLOR, false);
 		this.updateList();
 
 		//this.list.setSelector(R.drawable.highlight_disabled_pressed);
@@ -408,7 +405,7 @@ public class HostListActivity extends ListActivity {
 
 	protected void updateList() {
 		Editor edit = prefs.edit();
-		edit.putBoolean(PREF_SORTBYCOLOR, sortedByColor);
+		edit.putBoolean(PreferenceConstants.SORT_BY_COLOR, sortedByColor);
 		edit.commit();
 
 		if (hostdb == null)
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java
index 4a023c1..3e89316 100644
--- a/src/org/connectbot/service/TerminalBridge.java
+++ b/src/org/connectbot/service/TerminalBridge.java
@@ -42,6 +42,7 @@ import org.connectbot.bean.PortForwardBean;
 import org.connectbot.bean.PubkeyBean;
 import org.connectbot.bean.SelectionArea;
 import org.connectbot.util.HostDatabase;
+import org.connectbot.util.PreferenceConstants;
 import org.connectbot.util.PubkeyDatabase;
 import org.connectbot.util.PubkeyUtils;
 
@@ -901,7 +902,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 				if (disconnected || !sessionOpen)
 					return false;
 
-				if ("Use right-side keys".equals(keymode)) {
+				if (PreferenceConstants.KEYMODE_RIGHT.equals(keymode)) {
 					if (keyCode == KeyEvent.KEYCODE_ALT_RIGHT
 							&& (metaState & META_SLASH) != 0) {
 						metaState &= ~(META_SLASH | META_TRANSIENT);
@@ -913,7 +914,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 						stdin.write(0x09);
 						return true;
 					}
-				} else if ("Use left-side keys".equals(keymode)) {
+				} else if (PreferenceConstants.KEYMODE_LEFT.equals(keymode)) {
 					if (keyCode == KeyEvent.KEYCODE_ALT_LEFT
 							&& (metaState & META_SLASH) != 0) {
 						metaState &= ~(META_SLASH | META_TRANSIENT);
@@ -1063,13 +1064,15 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 			case KeyEvent.KEYCODE_CAMERA:
 
 				// 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("Ctrl+A then Space".equals(camera)) {
+				String camera = manager.prefs.getString(
+						PreferenceConstants.CAMERA,
+						PreferenceConstants.CAMERA_CTRLA_SPACE);
+				if(PreferenceConstants.CAMERA_CTRLA_SPACE.equals(camera)) {
 					stdin.write(0x01);
 					stdin.write(' ');
-				} else if("Ctrl+A".equals(camera)) {
+				} else if(PreferenceConstants.CAMERA_CTRLA.equals(camera)) {
 					stdin.write(0x01);
-				} else if("Esc".equals(camera)) {
+				} else if(PreferenceConstants.CAMERA_ESC.equals(camera)) {
 					((vt320)buffer).keyTyped(vt320.KEY_ESCAPE, ' ', 0);
 				}
 
@@ -1294,7 +1297,7 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal
 		int width = parent.getWidth();
 		int height = parent.getHeight();
 
-		bumpyArrows = manager.prefs.getBoolean(manager.res.getString(R.string.pref_bumpyarrows), true);
+		bumpyArrows = manager.prefs.getBoolean(PreferenceConstants.BUMPY_ARROWS, true);
 		vibrator = (Vibrator) parent.getContext().getSystemService(Context.VIBRATOR_SERVICE);
 		clipboard = (ClipboardManager) parent.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
 
diff --git a/src/org/connectbot/service/TerminalManager.java b/src/org/connectbot/service/TerminalManager.java
index 8eb5c3e..4fdf0b5 100644
--- a/src/org/connectbot/service/TerminalManager.java
+++ b/src/org/connectbot/service/TerminalManager.java
@@ -27,10 +27,10 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.connectbot.R;
 import org.connectbot.bean.HostBean;
 import org.connectbot.bean.PubkeyBean;
 import org.connectbot.util.HostDatabase;
+import org.connectbot.util.PreferenceConstants;
 import org.connectbot.util.PubkeyDatabase;
 import org.connectbot.util.PubkeyUtils;
 
@@ -76,7 +76,6 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 	protected PubkeyDatabase pubkeydb;
 
 	protected SharedPreferences prefs;
-	private String pref_emulation, pref_scrollback, pref_keymode, pref_memkeys, pref_wifilock;
 
 	private final IBinder binder = new TerminalBinder();
 
@@ -90,11 +89,6 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 	public void onCreate() {
 		Log.i(TAG, "Starting background service");
 		prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		pref_emulation = getResources().getString(R.string.pref_emulation);
-		pref_scrollback = getResources().getString(R.string.pref_scrollback);
-		pref_keymode = getResources().getString(R.string.pref_keymode);
-		pref_memkeys = getResources().getString(R.string.pref_memkeys);
-		pref_wifilock = getResources().getString(R.string.pref_wifilock);
 
 		res = getResources();
 
@@ -176,28 +170,28 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen
 	}
 
 	public String getEmulation() {
-		return prefs.getString(pref_emulation, "screen");
+		return prefs.getString(PreferenceConstants.EMULATION, "screen");
 	}
 
 	public int getScrollback() {
 		int scrollback = 140;
 		try {
-			scrollback = Integer.parseInt(prefs.getString(pref_scrollback, "140"));
+			scrollback = Integer.parseInt(prefs.getString(PreferenceConstants.SCROLLBACK, "140"));
 		} catch(Exception e) {
 		}
 		return scrollback;
 	}
 
 	public boolean isSavingKeys() {
-		return prefs.getBoolean(pref_memkeys, true);
+		return prefs.getBoolean(PreferenceConstants.MEMKEYS, true);
 	}
 
 	public String getKeyMode() {
-		return prefs.getString(pref_keymode, getString(R.string.list_keymode_right)); // "Use right-side keys"
+		return prefs.getString(PreferenceConstants.KEYMODE, PreferenceConstants.KEYMODE_RIGHT); // "Use right-side keys"
 	}
 
 	public boolean isLockingWifi() {
-		return prefs.getBoolean(pref_wifilock, true);
+		return prefs.getBoolean(PreferenceConstants.WIFI_LOCK, true);
 	}
 
 	/**
diff --git a/src/org/connectbot/util/UpdateHelper.java b/src/org/connectbot/util/UpdateHelper.java
index 33d0322..23b3801 100644
--- a/src/org/connectbot/util/UpdateHelper.java
+++ b/src/org/connectbot/util/UpdateHelper.java
@@ -100,15 +100,15 @@ public final class UpdateHelper implements Runnable {
 		Resources res = context.getResources();
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
-		String frequency = prefs.getString(res.getString(R.string.pref_update), "Daily");
-		long lastChecked = prefs.getLong(res.getString(R.string.pref_lastchecked), 0);
+		String frequency = prefs.getString(PreferenceConstants.UPDATE, PreferenceConstants.UPDATE_DAILY);
+		long lastChecked = prefs.getLong(PreferenceConstants.LAST_CHECKED, 0);
 		long now = (System.currentTimeMillis() / 1000);
 		long passed = now - lastChecked;
 
 		boolean shouldCheck = false;
-		if ("Daily".equals(frequency)) {
+		if (PreferenceConstants.UPDATE_DAILY.equals(frequency)) {
 			shouldCheck = (passed > 60 * 60 * 24);
-		} else if ("Weekly".equals(frequency)) {
+		} else if (PreferenceConstants.UPDATE_WEEKLY.equals(frequency)) {
 			shouldCheck = (passed > 60 * 60 * 24 * 7);
 		}