--- a/res/layout/preferences.xml	Thu May 06 19:19:15 2010 +0200
+++ b/res/layout/preferences.xml	Thu May 06 20:22:03 2010 +0200
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- 
+    The format of the preference key is defined in
+    src/com/beem/project/beem/BeemApplication.java
+    Basically it is just a simple name like account_username.
+    TODO: There is still a lot of keys to convert
+-->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shouldDisableView="true" android:selectable="true">
 	<PreferenceCategory android:title="@string/general_preferences">
@@ -31,11 +37,11 @@
 	<PreferenceCategory android:title="@string/user_preferences">
 		<EditTextPreference android:singleLine="true"
 			android:summary="@string/SettingsText" android:title="@string/settings_account_username"
-			android:key="settings_key_account_username" android:hint="@string/login_username_info_default"
+			android:key="account_username" android:hint="@string/login_username_info_default"
 			android:inputType="textEmailAddress" />
 		<EditTextPreference android:name="password"
 			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
-			android:title="@string/settings_account_password" android:key="settings_key_account_password" />
+			android:title="@string/settings_account_password" android:key="account_password" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
 		<EditTextPreference android:key="settings_key_resource"

--- a/res/values-de/strings.xml	Thu May 06 19:19:15 2010 +0200
+++ b/res/values-de/strings.xml	Thu May 06 20:22:03 2010 +0200
@@ -18,12 +18,6 @@
 	<string name="BeemServiceCreated">Beem Service erstellt</string>
 	<string name="BeemServiceDestroyed">Beem Service verworfen</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Server Verbindung</string>
 	<string name="CLSUserid">Benutzer id:</string>

--- a/res/values-fr/strings.xml	Thu May 06 19:19:15 2010 +0200
+++ b/res/values-fr/strings.xml	Thu May 06 20:22:03 2010 +0200
@@ -21,12 +21,6 @@
 	<string name="BeemServiceCreated">BeemService Créé</string>
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Connexion au serveur</string>
 	<string name="CLSUserid">Id utilisateur:</string>

--- a/res/values/strings.xml	Thu May 06 19:19:15 2010 +0200
+++ b/res/values/strings.xml	Thu May 06 20:22:03 2010 +0200
@@ -21,12 +21,6 @@
 	<string name="BeemServiceCreated">Beem Service Created</string>
 	<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured
-	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Server connection</string>
 	<string name="CLSUserid">User id:</string>

--- a/src/com/beem/project/beem/BeemApplication.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Thu May 06 20:22:03 2010 +0200
@@ -60,6 +60,16 @@
     private SharedPreferences mSettings;
     private final PreferenceListener mPreferenceListener = new PreferenceListener();
 
+    /* Constants for PREFERENCE_KEY
+     * The format of the Preference key is :
+     * $name_KEY = "$name"
+     */
+    public static final String ACCOUNT_USERNAME_KEY = "account_username";
+    public static final String ACCOUNT_PASSWORD_KEY = "account_password";
+    public static final String STATUS_KEY = "status";
+    public static final String STATUS_TEXT_KEY = "status_text";
+    //TODO add the other one
+
     /**
      * Constructor.
      */
@@ -70,8 +80,8 @@
     public void onCreate() {
 	super.onCreate();
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
-	String login = mSettings.getString("settings_key_account_username", "");
-	String password = mSettings.getString("settings_key_account_password", "");
+	String login = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+	String password = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	mIsAccountConfigured = !("".equals(login) || "".equals(password));
 	mSettings.registerOnSharedPreferenceChangeListener(mPreferenceListener);
     }
@@ -120,9 +130,9 @@
 
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences  sharedPreferences, String key) {
-	    if ("settings_key_account_username".equals(key) || "settings_key_account_password".equals(key)) {
-		String login = mSettings.getString("settings_key_account_username", "");
-		String password = mSettings.getString("settings_key_account_password", "");
+	    if (BeemApplication.ACCOUNT_USERNAME_KEY.equals(key) || BeemApplication.ACCOUNT_PASSWORD_KEY.equals(key)) {
+		String login = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+		String password = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 		mIsAccountConfigured = !("".equals(login) || "".equals(password));
 	    }
 	}

--- a/src/com/beem/project/beem/BeemService.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Thu May 06 20:22:03 2010 +0200
@@ -185,9 +185,9 @@
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
 	    registerReceiver(mOnOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_ON));
 	}
