# HG changeset patch
# User Marseille
# Date 1246818171 -7200
# Node ID acfdfca27cc84989721090aa8bb5493f5c263efb
# Parent  52e3cbc0373079ca10ab93b99845f86e3b9040b4# Parent  abc2cfc924fa7e5d84c75f6a64c801ca5b0c3a82
Merge.

diff -r 52e3cbc03730 -r acfdfca27cc8 AndroidManifest.xml
--- a/AndroidManifest.xml	Sun Jul 05 20:22:33 2009 +0200
+++ b/AndroidManifest.xml	Sun Jul 05 20:22:51 2009 +0200
@@ -10,8 +10,6 @@
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
-		<activity android:name=".ui.ContactListSettings"
-			android:label="@string/app_name" />
 		<activity android:name=".ui.SendIM" android:label="@string/SendIMActTitle"
 			android:launchMode="singleTop" />
 		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle" />
diff -r 52e3cbc03730 -r acfdfca27cc8 res/layout/contactlist.xml
--- a/res/layout/contactlist.xml	Sun Jul 05 20:22:33 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-
-        <ExpandableListView android:id="@+id/android:list"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-            android:layout_weight="1" />
-
-        <TextView android:id="@+id/android:empty"
-			android:layout_width="fill_parent"
-            android:layout_height="fill_parent" android:text="@string/ConListNotConnected" />
-
-</LinearLayout>
diff -r 52e3cbc03730 -r acfdfca27cc8 res/layout/sendim.xml
--- a/res/layout/sendim.xml	Sun Jul 05 20:22:33 2009 +0200
+++ b/res/layout/sendim.xml	Sun Jul 05 20:22:51 2009 +0200
@@ -37,6 +37,8 @@
 		<TextView android:id="@+id/sendimlist" android:paddingLeft="10px"
 			android:paddingRight="10px" android:paddingTop="10px"
 			android:layout_width="fill_parent" android:layout_height="fill_parent"
+			android:textColor="@color/white"
+			android:background="@color/black"
 			android:singleLine="false" />
 
 	</ScrollView>
diff -r 52e3cbc03730 -r acfdfca27cc8 res/values-en/strings.xml
--- a/res/values-en/strings.xml	Sun Jul 05 20:22:33 2009 +0200
+++ b/res/values-en/strings.xml	Sun Jul 05 20:22:51 2009 +0200
@@ -18,23 +18,6 @@
 	<string name="BeemServiceDestroyed">BeemService destroyed</string>
 
 	<!--  Preferences informations -->
-	<string name="PreferenceFileName">Beem</string>
-	<string name="PreferenceHostKey">host</string>
-	<string name="PreferenceJID">Jabber ID</string>
-	<string name="PreferenceLoginKey">login</string>
-	<string name="PreferencePasswordKey">password</string>
-	<string name="PreferenceService">service</string>
-	<string name="PreferencePortKey">port</string>
-	<string name="PreferenceProxyHost">proxy_host</string>
-	<string name="PreferenceProxyPort">proxy_port</string>
-	<string name="PreferenceUseProxy">use_proxy</string>
-	<string name="PreferenceProxyType">proxy_type</string>
-	<string name="PreferenceProxyUser">proxy_user</string>
-	<string name="PreferenceProxyPassword">proxy_password</string>
-	<string name="PreferenceProxyTypeNone">None</string>
-	<string name="PreferenceProxyTypeHttp">HTTP</string>
-	<string name="PreferenceProxyTypeSocks4">SOCKS4</string>
-	<string name="PreferenceProxyTypeSocks5">SOCKS5</string>
 	<string name="PreferenceStatus">status</string>
 	<string name="PreferenceStatusText">status_text</string>
 	<string name="PreferenceIsConfigured">preference_is_configured</string>
diff -r 52e3cbc03730 -r acfdfca27cc8 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Sun Jul 05 20:22:33 2009 +0200
+++ b/res/values-fr/strings.xml	Sun Jul 05 20:22:51 2009 +0200
@@ -18,25 +18,9 @@
 	<string name="BeemServiceDestroyed">BeemService détruit</string>
 
 	<!--  Preferences informations -->
