--- a/.classpath Mon Nov 16 22:39:11 2009 +0100
+++ b/.classpath Tue Nov 17 00:27:43 2009 +0100
@@ -8,7 +8,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="libs/security.jar"/>
- <classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/nikita/devel/smack/source">
+ <classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
</attributes>
--- a/AndroidManifest.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/AndroidManifest.xml Tue Nov 17 00:27:43 2009 +0100
@@ -2,10 +2,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.beem.project.beem" android:versionCode="1"
android:versionName="1.0">
- <application android:label="@string/app_name" android:icon="@drawable/beem_launcher_icon_silver"
- android:theme="@style/Theme.BEEM.Default" android:debuggable="true"
- android:name="@string/app_name"
- >
+ <application android:label="@string/app_name"
+ android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
+ android:debuggable="true" android:name="@string/app_name">
<activity android:name=".ui.Login" android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
@@ -26,8 +25,9 @@
<activity android:name=".ui.Chat" android:label="@string/chat_name"
android:launchMode="singleTop">
<intent-filter android:label="Beem Connection">
- <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
- </intent-filter>
+ <action
+ android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
+ </intent-filter>
</activity>
<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle">
<intent-filter android:label="Beem Connection">
@@ -74,6 +74,12 @@
android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
</intent-filter>
</activity>
+ <activity android:name=".ui.PrivacyList" android:label="@string/privacy_list_name">
+ <intent-filter android:label="Beem Connection">
+ <action
+ android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
+ </intent-filter>
+ </activity>
<service android:name="BeemService" android:enabled="true"
android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
<intent-filter>
--- a/default.properties Mon Nov 16 22:39:11 2009 +0100
+++ b/default.properties Tue Nov 17 00:27:43 2009 +0100
@@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
-target=android-5
+target=android-3
apk-configurations=
--- a/res/layout/chat.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/res/layout/chat.xml Tue Nov 17 00:27:43 2009 +0100
@@ -3,9 +3,9 @@
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical">
<LinearLayout android:id="@+id/chat_header"
- android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal"
- android:gravity="center_vertical" android:background="#222222"
- android:padding="4px">
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:orientation="horizontal" android:gravity="center_vertical"
+ android:background="#222222" android:padding="4px">
<ImageView android:id="@+id/chat_contact_status_icon"
android:adjustViewBounds="true" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:gravity="center_vertical" />
@@ -25,13 +25,20 @@
<View android:layout_width="fill_parent" android:layout_height="2dp"
android:fadingEdge="horizontal" android:background="#555555" />
<ListView android:id="@+id/chat_messages"
- android:layout_width="fill_parent"
- android:layout_height="0px" android:layout_weight="1"
- android:transcriptMode="normal" android:fastScrollEnabled="true"
- android:smoothScrollbar="false" android:layout_marginBottom="20sp"
- android:padding="4px" />
- <EditText android:id="@+id/chat_input" android:layout_width="fill_parent"
- android:layout_height="wrap_content" android:inputType="textShortMessage"
- android:imeOptions="actionSend" android:cursorVisible="true"
- android:hint="@string/chat_input_default_value" />
+ android:layout_width="fill_parent" android:layout_height="0px"
+ android:layout_weight="1" android:transcriptMode="normal"
+ android:fastScrollEnabled="true" android:smoothScrollbar="false"
+ android:layout_marginBottom="20sp" android:padding="4px" />
+ <LinearLayout android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:orientation="horizontal"
+ android:background="#222222" android:padding="8px">
+ <EditText android:id="@+id/chat_input" android:layout_width="wrap_content"
+ android:layout_height="fill_parent" android:layout_weight="1"
+ android:ellipsize="end" android:inputType="textShortMessage|textAutoCorrect"
+ android:imeOptions="actionSend" android:cursorVisible="true"
+ android:hint="@string/chat_input_default_value" />
+ <Button android:id="@+id/chat_send_message"
+ android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:text="@string/chat_send_message" />
+ </LinearLayout>
</LinearLayout>
--- a/res/layout/preferences.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/res/layout/preferences.xml Tue Nov 17 00:27:43 2009 +0100
@@ -1,42 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:shouldDisableView="true"
- android:selectable="true">
-
- <PreferenceCategory
- android:title="@string/general_preferences">
-
- <PreferenceScreen
- android:key="contact_list"
- android:title="@string/contact_list_preferences"
- android:summary="@string/contact_list_preferences_sum">
-
- <CheckBoxPreference
- android:title="@string/CLP_hidden_contact"
- android:defaultValue="false"
- android:summary="@string/CLP_hidden_contact_sum"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shouldDisableView="true" android:selectable="true">
+ <PreferenceCategory android:title="@string/general_preferences">
+ <PreferenceScreen android:key="contact_list"
+ android:title="@string/contact_list_preferences" android:summary="@string/contact_list_preferences_sum">
+ <CheckBoxPreference android:title="@string/CLP_hidden_contact"
+ android:defaultValue="false" android:summary="@string/CLP_hidden_contact_sum"
android:key="settings_key_hidden_contact" />
-
</PreferenceScreen>
-
</PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/user_preferences">
-
- <EditTextPreference
- android:singleLine="true"
- android:summary="@string/SettingsText"
- android:title="@string/settings_account_username"
+ <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" />
- <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" />
+ <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" />
<EditTextPreference
android:key="settings_key_resource"
android:title="@string/SettingsResourceTitle"
@@ -48,130 +27,64 @@
android:summary="@string/SettingsPrioritySummary"
android:numeric="integer"
android:defaultValue="0" />
- <CheckBoxPreference
- android:title="@string/SettingsCheckboxText"
- android:defaultValue="false"
- android:summary="@string/SettingsGmail"
+ <CheckBoxPreference android:title="@string/SettingsCheckboxText"
+ android:defaultValue="false" android:summary="@string/SettingsGmail"
android:key="settings_key_gmail" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/network_preferences">
-
- <PreferenceScreen
- android:key="proxy"
- android:title="@string/SettingsProxy"
- android:summary="@string/settings_proxy_sum">
-
- <CheckBoxPreference
- android:title="@string/SettingsProxyProxy"
- android:defaultValue="false"
- android:summary="@string/SettingsProxySummary"
- android:key="settings_key_proxy_use" />
-
- <PreferenceCategory
- android:title="@string/proxy_proxy_settings">
-
- <ListPreference
- android:dependency="settings_key_proxy_use"
- android:title="@string/SettingsProxyType"
- android:entries="@array/proxy_types"
- android:summary="@string/SettingsProxyTypeSummary"
- android:defaultValue="HTTP"
- android:entryValues="@array/proxy_types"
- android:key="settings_key_proxy_type" />
-
- <EditTextPreference
- android:singleLine="true"
- android:dependency="settings_key_proxy_use"
- android:name="serveur"
- android:summary="@string/SettingsProxyServer"
- android:title="@string/settings_proxy_server"
- android:key="settings_key_proxy_server" />
-
- <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" />
-
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/proxy_user_settings">
-
- <EditTextPreference
- android:singleLine="true"
- android:dependency="settings_key_proxy_use"
- android:name="Utilisateur"
- android:summary="@string/SettingsProxyUser"
- android:title="@string/settings_proxy_username"
- android:key="settings_key_proxy_username" />
+ </PreferenceCategory>
- <EditTextPreference
- android:singleLine="true"
- android:dependency="settings_key_proxy_use"
- android:name="pass_user"
- android:password="true"
- android:summary="@string/SettingsProxyPassword"
- android:title="@string/settings_proxy_password"
- android:key="settings_key_proxy_password" />
-
+ <PreferenceCategory android:title="@string/network_preferences">
+ <PreferenceScreen android:key="proxy" android:title="@string/SettingsProxy"
+ android:summary="@string/settings_proxy_sum">
+ <CheckBoxPreference android:title="@string/SettingsProxyProxy"
+ android:defaultValue="false" android:summary="@string/SettingsProxySummary"
+ android:key="settings_key_proxy_use" />
+ <PreferenceCategory android:title="@string/proxy_proxy_settings">
+ <ListPreference android:dependency="settings_key_proxy_use"
+ android:title="@string/SettingsProxyType" android:entries="@array/proxy_types"
+ android:summary="@string/SettingsProxyTypeSummary"
+ android:defaultValue="HTTP" android:entryValues="@array/proxy_types"
+ android:key="settings_key_proxy_type" />
+ <EditTextPreference android:singleLine="true"
+ android:dependency="settings_key_proxy_use" android:name="serveur"
+ android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server"
+ android:key="settings_key_proxy_server" />
+ <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" />
</PreferenceCategory>
-
+ <PreferenceCategory android:title="@string/proxy_user_settings">
+ <EditTextPreference android:singleLine="true"
+ android:dependency="settings_key_proxy_use" android:name="Utilisateur"
+ android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username"
+ android:key="settings_key_proxy_username" />
+ <EditTextPreference android:singleLine="true"
+ android:dependency="settings_key_proxy_use" android:name="pass_user"
+ android:password="true" android:summary="@string/SettingsProxyPassword"
+ android:title="@string/settings_proxy_password" android:key="settings_key_proxy_password" />
+ </PreferenceCategory>
</PreferenceScreen>
-
- <PreferenceScreen
- android:key="advanced"
- android:title="@string/SettingsAdvanced"
- android:summary="@string/settings_advanced_sum">
-
- <PreferenceCategory
- android:title="@string/settings_advanced_service_behaviour">
-
- <CheckBoxPreference
- android:title="@string/settings_xmpp_use_tls"
- android:defaultValue="false"
- android:key="settings_key_xmpp_tls_use" />
-
- <EditTextPreference
- android:singleLine="true"
- android:title="@string/settings_reco_delay"
- android:name="Reconnect delay"
- android:summary="@string/SettingsAdvancedRecoDelay"
- android:key="settings_key_reco_delay"
+ <PreferenceScreen android:key="advanced"
+ android:title="@string/SettingsAdvanced" android:summary="@string/settings_advanced_sum">
+ <PreferenceCategory android:title="@string/settings_advanced_service_behaviour">
+ <CheckBoxPreference android:title="@string/settings_xmpp_use_tls"
+ android:defaultValue="false" android:key="settings_key_xmpp_tls_use" />
+ <EditTextPreference android:singleLine="true"
+ android:title="@string/settings_reco_delay" android:name="Reconnect delay"
+ android:summary="@string/SettingsAdvancedRecoDelay" android:key="settings_key_reco_delay"
android:defaultValue="10" />
-
</PreferenceCategory>
-
- <CheckBoxPreference
- android:title="@string/SettingsAdvancedOptions"
- android:defaultValue="false"
- android:summary="@string/SettingsAdvancedSpecOpt"
+ <CheckBoxPreference android:title="@string/SettingsAdvancedOptions"
+ android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt"
android:key="settings_key_specific_server" />
-
- <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"/>
-
- <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" />
-
+ <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" />
+ <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" />
</PreferenceScreen>
-
</PreferenceCategory>
-
</PreferenceScreen>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/privacy_list.xml Tue Nov 17 00:27:43 2009 +0100
@@ -0,0 +1,10 @@
+<?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" android:padding="8dp">
+ <ListView android:id="@id/android:list" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:layout_weight="1"
+ android:drawSelectorOnTop="false" />
+ <TextView android:id="@id/android:empty" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:text="@string/privacy_list_no_data" />
+</LinearLayout>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/layout/privacy_list_create_dialog.xml Tue Nov 17 00:27:43 2009 +0100
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView android:id="@+id/privacy_list_create_dialog_list_name_label"
+ android:layout_height="wrap_content" android:layout_width="wrap_content"
+ android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
+ android:text="@string/privacy_list_create_dialog_list_name_label" android:gravity="left"
+ style="@style/Label" />
+ <EditText android:id="@+id/privacy_list_create_dialog_list_name"
+ android:layout_height="wrap_content" android:layout_width="fill_parent"
+ android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
+ android:scrollHorizontally="true" android:autoText="false"
+ android:capitalize="none" android:gravity="fill_horizontal" />
+</LinearLayout>
--- a/res/menu/edit_settings.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/res/menu/edit_settings.xml Tue Nov 17 00:27:43 2009 +0100
@@ -7,4 +7,8 @@
android:visible="true"
android:title="@string/settings_menu_login"
android:icon="@drawable/ic_menu_login" />
+ <item android:id="@+id/settings_menu_privacy_lists"
+ android:visible="true"
+ android:title="@string/settings_menu_privacy_lists"
+ android:icon="@drawable/ic_menu_blocked_user" />
</menu>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/menu/privacy_list.xml Tue Nov 17 00:27:43 2009 +0100
@@ -0,0 +1,4 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/privacy_list_menu_create" android:visible="true"
+ android:title="@string/privacy_list_menu_create" android:icon="@drawable/ic_menu_add" />
+</menu>
--- a/res/values-fr/strings.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/res/values-fr/strings.xml Tue Nov 17 00:27:43 2009 +0100
@@ -65,11 +65,11 @@
<string name="SendIMSmiley">Insérer un sourire</string>
<string name="SendIMLoginHint">Nom d\'utilisateur</string>
<string name="SendIMNoStatusSet">Aucun statut défini</string>
-
+
<!-- ChangeStatus class -->
<string name="ChangeStatusActTitle">Beem - Changer mon statut</string>
- <string name="ChangeStatusType">Mon statut</string>
+ <string name="ChangeStatusType">Mon statut</string>
<string name="ChangeStatusMessage">Mon message personnel</string>
<string name="MenuAddContact">Ajouter un nouveau contact</string>
<string name="MenuAccountAbout">Beem Project</string>
@@ -77,7 +77,7 @@
<string name="MenuConnection">Modifier un compte</string>
<string name="ChangeStatusOk">Mise à jour du statut</string>
<string name="ChangeStatusNoChange">Rien à changer</string>
-
+
<!-- Settings class -->
<string name="SettingsText">Saisissez votre identifiant de connexion</string>
<string name="SettingsPassword">Saisissez votre mot de passe</string>
@@ -109,47 +109,47 @@
<string name="SubscriptRefused">Inscription refusée</string>
<string name="SubscriptText">%s vient de vous ajouter à sa liste de contacts. Souhaitez-vous l\'autoriser ?</string>
<string name="SubscriptTitle">Autoriser ce contact ?</string>
-
+
<!-- ContactList class -->
<string name="ConListNotConnected">Non connecté(e)</string>
<!-- BeemChatManager class -->
<string name="BeemChatManagerNewMessage">Vous avez reçu un nouveau message</string>
-
+
<!-- BeemBroadcastReceiver class -->
<string name="BeemBroadcastReceiverDisconnect">Vous avez été déconnecté(e)</string>
-
+
<!-- XmppConnectionAdapter class -->
<string name="AcceptContactRequest">%s vient de vous ajouter à sa liste d\'amis.</string>
<string name="AcceptContactRequestFrom">Autoriser %s à vous contacter.</string>
-
- <!--
+
+ <!--
Services
-->
-
- <!--
+
+ <!--
Activities
-->
- <string name="login_tag">Beem - Activité de connexion</string>
- <string name="edit_settings_name">Beem - Paramètres</string>
+ <string name="login_tag">Beem - Activité de connexion</string>
+ <string name="edit_settings_name">Beem - Paramètres</string>
<string name="edit_settings_tag">Beem - EditSettings Activity</string>
- <string name="create_account_name">Beem - Créer un compte</string>
- <string name="create_account_tag">Beem - CreateAccount Activity</string>
- <string name="contact_list_name">Beem - Contacts</string>
- <string name="contact_list_tag">Beem - ContactList Activity</string>
- <string name="user_info_name">Beem - Informations</string>
-
- <!--
+ <string name="create_account_name">Beem - Créer un compte</string>
+ <string name="create_account_tag">Beem - CreateAccount Activity</string>
+ <string name="contact_list_name">Beem - Contacts</string>
+ <string name="contact_list_tag">Beem - ContactList Activity</string>
+ <string name="user_info_name">Beem - Informations</string>
+
+ <!--
Buttons
-->
- <string name="button_reset">Réinitialiser</string>
- <string name="button_login">Se connecter</string>
- <string name="button_save">Enregistrer</string>
- <string name="button_create_account">Créer ce compte</string>
- <string name="button_create_login_account">Créer puis utiliser ce compte</string>
-
-
- <!--
+ <string name="button_reset">Réinitialiser</string>
+ <string name="button_login">Se connecter</string>
+ <string name="button_save">Enregistrer</string>
+ <string name="button_create_account">Créer ce compte</string>
+ <string name="button_create_login_account">Créer puis utiliser ce compte</string>
+
+
+ <!--
LogAs Activity
-->
<string name="login_username">Nom d\'utilisateur</string>
@@ -161,21 +161,25 @@
<string name="login_menu_about">A propos</string>
<string name="login_about_title">A propos</string>
<string name="login_about_msg">
- Beem est un EPITECH Innovative Project. Rencontrez nous sur http://www.beem-project.com !
+ Beem est un EPITECH Innovative Project. Rencontrez
+ nous sur http://www.beem-project.com !
</string>
<string name="login_about_button">Fermer</string>
<string name="login_settings_button">Paramètres</string>
<string name="login_login_button">Connexion</string>
- <string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>
- <string name="login_error_msg">Malheureusement, une erreur est survenu.\n\nDétail de l\'erreur :\n%s</string>
-
+ <string name="login_login_progress">Connexion en cours. Veuillez patienter...</string>
+ <string name="login_error_msg">Malheureusement, une erreur est survenu.\n\nDétail
+ de l\'erreur :\n%s</string>
+
<!--
EditSettings Activity
-->
<string name="settings_menu_create_account">Créer un compte</string>
<string name="settings_menu_login">Se connecter</string>
- <string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
-
+ <string name="settings_menu_privacy_lists">Gérer mes listes privées</string>
+ <string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.
+ </string>
+
<string name="settings_key_account_username">beem_account_username</string>
<string name="settings_key_account_password">beem_account_password</string>
<string name="settings_key_xmpp_server">beem_xmpp_server</string>
@@ -188,7 +192,7 @@
<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
-
+
<!-- EditSettings Activity Categories -->
<string name="general_preferences">Préférences de l\'application</string>
<string name="user_preferences">Utilisateur</string>
@@ -203,10 +207,11 @@
<string name="settings_tab_label_xmpp">XMPP</string>
<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
<string name="settings_tab_label_proxy">Proxy</string>
-
+
<!-- EditSettings Activity General Preferences Tabs -->
<string name="contact_list_preferences">Liste d\'ami(e)s</string>
- <string name="contact_list_preferences_sum">Une série d\'options d\'affichage de votre liste d\'ami(e)s</string>
+ <string name="contact_list_preferences_sum">Une série d\'options d\'affichage de votre liste
+ d\'ami(e)s</string>
<string name="CLP_hidden_contact">Caché(e)s</string>
<string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les ami(e)s déconnecté(e)s</string>
@@ -215,7 +220,7 @@
<string name="settings_account_password">Mot de passe</string>
<string name="settings_account_server">Serveur</string>
<string name="settings_account_port">Port</string>
-
+
<!-- EditSettings Activity Advanced Options tab -->
<string name="settings_advanced_service_behaviour">Comportement du service</string>
<string name="settings_advanced_sum">Une série d\'options pour les utilisateurs avertis</string>
@@ -224,7 +229,7 @@
<string name="settings_xmpp_use_tls">Utiliser SSL/TLS</string>
<string name="settings_reco_delay">Délai de reconnexion</string>
-
+
<!-- EditSettings Activity Proxy tab -->
<string name="settings_proxy_sum">Paramètrez un serveur proxy</string>
<string name="settings_proxy_use">Utiliser un proxy</string>
@@ -233,7 +238,7 @@
<string name="settings_proxy_port">Port</string>
<string name="settings_proxy_username">Nom d\'utilisateur</string>
<string name="settings_proxy_password">Mot de passe</string>
-
+
<!--
Create an account Activity
-->
@@ -247,14 +252,14 @@
<string name="create_account_username">Nom d\'utilisateur</string>
<string name="create_account_password">Mot de passe</string>
<string name="create_account_confirm_password">Confirmation du mot de passe</string>
-
+
<!--
ContactList Activity
-->
- <string name="contact_list_menu_add_contact">Ajouter un contact</string>
- <string name="contact_list_menu_settings">Paramètres</string>
- <string name="contact_list_all_contact">Tous les contacts</string>
- <string name="contact_list_no_group">Aucun groupe</string>
+ <string name="contact_list_menu_add_contact">Ajouter un contact</string>
+ <string name="contact_list_menu_settings">Paramètres</string>
+ <string name="contact_list_all_contact">Tous les contacts</string>
+ <string name="contact_list_no_group">Aucun groupe</string>
<!--
@@ -274,16 +279,26 @@
<string name="chat_input_default_value">Saisissez votre message</string>
<string name="chat_name">Beem - Chat</string>
<string name="chat_self">Moi</string>
+ <string name="chat_send_message">Envoyer</string>
+ <string name="chat_menu_contacts_list">Liste de contacts</string>
+ <string name="chat_menu_change_chat">Changer de conversation</string>
+ <string name="chat_dialog_change_chat_title">Conversations en cours</string>
+ <string name="chat_menu_close_chat">Fermer cette conversation</string>
+ <string name="chat_no_more_chats">Aucune conversation en cours</string>
+
<string name="contact_status_msg_available">Disponible</string>
<string name="contact_status_msg_available_chat">Disponible pour clavarder</string>
<string name="contact_status_msg_dnd">Occupé(e)</string>
<string name="contact_status_msg_away">Parti(e)</string>
<string name="contact_status_msg_xa">Indisponible</string>
<string name="contact_status_msg_offline">Hors ligne</string>
-<string name="UpdateButton">Mettre à jour</string>
-<string name="chat_menu_contacts_list">Liste de contacts</string>
-<string name="chat_menu_change_chat">Changer de conversation</string>
-<string name="chat_dialog_change_chat_title">Conversations en cours</string>
-<string name="chat_menu_close_chat">Fermer cette conversation</string>
-<string name="chat_no_more_chats">Aucune conversation en cours</string>
+
+ <string name="privacy_list_name">Beem - Gérer mes listes privées</string>
+ <string name="privacy_list_no_data">Il n\'existe aucune liste privée enregistrée.</string>
+ <string name="privacy_list_menu_create">Créer une liste privée</string>
+ <string name="privacy_list_create_dialog_title">Créer une liste privée</string>
+ <string name="privacy_list_create_dialog_list_name_label">Titre</string>
+ <string name="privacy_list_create_dialog_create_button">Créer</string>
+
+ <string name="UpdateButton">Mettre à jour</string>
</resources>
--- a/res/values/strings.xml Mon Nov 16 22:39:11 2009 +0100
+++ b/res/values/strings.xml Tue Nov 17 00:27:43 2009 +0100
@@ -65,9 +65,9 @@
<string name="SendIMSmiley">Insert a smiley</string>
<string name="SendIMLoginHint">login</string>
<string name="SendIMNoStatusSet">No status set</string>
-
+
<!-- ChangeStatus class -->
- <string name="ChangeStatusType">My status</string>
+ <string name="ChangeStatusType">My status</string>
<string name="ChangeStatusMessage">My personal message</string>
<string name="ChangeStatusActTitle">Beem - Change my status</string>
@@ -77,7 +77,7 @@
<string name="MenuConnection">Edit account</string>
<string name="ChangeStatusOk">Updating status</string>
<string name="ChangeStatusNoChange">Nothing to change</string>
-
+
<!-- Settings class -->
<string name="SettingsText">Edit your username</string>
<string name="SettingsPassword">Edit your password</string>
@@ -109,38 +109,38 @@
<string name="SubscriptRefused">Subscription refused</string>
<string name="SubscriptText">%s wants to add you to his/her buddy list. Do you want to authorize him/her ?</string>
<string name="SubscriptTitle">Authorize buddy ?</string>
-
+
<!-- ContactList class -->
<string name="ConListNotConnected">Not connected</string>
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">You\'ve a new message</string>
-
+
<!-- BeemBroadcastReceiver class -->
<string name="BeemBroadcastReceiverDisconnect">You have been disconnected</string>
-
+
<!-- XmppConnectionAdapter class -->
<string name="AcceptContactRequest">%s has just added you to his/her buddy list.</string>
<string name="AcceptContactRequestFrom">Authorize %s to contact you.</string>
-
- <!-- Activities -->
- <string name="login_tag">Beem - Login Activity</string>
- <string name="edit_settings_name">Beem - Settings</string>
- <string name="edit_settings_tag">Beem - EditSettings Activity</string>
- <string name="create_account_name">Beem - Create an account</string>
- <string name="create_account_tag">Beem - CreateAccount Activity</string>
- <string name="contact_list_name">Beem - Contacts</string>
- <string name="contact_list_tag">Beem - ContactList Activity</string>
- <string name="user_info_name">Beem - User Info</string>
- <!-- Buttons -->
- <string name="button_reset">Reset</string>
- <string name="button_login">Login</string>
- <string name="button_save">Save</string>
- <string name="button_create_account">Create this account</string>
- <string name="button_create_login_account">Create and use this account</string>
+ <!-- Activities -->
+ <string name="login_tag">Beem - Login Activity</string>
+ <string name="edit_settings_name">Beem - Settings</string>
+ <string name="edit_settings_tag">Beem - EditSettings Activity</string>
+ <string name="create_account_name">Beem - Create an account</string>
+ <string name="create_account_tag">Beem - CreateAccount Activity</string>
+ <string name="contact_list_name">Beem - Contacts</string>
+ <string name="contact_list_tag">Beem - ContactList Activity</string>
+ <string name="user_info_name">Beem - User Info</string>
- <!-- LogAs Activity -->
+ <!-- Buttons -->
+ <string name="button_reset">Reset</string>
+ <string name="button_login">Login</string>
+ <string name="button_save">Save</string>
+ <string name="button_create_account">Create this account</string>
+ <string name="button_create_login_account">Create and use this account</string>
+
+ <!-- LogAs Activity -->
<string name="login_username">Username</string>
<string name="login_password">Password</string>
<string name="login_error_dialog_title">Login - Error</string>
@@ -150,18 +150,21 @@
<string name="login_menu_about">About</string>
<string name="login_about_title">About</string>
<string name="login_about_msg">
- Beem is an EPITECH Innovative Project. Visit us at http://www.beem-project.com !
+ Beem is an EPITECH Innovative Project. Visit us at
+ http://www.beem-project.com !
</string>
<string name="login_about_button">Close</string>
<string name="login_settings_button">Settings</string>
<string name="login_login_button">Log in</string>
<string name="login_login_progress">Connecting. Please wait...</string>
<string name="login_max_retry">Max retry</string>
- <string name="login_error_msg">Unfortunately, an error occured.\n\nError detail:\n%s</string>
+ <string name="login_error_msg">Unfortunately, an error occured.\n\nError
+ detail:\n%s</string>
<!-- EditSettings Activity -->
<string name="settings_menu_create_account">Create an account</string>
<string name="settings_menu_login">Login</string>
+ <string name="settings_menu_privacy_lists">Manage my privacy lists</string>
<string name="settings_saved_ok">The settings have been saved successfully.</string>
<string name="settings_key_account_username">beem_account_username</string>
@@ -176,7 +179,7 @@
<string name="settings_key_proxy_password">beem_xmpp_proxy_password</string>
<string name="settings_key_proxy_type">beem_xmpp_proxy_type</string>
<string name="settings_key_hidden_contact">settings_key_hidden_contact</string>
-
+
<!-- EditSettings Activity Categories -->
<string name="general_preferences">General preferences</string>
<string name="user_preferences">User settings</string>
@@ -194,9 +197,11 @@
<!-- EditSettings Activity General Preferences Tabs -->
<string name="contact_list_preferences">Buddy list</string>
- <string name="contact_list_preferences_sum">A set of display options for your buddy list</string>
+ <string name="contact_list_preferences_sum">A set of display options for your buddy list
+ </string>
<string name="CLP_hidden_contact">Hidden</string>
- <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies</string>
+ <string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+ </string>
<!-- EditSettings Activity Account tab -->
<string name="settings_account_username">Username</string>
@@ -220,7 +225,7 @@
<string name="settings_proxy_port">Port</string>
<string name="settings_proxy_username">Username</string>
<string name="settings_proxy_password">Password</string>
-
+
<!-- Create an account Activity -->
<string name="create_account_instr_dialog_title">Create an account - Instructions</string>
<string name="create_account_err_dialog_title">Create an account - Error</string>
@@ -232,13 +237,13 @@
<string name="create_account_username">Username</string>
<string name="create_account_password">Password</string>
<string name="create_account_confirm_password">Confirm password</string>
-
+
<!-- ContactList Activity -->
<string name="contact_list_menu_add_contact">Add a contact</string>
<string name="contact_list_menu_settings">Settings</string>
<string name="contact_list_all_contact">All contacts</string>
<string name="contact_list_no_group">No group</string>
-
+
<!-- UserInfo Activity -->
<string name="userinfo_label_alias">Alias</string>
<string name="userinfo_label_chg_group">Manage groups</string>
@@ -246,7 +251,8 @@
<string name="userinfo_label_block">Block</string>
<string name="userinfo_label_delete">Delete</string>
<string name="userinfo_resend">Suscription resend</string>
- <string name="userinfo_sure2delete">Are you sure you want to delete this contact ?</string>
+ <string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+ </string>
<string name="userinfo_yes">Yes</string>
<string name="userinfo_no">No</string>
<string name="userinfo_sureresend">Are you sure you want to resend invit ?</string>
@@ -254,6 +260,13 @@
<string name="chat_name">Beem - Chat</string>
<string name="chat_input_default_value">Type your message</string>
<string name="chat_self">Me</string>
+ <string name="chat_send_message">Send</string>
+ <string name="chat_menu_contacts_list">Contacts list</string>
+ <string name="chat_menu_change_chat">Switch chat</string>
+ <string name="chat_dialog_change_chat_title">Opened chats</string>
+ <string name="chat_menu_close_chat">Close this chat</string>
+ <string name="chat_no_more_chats">No more active chats</string>
+
<string name="contact_status_msg_available">Available</string>
<string name="contact_status_msg_available_chat">Available to chat</string>
<string name="contact_status_msg_dnd">Do not disturb</string>
@@ -261,11 +274,12 @@
<string name="contact_status_msg_xa">Unavailable</string>
<string name="contact_status_msg_offline">Disconnected</string>
-<string name="UpdateButton">Update</string>
+ <string name="privacy_list_name">Beem - Manage my privacy lists</string>
+ <string name="privacy_list_no_data">There aren\'t any privacy list registered.</string>
+ <string name="privacy_list_menu_create">Create a privacy list</string>
+ <string name="privacy_list_create_dialog_title">Create a privacy list</string>
+ <string name="privacy_list_create_dialog_list_name_label">Title</string>
+ <string name="privacy_list_create_dialog_create_button">Create</string>
-<string name="chat_menu_contacts_list">Contacts list</string>
-<string name="chat_menu_change_chat">Switch chat</string>
-<string name="chat_dialog_change_chat_title">Opened chats</string>
-<string name="chat_menu_close_chat">Close this chat</string>
-<string name="chat_no_more_chats">No more active chats</string>
+ <string name="UpdateButton">Update</string>
</resources>
--- a/src/com/beem/project/beem/BeemService.java Mon Nov 16 22:39:11 2009 +0100
+++ b/src/com/beem/project/beem/BeemService.java Tue Nov 17 00:27:43 2009 +0100
@@ -36,6 +36,8 @@
* The id to use for status notification.
*/
public static final int NOTIFICATION_STATUS_ID = 100;
+
+ private static final String TAG = "BeemService";
private static final int DEFAULT_XMPP_PORT = 5222;
private NotificationManager mNotificationManager;
@@ -95,15 +97,15 @@
*/
@Override
public IBinder onBind(Intent intent) {
- Log.d("BEEMSERVICE", "ONBIND()");
+ Log.d(TAG, "ONBIND()");
return mBind;
}
@Override
public boolean onUnbind(Intent intent) {
- Log.d("BEEMSERVICE", "ONUNBIND()");
+ Log.d(TAG, "ONUNBIND()");
if (!mConnection.getAdaptee().isConnected()) {
- Log.d("BEEMSERVICE", "DESTROYED");
+ Log.d(TAG, "DESTROYED");
this.stopSelf();
}
return true;
@@ -140,7 +142,7 @@
Roster.setDefaultSubscriptionMode(SubscriptionMode.manual);
mJingle = new JingleService(mConnection.getAdaptee());
mBind = new XmppFacade(mConnection, this, mJingle);
- Log.d("BEEEMSERVICE", "ONCREATE");
+ Log.d(TAG, "ONCREATE");
}
/**
@@ -152,7 +154,7 @@
mNotificationManager.cancel(NOTIFICATION_STATUS_ID);
if (mConnection.isAuthentificated())
mConnection.disconnect();
- Log.d("BEEEMSERVICE", "ONDESTROY");
+ Log.d(TAG, "ONDESTROY");
}
/**
@@ -161,7 +163,7 @@
@Override
public void onStart(Intent intent, int startId) {
super.onStart(intent, startId);
- Log.d("BEEMSERVICE", "onStart");
+ Log.d(TAG, "onStart");
try {
mConnection.connectAsync();
} catch (RemoteException e) {
@@ -196,13 +198,17 @@
}
/**
- * init jingle from XmppConnectionAdapter.
- * @param adaptee XmppConntection used for jingle.
+ * Initialize Jingle from an XmppConnectionAdapter.
+ * @param adaptee XmppConnection used for jingle.
*/
public void initJingle(XMPPConnection adaptee) {
mJingle.initWhenConntected(adaptee);
}
+ /**
+ * Return a bind to an XmppFacade instance.
+ * @return IXmppFacade a bind to an XmppFacade instance
+ */
public IXmppFacade getBind() {
return mBind;
}
--- a/src/com/beem/project/beem/service/BeemChatManager.java Mon Nov 16 22:39:11 2009 +0100
+++ b/src/com/beem/project/beem/service/BeemChatManager.java Tue Nov 17 00:27:43 2009 +0100
@@ -71,8 +71,8 @@
/**
* Create the PendingIntent to launch our activity if the user select this chat notification.
- * @param chat
- * @return
+ * @param chat A ChatAdapter instance
+ * @return A Chat activity PendingIntent
*/
private PendingIntent makeChatIntent(IChat chat) {
Intent chatIntent = new Intent(mService, com.beem.project.beem.ui.Chat.class);
@@ -84,7 +84,7 @@
}
PendingIntent contentIntent = PendingIntent.getActivity(mService, 0, chatIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
- return (contentIntent);
+ return contentIntent;
}
/**
@@ -93,7 +93,8 @@
*/
private void notifyNewChat(IChat chat) {
try {
- CharSequence tickerText = mService.getBind().getRoster().getContact(chat.getParticipant().getJID()).getName();
+ CharSequence tickerText = mService.getBind().getRoster().getContact(chat.getParticipant().getJID())
+ .getName();
Notification notification = new Notification(android.R.drawable.stat_notify_chat, tickerText, System
.currentTimeMillis());
notification.defaults = Notification.DEFAULT_ALL;
@@ -243,15 +244,20 @@
return res;
}
+ /**
+ * This methods permits to retrieve the list of contacts who have an opened chat session with us.
+ * @return An List containing Contact instances.
+ * @throws RemoteException If a Binder remote-invocation error occurred.
+ */
public List<Contact> getOpenedChatList() throws RemoteException {
List<Contact> openedChats = new ArrayList<Contact>();
IRoster mRoster = mService.getBind().getRoster();
-
+
for (ChatAdapter chat : mChats.values()) {
if (chat.getMessages().size() > 0) //TODO check plutot le nombre de messages dans l'historique
openedChats.add(mRoster.getContact(chat.getParticipant().getJID()));
}
- return (openedChats);
+ return openedChats;
}
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/beem/project/beem/service/PrivacyListItem.aidl Tue Nov 17 00:27:43 2009 +0100
@@ -0,0 +1,3 @@
+package com.beem.project.beem.service;
+
+parcelable PrivacyListItem;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/beem/project/beem/service/PrivacyListItem.java Tue Nov 17 00:27:43 2009 +0100
@@ -0,0 +1,110 @@
+package com.beem.project.beem.service;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * A simplified version of the Smack PrivacyItem class.
+ * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
+ */
+public class PrivacyListItem implements Parcelable {
+
+ /**
+ * Constructor. Needed to implements the Parcelable.Creator interface. Generates instances of PrivacyListItem from a
+ * Parcel.
+ */
+ public static final Parcelable.Creator<PrivacyListItem> CREATOR = new Parcelable.Creator<PrivacyListItem>() {
+ public PrivacyListItem createFromParcel(Parcel in) {
+ return new PrivacyListItem(in);
+ }
+
+ public PrivacyListItem[] newArray(int size) {
+ return new PrivacyListItem[size];
+ }
+ };
+
+ private int mType;
+ private String mValue;
+
+ /**
+ * Constructor.
+ */
+ public PrivacyListItem() {
+ }
+
+ /**
+ * Constructor. Generates instances of PrivacyListItem from a Parcel.
+ * @param in The Parcel used to initialize object's attributes.
+ */
+ public PrivacyListItem(final Parcel in) {
+ readFromParcel(in);
+ }
+
+ /**
+ * Constructor.
+ * @param type The type of the item.
+ * @param value The value of the item.
+ */
+ public PrivacyListItem(final int type, final String value) {
+ mType = type;
+ mValue = value;
+ }
+
+ /**
+ * {@inheritDoc}.
+ */
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ /**
+ * Initialize object's attributes from a Parcel.
+ * @param in The Parcel used to initialize object's attributes.
+ */
+ public void readFromParcel(Parcel in) {
+ mType = in.readInt();
+ mValue = in.readString();
+ }
+
+ /**
+ * {@inheritDoc}.
+ */
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(mType);
+ dest.writeString(mValue);