-	String tmpJid = mSettings.getString("settings_key_account_username", "");
+	String tmpJid = mSettings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
 	mLogin = StringUtils.parseName(tmpJid);
-	mPassword = mSettings.getString("settings_key_account_password", "");
+	mPassword = mSettings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	mPort = DEFAULT_XMPP_PORT;
 	mService = StringUtils.parseServer(tmpJid);
 	mHost = mService;
@@ -267,7 +267,7 @@
      */
     public void resetStatus() {
 	Editor edit = mSettings.edit();
-	edit.putInt("PreferenceStatus", 1);
+	edit.putInt(BeemApplication.STATUS_KEY, 1);
 	edit.commit();
     }
 

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Thu May 06 20:22:03 2010 +0200
@@ -65,6 +65,7 @@
 import android.widget.Toast;
 
 import com.beem.project.beem.BeemService;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.aidl.IXmppFacade;
 import com.beem.project.beem.utils.BeemBroadcastReceiver;
@@ -129,7 +130,7 @@
 
 	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
 	mStatusMessageEditText = (EditText) findViewById(R.id.ChangeStatusMessage);
-	mStatusMessageEditText.setText(getPreferenceString(R.string.PreferenceStatusText));
+	mStatusMessageEditText.setText(mSettings.getString(BeemApplication.STATUS_TEXT_KEY, ""));
 
 	mSpinner = (Spinner) findViewById(R.id.ChangeStatusSpinner);
 	mAdapter = ArrayAdapter.createFromResource(this, R.array.status_types, android.R.layout.simple_spinner_item);
@@ -180,7 +181,7 @@
      * @return the status index from status the settings.
      */
     private int getPreferenceStatusIndex() {
-	return mSettings.getInt(getString(R.string.PreferenceStatus), AVAILABLE_IDX);
+	return mSettings.getInt(BeemApplication.STATUS_KEY, AVAILABLE_IDX);
     }
 
     /**
@@ -188,6 +189,7 @@
      * @param id status text id.
      * @return the status text from status the settings.
      */
+    @Deprecated
     private String getPreferenceString(int id) {
 	return mSettings.getString(getString(id), "");
     }