-	<string name="PreferenceFileName">Beem</string>
-	<string name="PreferenceHostKey">host</string>
-	<string name="PreferenceJID">Jabber ID</string>
-	<string name="PreferenceLoginKey">login</string>
-	<string name="PreferencePasswordKey">password</string>
-	<string name="PreferenceService">service</string>
-	<string name="PreferencePortKey">port</string>
-	<string name="PreferenceProxyHost">proxy_host</string>
-	<string name="PreferenceProxyPort">proxy_port</string>
-	<string name="PreferenceUseProxy">use_proxy</string>
-	<string name="PreferenceProxyType">proxy_type</string>
-	<string name="PreferenceProxyUser">proxy_user</string>
-	<string name="PreferenceProxyPassword">proxy_password</string>
-	<string name="PreferenceProxyTypeNone">None</string>
-	<string name="PreferenceProxyTypeHttp">HTTP</string>
-	<string name="PreferenceProxyTypeSocks4">SOCKS4</string>
-	<string name="PreferenceProxyTypeSocks5">SOCKS5</string>
 	<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>
@@ -45,7 +29,7 @@
 	<string name="CLSService">Service:</string>
 	<string name="CLSHostPort">Host/Port:</string>
 	<string name="CLSProxyInfo">Informations Proxy</string>
-	<string name="CLSLogin">Nom d'utilisateur:</string>
+	<string name="CLSLogin">Nom d\'utilisateur:</string>
 	<string name="CLSOkButton">Ok</string>
 
 	<!--  ContactDialog class -->
@@ -53,8 +37,8 @@
 	<string name="CDAlias">Alias</string>
 	<string name="CDResend">Réenvoyer la demande</string>
 	<string name="CDInfos">Informations utilisateur</string>
-	<string name="CDBlock">Bloquer l'utilisateur</string>
-	<string name="CDDelete">Supprimer l'utilisateur</string>
+	<string name="CDBlock">Bloquer l\'utilisateur</string>
+	<string name="CDDelete">Supprimer l\'utilisateur</string>
 	<string name="CDSure2Delete">Êtes-vous sûr de vouloir supprimer ce contact ?</string>
 	<string name="CDSure2DeleteYes">Oui</string>
 	<string name="CDSure2DeleteNo">Non</string>
@@ -67,7 +51,7 @@
 	<string name="AddCOkButton">Ok</string>
 	<string name="AddCContactAdded">Contact ajouté</string>
 	<string name="AddCContactAddedError">Erreur Contact pas ajouté</string>
-	<string name="AddCContactAddedLoginError">Error Nom d'utilisateur</string>
+	<string name="AddCContactAddedLoginError">Error Nom d\'utilisateur</string>
 	<string name="AddCBadForm">Mauvais formulaire</string>
 
 	<!--  SendIM class -->
@@ -95,9 +79,9 @@
 	
 	<!-- Subscription class -->
 	<string name="SubscriptAccept">Abonnement accepté</string>
-	<string name="SubscriptError">Erreur d'abonnement</string>
+	<string name="SubscriptError">Erreur d\'abonnement</string>
 	<string name="SubscriptRefused">Abonnement refusé</string>
