Many little modifications.
Clean strings.xml
Disable use of preference for status notification.
Fix a bug with the auto away feature.
--- a/res/values-de/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values-de/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated">Beem Service erstellt</string>
<string name="BeemServiceDestroyed">Beem Service verworfen</string>
- <!-- ContactListSettings class -->
- <string name="CLSServerConnection">Server Verbindung</string>
- <string name="CLSUserid">Benutzer id:</string>
- <string name="CLSPassword">Passwort:</string>
- <string name="CLSService">Dienst:</string>
- <string name="CLSHostPort">Port:</string>
- <string name="CLSProxyInfo">Proxy Informationen</string>
- <string name="CLSLogin">Anmelden:</string>
- <string name="CLSOkButton">Ok</string>
-
<!-- ContactDialog class -->
<string name="CDChat">Chatten</string>
<string name="CDCall">Anrufen</string>
@@ -130,9 +120,6 @@
<string name="SubscriptText">%s will dich zu seiner/ihrer Kontaktliste hinzufügen. Willst du ihn/sie authorisieren ?</string>
<string name="SubscriptTitle">Kontakt authorisieren ?</string>
- <!-- ContactList class -->
- <string name="ConListNotConnected">Offline</string>
-
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">Du hast eine neue Nachricht</string>
@@ -154,9 +141,6 @@
<string name="user_info_name">Beem - Benutzerinformation</string>
<!-- Buttons -->
- <string name="button_reset">Zurücksetzen</string>
- <string name="button_login">Anmelden</string>
- <string name="button_save">Speichern</string>
<string name="button_create_account">Dieses Konto erstellen</string>
<string name="button_create_login_account">Dieses Konto erstellen und benutzen</string>
@@ -174,7 +158,6 @@
<string name="login_settings_button">Einstellungen</string>
<string name="login_login_button">Anmelden</string>
<string name="login_login_progress">Verbinden. Bitte warten...</string>
- <string name="login_max_retry">Maximaler Wiederholungsversuch</string>
<string name="login_error_msg">Leider trat ein Fehler auf.\n\nFehler Detail:\n%s</string>
<string name="login_menu_login">Anmelden</string>
<string name="login_no_connectivity">Keine Internetverbindung gefunden</string>
--- a/res/values-fr/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values-fr/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated">BeemService Créé</string>
<string name="BeemServiceDestroyed">BeemService détruit</string>
- <!-- ContactListSettings class -->
- <string name="CLSServerConnection">Connexion au serveur</string>
- <string name="CLSUserid">Id utilisateur:</string>
- <string name="CLSPassword">Mot de passe:</string>
- <string name="CLSService">Service:</string>
- <string name="CLSHostPort">Port:</string>
- <string name="CLSProxyInfo">Informations proxy</string>
- <string name="CLSLogin">Nom d\'utilisateur:</string>
- <string name="CLSOkButton">Ok</string>
-
<!-- ContactDialog class -->
<string name="CDChat">Chat</string>
<string name="CDCall">Appeler</string>
@@ -114,10 +104,10 @@
<string name="settings_proxy_username">Nom d\'utilisateur</string>
<string name="settings_proxy_password">Mot de passe</string>
<string name="away_chk_title">Activer l\'absence automatique</string>
- <string name="away_chk_sum">Change votre status en Absent automatiquement quand l\'écran du telephone s\'éteind</string>
- <string name="away_message_title">Message d\'asbence</string>
+ <string name="away_chk_sum">Change votre status en Absent automatiquement quand l\'écran du telephone s\'éteint</string>
+ <string name="away_message_title">Message d\'absence</string>
<string name="away_message_sum">Votre Message d\'absence</string>
- <string name="away_message_hint">Je suis absent car mon ecran est éteind</string>
+ <string name="away_message_hint">Je suis absent car mon ecran est éteint</string>
<string name="notification_preferences">Paramètres des notifications</string>
<string name="notification_enable_vibrate_title">Activer le vibreur</string>
<string name="notification_enable_vibrate_sum">Activer le vibreur pour les messages entrants</string>
@@ -131,9 +121,6 @@
<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>
@@ -163,9 +150,6 @@
<!--
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>
--- a/res/values-ru/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values-ru/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated"></string>
<string name="BeemServiceDestroyed"></string>
-<!-- ContactListSettings class -->
-<string name="CLSServerConnection">Соединение</string>
-<string name="CLSUserid">Имя пользователя:</string>
-<string name="CLSPassword">Пароль:</string>
-<string name="CLSService">Сервер:</string>
-<string name="CLSHostPort">Порт:</string>
-<string name="CLSProxyInfo">Прокси</string>
-<string name="CLSLogin">Имя пользователя:</string>
-<string name="CLSOkButton">ОК</string>
-
<!-- ContactDialog class -->
<string name="CDChat">Написать</string>
<string name="CDCall">Повонить</string>
@@ -132,9 +122,6 @@
<string name="SubscriptText"></string>
<string name="SubscriptTitle"></string>
-<!-- ContactList class -->
-<string name="ConListNotConnected">Не подключен</string>
-
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">Пришло новое сообщение</string>
@@ -156,9 +143,6 @@
<string name="user_info_name">Информация о пользователе</string>
<!-- Buttons -->
-<string name="button_reset">Очистить</string>
-<string name="button_login">Войти</string>
-<string name="button_save">Сохранить</string>
<string name="button_create_account"></string>
<string name="button_create_login_account"></string>
@@ -179,7 +163,6 @@
<string name="login_settings_button">Настройки</string>
<string name="login_login_button">Войти</string>
<string name="login_login_progress">Соединяемся, подождите немного...</string>
-<string name="login_max_retry"></string>
<string name="login_error_msg">Unfortunately, an error occured.\n\nError
detail:\n%s</string>
<string name="login_menu_login">Войти</string>
--- a/res/values-zh-rCN/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values-zh-rCN/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated">Beem服务已创建</string>
<string name="BeemServiceDestroyed">Beem服务已取消</string>
- <!-- ContactListSettings class -->
- <string name="CLSServerConnection">服务器连接</string>
- <string name="CLSUserid">账号:</string>
- <string name="CLSPassword">密码：</string>
- <string name="CLSService">服务器:</string>
- <string name="CLSHostPort">端口:</string>
- <string name="CLSProxyInfo">代理信息</string>
- <string name="CLSLogin">登录:</string>
- <string name="CLSOkButton">确定</string>
-
<!-- ContactDialog class -->
<string name="CDChat">聊天</string>
<string name="CDCall">呼叫</string>
@@ -132,9 +122,6 @@
<string name="SubscriptText">%s 想要添加你到他/她的好友列表.批准他/她的请求吗?</string>
<string name="SubscriptTitle">批准好友请求?</string>
- <!-- ContactList class -->
- <string name="ConListNotConnected">未连接</string>
-
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">你有一个新消息</string>
@@ -156,9 +143,6 @@
<string name="user_info_name">Beem - 用户信息</string>
<!-- Buttons -->
- <string name="button_reset">重置</string>
- <string name="button_login">登陆</string>
- <string name="button_save">保存</string>
<string name="button_create_account">创建这个账户</string>
<string name="button_create_login_account">创建并使用这个账户</string>
@@ -179,7 +163,6 @@
<string name="login_settings_button">设置</string>
<string name="login_login_button">登录</string>
<string name="login_login_progress">连接中,请等待...</string>
- <string name="login_max_retry">最大重试次数</string>
<string name="login_error_msg">很遗憾,发生一个错误.\n\nE错误
详情:\n%s</string>
<string name="login_menu_login">登陆</string>
--- a/res/values-zh-rTW/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values-zh-rTW/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated">Beem服務已建立</string>
<string name="BeemServiceDestroyed">Beem服務已取消</string>
- <!-- ContactListSettings class -->
- <string name="CLSServerConnection">伺服器連接</string>
- <string name="CLSUserid">賬號:</string>
- <string name="CLSPassword">密碼：</string>
- <string name="CLSService">伺服器:</string>
- <string name="CLSHostPort">通訊埠:</string>
- <string name="CLSProxyInfo">代理訊息</string>
- <string name="CLSLogin">登入:</string>
- <string name="CLSOkButton">確定</string>
-
<!-- ContactDialog class -->
<string name="CDChat">聊天</string>
<string name="CDCall">呼叫</string>
@@ -132,9 +122,6 @@
<string name="SubscriptText">%s 想要新增你到他/她的好友清單.批准他/她的要求嗎?</string>
<string name="SubscriptTitle">批准好友要求?</string>
- <!-- ContactList class -->
- <string name="ConListNotConnected">未連接</string>
-
<!-- BeemChatManager -->
<string name="BeemChatManagerNewMessage">你有一個新訊息</string>
@@ -156,9 +143,6 @@
<string name="user_info_name">Beem - 使用者訊息</string>
<!-- Buttons -->
- <string name="button_reset">重設</string>
- <string name="button_login">登陸</string>
- <string name="button_save">儲存</string>
<string name="button_create_account">建立這個賬戶</string>
<string name="button_create_login_account">建立並使用這個賬戶</string>
@@ -179,7 +163,6 @@
<string name="login_settings_button">設定</string>
<string name="login_login_button">登入</string>
<string name="login_login_progress">連接中,請等待...</string>
- <string name="login_max_retry">最大重試次數</string>
<string name="login_error_msg">很遺憾,發生一個錯誤.\n\nE錯誤
詳情:\n%s</string>
<string name="login_menu_login">登陸</string>
--- a/res/values/strings.xml Tue Jun 01 21:48:38 2010 +0200
+++ b/res/values/strings.xml Thu Jun 03 21:43:32 2010 +0200
@@ -21,16 +21,6 @@
<string name="BeemServiceCreated">Beem Service Created</string>
<string name="BeemServiceDestroyed">Beem Service Destroyed</string>
- <!-- ContactListSettings class -->
- <string name="CLSServerConnection">Server connection</string>
- <string name="CLSUserid">User id:</string>
- <string name="CLSPassword">Password:</string>
- <string name="CLSService">Service:</string>
- <string name="CLSHostPort">Port:</string>
- <string name="CLSProxyInfo">Proxy informations</string>
- <string name="CLSLogin">Login:</string>
- <string name="CLSOkButton">Ok</string>
-
<!-- ContactDialog class -->
<string name="CDChat">Chat</string>
<string name="CDCall">Call</string>
@@ -132,9 +122,6 @@
<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>
@@ -156,9 +143,6 @@
<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>
@@ -179,7 +163,6 @@
<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_menu_login">Login</string>
--- a/src/com/beem/project/beem/BeemService.java Tue Jun 01 21:48:38 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java Thu Jun 03 21:43:32 2010 +0200
@@ -298,6 +298,15 @@
}
/**
+ * Get the notification manager system service.
+ *
+ * @return the notification manager service.
+ */
+ public NotificationManager getNotificationManager() {
+ return mNotificationManager;
+ }
+
+ /**
* A sort of patch from this thread: http://www.igniterealtime.org/community/thread/31118. Avoid ClassCastException
* by bypassing the classloading shit of Smack.
* @param pm The ProviderManager.
@@ -434,10 +443,12 @@
if (intentAction.equals(Intent.ACTION_SCREEN_OFF)) {
mOldMode = mConnection.getPreviousMode();
mOldStatus = mConnection.getPreviousStatus();
- mConnection.changeStatus(Status.CONTACT_STATUS_AWAY,
- mSettings.getString("settings_away_message", "Away"));
+ if (mConnection.isAuthentificated())
+ mConnection.changeStatus(Status.CONTACT_STATUS_AWAY,
+ mSettings.getString("settings_away_message", "Away"));
} else if (intentAction.equals(Intent.ACTION_SCREEN_ON)) {
- mConnection.changeStatus(mOldMode, mOldStatus);
+ if (mConnection.isAuthentificated())
+ mConnection.changeStatus(mOldMode, mOldStatus);
}
}
}
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Tue Jun 01 21:48:38 2010 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Thu Jun 03 21:43:32 2010 +0200
@@ -339,7 +339,8 @@
mStatusNotification.setLatestEventInfo(mService, "Beem Status", text, PendingIntent.getActivity(mService, 0,
new Intent(mService, ChangeStatus.class), 0));
- mService.sendNotification(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification);
+ // bypass the preferences for notification
+ mService.getNotificationManager().notify(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification);
}
/**