@@ -269,27 +271,23 @@
 	@Override
 	public void onClick(View v) {
 	    if (v == mOk) {
-		if (!mStatusMessageEditText.getText().toString().equals(
-		    getPreferenceString(R.string.PreferenceStatusText))
-		    || getPreferenceStatusIndex() != mSpinner.getSelectedItemPosition()) {
-		    String msg = mStatusMessageEditText.getText().toString();
-		    int status = getStatusForService((String) mSpinner.getSelectedItem());
-		    Editor edit = mSettings.edit();
-		    edit.putString(getString(R.string.PreferenceStatusText), msg);
-		    if (status == Status.CONTACT_STATUS_DISCONNECT) {
-			stopService(new Intent(ChangeStatus.this, BeemService.class));
-			edit.putInt(getString(R.string.PreferenceStatus), AVAILABLE_IDX);
-		    } else {
-			try {
-			    mXmppFacade.changeStatus(status, msg.toString());
-			    edit.putInt(getString(R.string.PreferenceStatus), mSpinner.getSelectedItemPosition());
-			} catch (RemoteException e) {
-			    e.printStackTrace();
-			}
-			mToast.show();
+		String msg = mStatusMessageEditText.getText().toString();
+		int status = getStatusForService((String) mSpinner.getSelectedItem());
+		Editor edit = mSettings.edit();
+		edit.putString(BeemApplication.STATUS_TEXT_KEY, msg);
+		if (status == Status.CONTACT_STATUS_DISCONNECT) {
+		    stopService(new Intent(ChangeStatus.this, BeemService.class));
+		    edit.putInt(BeemApplication.STATUS_KEY, AVAILABLE_IDX);
+		} else {
+		    try {
+			mXmppFacade.changeStatus(status, msg.toString());
+			edit.putInt(BeemApplication.STATUS_KEY, mSpinner.getSelectedItemPosition());
+		    } catch (RemoteException e) {
+			e.printStackTrace();
 		    }
-		    edit.commit();
+		    mToast.show();
 		}
+		edit.commit();
 		ChangeStatus.this.finish();
 	    } else if (v == mClear) {
 		mStatusMessageEditText.setText(null);

--- a/src/com/beem/project/beem/ui/CreateAccount.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Thu May 06 20:22:03 2010 +0200
@@ -64,6 +64,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 
 /**
@@ -318,10 +319,9 @@
 		else {
 		    if (createAccount(username, passwordFieldValue)) {
 			SharedPreferences.Editor settingsEditor = mSettings.edit();
-			settingsEditor.putString("settings_key_account_username", usernameFieldValue);
-			settingsEditor.putString("settings_key_account_password", passwordFieldValue);
+			settingsEditor.putString(BeemApplication.ACCOUNT_USERNAME_KEY, usernameFieldValue);
+			settingsEditor.putString(BeemApplication.ACCOUNT_PASSWORD_KEY, passwordFieldValue);
 			settingsEditor.putBoolean("settings_key_gmail", false);
-			settingsEditor.putBoolean("PreferenceIsConfigured", true);
 			settingsEditor.commit();
 			finish();
 		    }

--- a/src/com/beem/project/beem/ui/Settings.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/ui/Settings.java	Thu May 06 20:22:03 2010 +0200
@@ -108,19 +108,6 @@
      * {@inheritDoc}
      */
     @Override
-    public void onStop() {
-	super.onStop();
-	SharedPreferences settings = getPreferenceManager().getSharedPreferences();
-	settings.edit().putBoolean(
-	    "PreferenceIsConfigured",
-	    !"".equals(settings.getString("settings_key_account_username", ""))
-		|| !"".equals(settings.getString("settings_key_account_password", ""))).commit();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 	MenuInflater mInflater = getMenuInflater();
 	mInflater.inflate(R.menu.edit_settings, menu);

--- a/src/com/beem/project/beem/ui/wizard/AccountConfigure.java	Thu May 06 19:19:15 2010 +0200
+++ b/src/com/beem/project/beem/ui/wizard/AccountConfigure.java	Thu May 06 20:22:03 2010 +0200
@@ -62,6 +62,7 @@
 
 import com.beem.project.beem.ui.Login;
 import com.beem.project.beem.ui.Settings;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 
 /**
@@ -130,8 +131,8 @@
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 	if (requestCode == MANUAL_CONFIGURATION) {
 	    SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-	    String login = settings.getString("settings_key_account_username", "");
-	    String password = settings.getString("settings_key_account_password", "");
+	    String login = settings.getString(BeemApplication.ACCOUNT_USERNAME_KEY, "");
+	    String password = settings.getString(BeemApplication.ACCOUNT_PASSWORD_KEY, "");
 	    mAccountJID.setText(login);
 	    mAccountPassword.setText(password);
 	    checkUsername(login);
@@ -146,9 +147,8 @@
     private void configureAccount() {
 	SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
 	SharedPreferences.Editor edit = settings.edit();
-	edit.putString("settings_key_account_username", mAccountJID.getText().toString());
-	edit.putString("settings_key_account_password", mAccountPassword.getText().toString());
-	edit.putBoolean("PreferenceIsConfigured", true);
+	edit.putString(BeemApplication.ACCOUNT_USERNAME_KEY, mAccountJID.getText().toString());
+	edit.putString(BeemApplication.ACCOUNT_PASSWORD_KEY, mAccountPassword.getText().toString());
 	edit.commit();
     }