-	<string name="SubscriptText">Vous avez une requête d'ajout de la part de %s. Souhaitez-vous l'accepter ?</string>
+	<string name="SubscriptText">Vous avez une requête d\'ajout de la part de %s. Souhaitez-vous l\'accepter ?</string>
 	
 	<!-- ContactList class -->
 	<string name="ConListNotConnected">Non connecté</string>
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/ContactList.java
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/ContactListSettings.java
--- a/src/com/beem/project/beem/ui/ContactListSettings.java	Sun Jul 05 20:22:33 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-package com.beem.project.beem.ui;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.Spinner;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.LinearLayout.LayoutParams;
-
-import com.beem.project.beem.R;
-
-public class ContactListSettings extends Activity {
-
-    public static final int              CHANGE      = 1;
-    private boolean                      mIsChanged  = false;
-    private SharedPreferences            mSettings;
-    private String[]                     mProxyTypeString;
-
-    private final OnItemSelectedListener mProxyType  = new OnItemSelectedListener() {
-
-	                                                 @Override
-	                                                 public void onItemSelected(AdapterView<?> parent, View arg1,
-	                                                         int arg2, long arg3) {
-		                                             String value = parent.getSelectedItem().toString();
-		                                             LinearLayout ll = (LinearLayout) findViewById(R.id.proxy_layout);
-		                                             SharedPreferences.Editor editor = mSettings.edit();
-		                                             LayoutParams lp = (LayoutParams) ll.getLayoutParams();
-		                                             if (value
-		                                                     .equals(getString(R.string.PreferenceProxyTypeNone))) {
-		                                                 ll.setVisibility(View.INVISIBLE);
-		                                                 lp.height = 0;
-		                                                 ll.setLayoutParams(lp);
-		                                                 editor.putBoolean(
-		                                                         getString(R.string.PreferenceUseProxy), false);
-		                                             } else {
-		                                                 ll.setVisibility(View.VISIBLE);
-		                                                 lp.height = android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
-		                                                 ll.setLayoutParams(lp);
-		                                                 editor.putBoolean(
-		                                                         getString(R.string.PreferenceUseProxy), true);
-		                                             }
-		                                             if (!value
-		                                                     .equals(getPreferenceString(R.string.PreferenceProxyType))) {
-		                                                 editor
-		                                                         .putString(
-		                                                                 getString(R.string.PreferenceProxyType),
-		                                                                 value);
-		                                                 mIsChanged = true;
-		                                             }
-		                                             editor.commit();
-	                                                 }
-
-	                                                 @Override
-	                                                 public void onNothingSelected(AdapterView<?> arg0) {
-	                                                 }
-
-	                                             };
-
-    private final OnClickListener        mOkListener = new OnClickListener() {
-
-	                                                 public void onClick(View v) {
-		                                             SharedPreferences.Editor editor = mSettings.edit();
-
-		                                             if (isChanged(R.id.host, R.string.PreferenceHostKey)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferenceHostKey),
-		                                                         getWidgetText(R.id.host));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (Integer.parseInt(getWidgetText(R.id.port)) != mSettings
-		                                                     .getInt(getString(R.string.PreferencePortKey),
-		                                                             5222)) {
-		                                                 editor.putInt(getString(R.string.PreferencePortKey),
-		                                                         Integer.parseInt(getWidgetText(R.id.port)));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (isChanged(R.id.userid, R.string.PreferenceLoginKey)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferenceLoginKey),
-		                                                         getWidgetText(R.id.userid));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (isChanged(R.id.password,
-		                                                     R.string.PreferencePasswordKey)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferencePasswordKey),
-		                                                         getWidgetText(R.id.password));
-		                                                 mIsChanged = true;
-		                                             }
-
-		                                             if (isChanged(R.id.proxy_host,
-		                                                     R.string.PreferenceProxyHost)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferenceProxyHost),
-		                                                         getWidgetText(R.id.proxy_host));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (Integer.parseInt(getWidgetText(R.id.proxy_port)) != mSettings
-		                                                     .getInt(getString(R.string.PreferenceProxyPort), 0)) {
-		                                                 editor
-		                                                         .putInt(
-		                                                                 getString(R.string.PreferenceProxyPort),
-		                                                                 Integer
-		                                                                         .parseInt(getWidgetText(R.id.proxy_port)));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (isChanged(R.id.proxy_login,
-		                                                     R.string.PreferenceProxyUser)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferenceProxyUser),
-		                                                         getWidgetText(R.id.proxy_login));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (isChanged(R.id.proxy_pwd,
-		                                                     R.string.PreferenceProxyPassword)) {
-		                                                 editor.putString(
-		                                                         getString(R.string.PreferenceProxyPassword),
-		                                                         getWidgetText(R.id.proxy_pwd));
-		                                                 mIsChanged = true;
-		                                             }
-		                                             if (mIsChanged == true) {
-		                                                 editor.commit();
-		                                                 setResult(RESULT_OK);
-		                                             } else
-		                                                 setResult(RESULT_CANCELED);
-		                                             finish();
-	                                                 }
-	                                             };
-
-    private String getPreferenceString(int id) {
-	return mSettings.getString(getString(id), "");
-    }
-
-    private String getWidgetText(int id) {
-	EditText widget = (EditText) this.findViewById(id);
-	return widget.getText().toString();
-    }
-
-    private boolean isChanged(int idEdit, int idPreference) {
-	return (!getWidgetText(idEdit).equals(getPreferenceString(idPreference)));
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-	super.onCreate(savedInstanceState);
-	setContentView(R.layout.contactlistsettings);
-
-	String TypeNone = getString(R.string.PreferenceProxyTypeNone);
-	String TypeHTTP = getString(R.string.PreferenceProxyTypeHttp);
-	String TypeSocks4 = getString(R.string.PreferenceProxyTypeSocks4);
-	String TypeSocks5 = getString(R.string.PreferenceProxyTypeSocks5);
-
-	mProxyTypeString = new String[] { TypeNone, TypeHTTP, TypeSocks4, TypeSocks5 };
-	mSettings = getSharedPreferences(getString(R.string.settings_filename), MODE_PRIVATE);
-
-	Spinner sp = (Spinner) findViewById(R.id.proxy_type);
-	ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item,
-	        mProxyTypeString);
-	adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-	sp.setAdapter(adapter);
-	for (int i = 0; i < mProxyTypeString.length; ++i)
-	    if (mProxyTypeString[i].equals(getPreferenceString(R.string.PreferenceProxyType)))
-		sp.setSelection(i);
-	sp.setOnItemSelectedListener(mProxyType);
-
-	Button ok = (Button) findViewById(R.id.ok);
-	ok.setOnClickListener(mOkListener);
-
-	showSettings();
-    }
-
-    private void showSettings() {
-	EditText e = (EditText) findViewById(R.id.host);
-	e.setText(getPreferenceString(R.string.PreferenceHostKey));
-	e = (EditText) findViewById(R.id.port);
-	e.setText(String.valueOf(mSettings.getInt(getString(R.string.PreferencePortKey), 5222)));
-	e = (EditText) findViewById(R.id.userid);
-	e.setText(getPreferenceString(R.string.PreferenceLoginKey));
-	e = (EditText) findViewById(R.id.password);
-	e.setText(getPreferenceString(R.string.PreferencePasswordKey));
-
-	e = (EditText) findViewById(R.id.proxy_host);
-	e.setText(getPreferenceString(R.string.PreferenceProxyHost));
-	e = (EditText) findViewById(R.id.proxy_port);
-	e.setText(String.valueOf(mSettings.getInt(getString(R.string.PreferenceProxyPort), 1080)));
-	e = (EditText) findViewById(R.id.proxy_login);
-	e.setText(getPreferenceString(R.string.PreferenceProxyUser));
-	e = (EditText) findViewById(R.id.proxy_pwd);
-	e.setText(getPreferenceString(R.string.PreferenceProxyPassword));
-    }
-
-}
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/CreateAccount.java
--- a/src/com/beem/project/beem/ui/CreateAccount.java	Sun Jul 05 20:22:33 2009 +0200
+++ b/src/com/beem/project/beem/ui/CreateAccount.java	Sun Jul 05 20:22:51 2009 +0200
@@ -33,8 +33,6 @@
     private final static String DEFAULT_STRING_VALUE = "";
     private final static int DEFAULT_INT_VALUE = 0;
 
