# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1259942523 -3600
# Node ID 98442ee557bfba01647c485200b6c3b8e8080cac
# Parent  9bc335cd3a0d1bb008545995ab684168d681eb2c# Parent  e561bc44c3960f130226d6301edffc6e101bb4e5
merge

diff -r e561bc44c396 -r 98442ee557bf src/com/beem/project/beem/ui/ChangeStatus.java
--- a/src/com/beem/project/beem/ui/ChangeStatus.java	Fri Dec 04 16:48:31 2009 +0100
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java	Fri Dec 04 17:02:03 2009 +0100
@@ -128,7 +128,7 @@
      * @return the status index from status the settings.
      */
     private int getPreferenceStatusIndex() {
-	return mSettings.getInt(getString(R.string.PreferenceStatus), 0);
+	return mSettings.getInt("PreferenceStatus", 0);
     }
 
     /**
diff -r e561bc44c396 -r 98442ee557bf src/com/beem/project/beem/utils/BeemConnectivity.java
--- a/src/com/beem/project/beem/utils/BeemConnectivity.java	Fri Dec 04 16:48:31 2009 +0100
+++ b/src/com/beem/project/beem/utils/BeemConnectivity.java	Fri Dec 04 17:02:03 2009 +0100
@@ -14,32 +14,32 @@
 	NetworkInfo ni = cm.getActiveNetworkInfo();
 	return ni != null && ni.isConnected();
     }
-    
+
     public static boolean isWifi(Context ctx) {
-        WifiManager wm = (WifiManager) ctx.getSystemService(Context.WIFI_SERVICE);
-        WifiInfo wi = wm.getConnectionInfo();
-        if (wi != null)
-                return false;
-        if (wi != null
-                && (WifiInfo.getDetailedStateOf(wi.getSupplicantState()) == DetailedState.OBTAINING_IPADDR || WifiInfo
-                        .getDetailedStateOf(wi.getSupplicantState()) == DetailedState.CONNECTED)) {
-            return false;
-        }
-        return false;
+	WifiManager wm = (WifiManager) ctx.getSystemService(Context.WIFI_SERVICE);
+	WifiInfo wi = wm.getConnectionInfo();
+	if (wi != null)
+	    return false;
+	if (wi != null
+	    && (WifiInfo.getDetailedStateOf(wi.getSupplicantState()) == DetailedState.OBTAINING_IPADDR || WifiInfo
+		.getDetailedStateOf(wi.getSupplicantState()) == DetailedState.CONNECTED)) {
+	    return false;
+	}
+	return false;
     }
 
     public static boolean isUmts(Context ctx) {
-        TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE);
-        if (tm.getNetworkType() >= TelephonyManager.NETWORK_TYPE_UMTS)
-            return true;
-        return false;
+	TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE);
+	if (tm.getNetworkType() >= TelephonyManager.NETWORK_TYPE_UMTS)
+	    return true;
+	return false;
     }
 
     public static boolean isEdge(Context ctx) {
-        TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE);
-        if (tm.getNetworkType() == TelephonyManager.NETWORK_TYPE_EDGE)
-            return true;
-        return false;
+	TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE);
+	if (tm.getNetworkType() == TelephonyManager.NETWORK_TYPE_EDGE)
+	    return true;
+	return false;
     }