# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1266100659 -3600
# Node ID c3946d9276ea51e1849c6560523182d3ec707f48
# Parent  f6c0888906e11ab140df64793269b3358e0133ad# Parent  d54deda513ffc9bdfe7af7a17cd174a97ef855af
Merge

diff -r d54deda513ff -r c3946d9276ea res/layout/preferences.xml
--- a/res/layout/preferences.xml	Sat Feb 13 22:26:22 2010 +0100
+++ b/res/layout/preferences.xml	Sat Feb 13 23:37:39 2010 +0100
@@ -15,21 +15,24 @@
 	<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="settings_key_account_username"
+			android:hint="@string/login_username_info_default" />
 		<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" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/user_preferences_advanced">
-		<EditTextPreference android:key="settings_key_resource"
-			android:title="@string/SettingsResourceTitle" android:summary="@string/SettingsResourceSummary"
-			android:defaultValue="Beem" />
-		<EditTextPreference android:key="settings_key_priority"
-			android:title="@string/SettingsPriorityTitle" android:summary="@string/SettingsPrioritySummary"
-			android:numeric="signed" android:defaultValue="0" />
-		<CheckBoxPreference android:title="@string/SettingsCheckboxText"
-			android:defaultValue="false" android:summary="@string/SettingsGmail"
-			android:key="settings_key_gmail" />
+		<EditTextPreference
+		    android:key="settings_key_resource"
+		    android:title="@string/SettingsResourceTitle"
+		    android:summary="@string/SettingsResourceSummary"
+		    android:defaultValue="Beem" />
+		<EditTextPreference
+		    android:key="settings_key_priority"
+		    android:title="@string/SettingsPriorityTitle"
+		    android:summary="@string/SettingsPrioritySummary"
+		    android:numeric="signed"
+		    android:defaultValue="0" />
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/network_preferences">
@@ -51,7 +54,8 @@
 				<EditTextPreference android:singleLine="true"
 					android:dependency="settings_key_proxy_use" android:name="port"
 					android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
-					android:key="settings_key_proxy_port" android:hint="@string/comments_proxy_port" />
+					android:key="settings_key_proxy_port"
+					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory android:title="@string/proxy_user_settings">
 				<EditTextPreference android:singleLine="true"
@@ -80,12 +84,13 @@
 			<EditTextPreference android:singleLine="true"
 				android:dependency="settings_key_specific_server" android:name="adresse"
 				android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server"
-				android:key="settings_key_xmpp_server" android:hint="@string/comments_xmpp_server" />
+				android:key="settings_key_xmpp_server" 
+				android:hint="@string/comments_xmpp_server"/>
 			<EditTextPreference android:singleLine="true"
 				android:dependency="settings_key_specific_server" android:name="port"
 				android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port"
-				android:defaultValue="5222" android:key="settings_key_xmpp_port"
-				android:hint="@string/comments_xmpp_port" />
+				android:defaultValue="5222" android:key="settings_key_xmpp_port" 
+				android:hint="@string/comments_xmpp_port"/>
 		</PreferenceScreen>
 	</PreferenceCategory>
 </PreferenceScreen>
diff -r d54deda513ff -r c3946d9276ea src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Sat Feb 13 22:26:22 2010 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sat Feb 13 23:37:39 2010 +0100
@@ -124,16 +124,14 @@
 	    int pport = Integer.parseInt(mSettings.getString("settings_key_proxy_port", "1080"));
 	    ProxyInfo.ProxyType type = ProxyType.valueOf(stype);
 	    mProxyInfo = new ProxyInfo(type, phost, pport, puser, ppass);
-	    if (mService != null)
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService, mProxyInfo);
-	    else
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mProxyInfo);
 	} else {
-	    if (mService != null)
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService);
-	    else
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort);
+	    mProxyInfo = ProxyInfo.forNoProxy();
 	}
+	if (mSettings.getBoolean("settings_key_specific_server", false))
+	    mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService, mProxyInfo);
+	else
+	    mConnectionConfiguration = new ConnectionConfiguration(mService, mProxyInfo);
+
 	if (mSettings.getBoolean("settings_key_xmpp_tls_use", false)
 	    || mSettings.getBoolean("settings_key_gmail", false)) {
 	    mConnectionConfiguration.setSecurityMode(SecurityMode.required);
@@ -186,8 +184,7 @@
 	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
 	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort) ;
 	}
-	if (mSettings.getBoolean("settings_key_gmail", false)) {
-	    mHost = "talk.google.com";
+	if ("gmail.com".equals(mService) || "googlemail.com".equals(mService))  {
 	    mLogin = tmpJid;
 	}
 
diff -r d54deda513ff -r c3946d9276ea src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Sat Feb 13 22:26:22 2010 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sat Feb 13 23:37:39 2010 +0100
@@ -286,12 +286,10 @@
 	if (mXmppFacade == null)
 	    bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
 	else {
-
-	    if (!mSettings.getBoolean("settings_key_hide_groups", true))
+	    if (!mSettings.getBoolean("settings_key_hide_groups", false))
 		buildBanner();
 	    else
 		hideGroups();
-
 	    buildContactList();
 	}
     }
@@ -797,7 +795,7 @@
 		    }
 		    mContactOnGroup.put(getString(R.string.contact_list_all_contact), tmpContactList);
 		    mCurGroup = getString(R.string.contact_list_all_contact);
-		    if (!mSettings.getBoolean("settings_key_hide_groups", true))
+		    if (!mSettings.getBoolean("settings_key_hide_groups", false))
 			buildBanner();
 		    else
 			hideGroups();