-    private final static String DEFAULT_XMPP_PORT = "5222";
-
     private final static int NOTIFICATION_DURATION = Toast.LENGTH_SHORT;
 
     private SharedPreferences settings = null;
@@ -250,6 +248,7 @@
 			SharedPreferences.Editor settingsEditor = settings.edit();
 			settingsEditor.putString(getString(R.string.settings_key_account_username), usernameFieldValue);
 			settingsEditor.putString(getString(R.string.settings_key_account_password), passwordFieldValue);
+			settingsEditor.putBoolean(getString(R.string.PreferenceIsConfigured), true);
 			settingsEditor.commit();
 			finish();
 		    }
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/EditSettings.java
--- a/src/com/beem/project/beem/ui/EditSettings.java	Sun Jul 05 20:22:33 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java	Sun Jul 05 20:22:51 2009 +0200
@@ -6,7 +6,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.text.Editable;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/Login.java
--- a/src/com/beem/project/beem/ui/Login.java	Sun Jul 05 20:22:33 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java	Sun Jul 05 20:22:51 2009 +0200
@@ -12,7 +12,6 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.preference.Preference;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
diff -r 52e3cbc03730 -r acfdfca27cc8 src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Sun Jul 05 20:22:33 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Sun Jul 05 20:22:51 2009 +0200
@@ -91,7 +91,7 @@
     @Override
     protected void onCreate(Bundle saveBundle) {
 	super.onCreate(saveBundle);
-	setTheme(R.style.OldTheme);
+	//setTheme(R.style.OldTheme);
 	setContentView(R.layout.sendim);
 	mHandler = new Handler();
 	mChatManagerListener = new OnChatListener();