--- a/src/com/beem/project/beem/BeemApplication.java	Thu May 06 21:10:22 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Thu May 06 23:37:20 2010 +0200
@@ -55,21 +55,25 @@
  */
 public class BeemApplication extends Application {
 
+    /* Constants for PREFERENCE_KEY
+     * The format of the Preference key is :
+     * $name_KEY = "$name"
+     */
+    /** Preference key for account username. */
+    public static final String ACCOUNT_USERNAME_KEY = "account_username";
+    /** Preference key for account password. */
+    public static final String ACCOUNT_PASSWORD_KEY = "account_password";
+    /** Preference key for status (available, busy, away, ...). */
+    public static final String STATUS_KEY = "status";
+    /** Preference key for status message. */
+    public static final String STATUS_TEXT_KEY = "status_text";
+    //TODO add the other one
+
     private boolean mIsConnected;
     private boolean mIsAccountConfigured;
     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.
      */

--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Thu May 06 21:10:22 2010 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Thu May 06 23:37:20 2010 +0200
@@ -189,7 +189,6 @@
      * @param id status text id.
      * @return the status text from status the settings.
      */
-    @Deprecated
     private String getPreferenceString(int id) {
 	return mSettings.getString(getString(id), "");
     }

--- a/src/com/beem/project/beem/ui/Settings.java	Thu May 06 21:10:22 2010 +0200
+++ b/src/com/beem/project/beem/ui/Settings.java	Thu May 06 23:37:20 2010 +0200
@@ -48,7 +48,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.Menu;