Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git.linphone.org:linphone-android

Browse source
This commit is contained in:
Simon Morlat 2016-02-17 17:40:10 +01:00
commit 7c64dd8c2e
22 changed files with 166 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
res/values-ar/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">لِنْفُونْ</string>
<string name="notification_title">لِنْفُونْ</string>
<string name="wait_dialog_text">يجري التشغيل</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">جهات اتصال Linphone</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="today_date_format">HH:mm</string>
<string name="picture_name_format">linphone-mms-%s.jpg</string>
<string name="tunnel_host"></string>
@ -38,6 +36,7 @@
<string name="assistant_account_validated">تم تأكيد حسابك.</string>
<string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
<string name="wizard_username_unavailable">إن إسم المستخدم هذا مُستعمَل.</string>
<string name="first_launch_no_login_password">يُرجى إدخال إسم المستخدم وكلمة السر</string>
<!--Dailer-->
<!--History-->
<string name="today">اليوم</string>
@ -68,6 +67,8 @@
<string name="status_error">فشِل التسجيل</string>
<string name="voicemail_unread">الرسائل غير المقروءة</string>
<!--Side Menu-->
<string name="menu_settings">اﻹعدادات</string>
<string name="menu_about">حول</string>
<!--Call-->
<string name="unknown_incoming_call_name">مجهول</string>
<string name="call_stats_audio">الصوت</string>
@ -77,6 +78,7 @@
<string name="call_stats_download">صبيب التنزيل :</string>
<string name="call_stats_ice">توصيل ICE :</string>
<string name="call_stats_video_resolution">مقاس الفيديو :</string>
<string name="call">مكالمة</string>
<!--About-->
<string name="menu_send_log">إرسال السجل</string>
<string name="menu_reset_log">إعادة تعيين السجل</string>

6
res/values-de/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">Linphone</string>
<string name="notification_title">Linphone</string>
<string name="wait_dialog_text">Startvorgang</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">Linphone-Kontakte</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="today_date_format">HH:mm</string>
<string name="picture_name_format">linphone-mms-%s.jpg</string>
<string name="tunnel_host"></string>
@ -38,6 +36,7 @@
<string name="assistant_account_validated">Ihr Konto wurde überprüft.</string>
<string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
<string name="wizard_username_unavailable">Der Benutzername wird bereits verwendet.</string>
<string name="first_launch_no_login_password">Bitte geben Sie Ihren Benutzername und Ihr Passwort ein</string>
<!--Dailer-->
<!--History-->
<string name="today">Heute</string>
@ -68,6 +67,8 @@
<string name="status_error">Registierung fehlgeschlagen</string>
<string name="voicemail_unread">ungelesene Nachrichten</string>
<!--Side Menu-->
<string name="menu_settings">Einstellungen</string>
<string name="menu_about">Über</string>
<!--Call-->
<string name="unknown_incoming_call_name">Unbekannt</string>
<string name="call_stats_audio">Audio</string>
@ -77,6 +78,7 @@
<string name="call_stats_download">Download-Bandbreite:</string>
<string name="call_stats_ice">ICE-Konnektivität:</string>
<string name="call_stats_video_resolution">Videogröße:</string>
<string name="call">Anruf</string>
<!--About-->
<string name="menu_send_log">Protokoll senden</string>
<string name="menu_reset_log">Protokoll zurücksetzen</string>

4
res/values-es/strings.xml
View file

@ -6,7 +6,6 @@
<string name="addressbook_label">Linphone</string>
<string name="notification_title">Linphone</string>
<string name="wait_dialog_text">Iniciando</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">contactos linphone</string>
<string name="today_date_format">HH:mm</string>
<string name="tunnel_host"></string>
@ -34,6 +33,7 @@
<string name="assistant_account_validated">Su cuenta ha sido verificada.</string>
<string name="wizard_failed">Ha ocurrido un error, pruebe más tarde.</string>
<string name="wizard_username_unavailable">Este nombre de usuario está en uso.</string>
<string name="first_launch_no_login_password">Por favor, introduzca su usuario y contraseña</string>
<!--Dailer-->
<!--History-->
<string name="today">Hoy</string>
@ -62,6 +62,7 @@
<string name="status_error">Fallo al registrar</string>
<string name="voicemail_unread">mensajes sin leer</string>
<!--Side Menu-->
<string name="menu_settings">Configuración</string>
<!--Call-->
<string name="unknown_incoming_call_name">Desconocido</string>
<string name="call_stats_audio">Audio</string>
@ -71,6 +72,7 @@
<string name="call_stats_download">Ancho de banda de bajada:</string>
<string name="call_stats_ice">Conectividad ICE</string>
<string name="call_stats_video_resolution">Tamaño de vídeo:</string>
<string name="call">Llamar</string>
<!--About-->
<string name="menu_send_log">Enviar registro</string>
<string name="menu_reset_log">Reiniciar registro</string>

14
res/values-fi/strings.xml
View file

@ -8,11 +8,7 @@
<string name="wait_dialog_text">Käynnistetään</string>
<string name="notification_registered">Rekisteröity kohteeseen %s</string>
<string name="notification_register_failure">Epäonnistui rekisteröidä kohteeseen %s</string>
<string name="about_text">Linphone %s SIP (rfc 3261) yhteensopiva puhelimissa, joissa on GNU Public License V2</string>
<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">linphone yhteystiedot</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="history_date_format">VVV, p KKK esim. Maanantai, 1 Tam</string>
<string name="history_detail_date_format">vvvv/KK/dd - TT:mm - esim 2012/11/22 - 12:34</string>
<string name="messages_date_format">pp/KK, TT:mm esim 22/11, 12:34</string>
@ -81,6 +77,7 @@
<string name="wizard_password_incorrect">Salasanasi ei ole kelvollinen (6 merkkiä vähintään).</string>
<string name="wizard_passwords_unmatched">Antamasi salasanat ovat erillaiset.</string>
<string name="setup_confirm_username">Sinun käyttäjätunnus tulee olemaan %s.\r\n\r\nIt voiden muuttua, jotta vaatiukset täyttyisivät .\r\nHyväksytkö?</string>
<string name="first_launch_no_login_password">Anna käyttäjätunnus ja salasana</string>
<!--Dailer-->
<string name="address_bar_hint">Anna numero tai osoite</string>
<!--History-->
@ -121,11 +118,9 @@
<string name="status_error">Rekisterityminen epäonnistui</string>
<string name="voicemail_unread">lukemattomia viestejä</string>
<!--Side Menu-->
<string-array name="side_menu_item">
<item>Avustaja</item>
<item>Asetukset</item>
<item>Tietoja</item>
</string-array>
<string name="menu_assistant">Avustaja</string>
<string name="menu_settings">Asetukset</string>
<string name="menu_about">Tietoja</string>
<string name="quit">Lopeta</string>
<!--Call-->
<string name="incoming_call">tuleva puhelu</string>
@ -143,6 +138,7 @@
<string name="call_stats_download">Latauskaistanleveys:</string>
<string name="call_stats_ice">ICE yhdistettävyys:</string>
<string name="call_stats_video_resolution">Videon koko:</string>
<string name="call">Puhelu</string>
<!--About-->
<string name="menu_send_log">Lähetä loki</string>
<string name="menu_reset_log">Tyhjennä loki</string>

13
res/values-fr/strings.xml
View file

@ -8,14 +8,7 @@
<string name="wait_dialog_text">Démarrage</string>
<string name="notification_registered">%s enregistré</string>
<string name="notification_register_failure">%s n\'a pas pu s\'enregistrer</string>
<string name="about_version">Linphone Android %s</string>
<string name="about_liblinphone_version">Linphone Core %s</string>
<string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
<string name="about_link">www.linphone.org</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">contacts linphone</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="history_date_format">EEE, d MMM</string>
<string name="history_detail_date_format">dd/MM/yyy - HH:mm -</string>
<string name="messages_date_format">dd/MM, HH:mm</string>
@ -85,6 +78,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
<string name="wizard_password_incorrect">Votre mot de passe est invalide (6 caractères minimum).</string>
<string name="wizard_passwords_unmatched">Les mots de passes ne correspondent pas.</string>
<string name="setup_confirm_username">Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut différer de votre saisie.\r\nContinuer ?</string>
<string name="first_launch_no_login_password">Entrez votre nom d\'utilisateur et votre mot de passe</string>
<!--Dailer-->
<string name="address_bar_hint">Entrez un numéro ou une adresse</string>
<!--History-->
@ -126,8 +120,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
<string name="voicemail_unread">messages non lus</string>
<!--Side Menu-->
<string name="menu_assistant">Assistant</string>
<string name="menu_settings">Paramètres</string>
<string name="menu_about">À Propos</string>
<string name="menu_settings">Options</string>
<string name="menu_about">A propos</string>
<string name="quit">Quitter</string>
<!--Call-->
<string name="incoming_call">appel entrant</string>
@ -145,6 +139,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
<string name="call_stats_download">Bande passante réception :</string>
<string name="call_stats_ice">Connexion ICE :</string>
<string name="call_stats_video_resolution">Taille vidéo:</string>
<string name="call">Appel</string>
<!--About-->
<string name="menu_send_log">Envoyer les logs</string>
<string name="menu_reset_log">Vider les logs</string>

3
res/values-he/strings.xml
View file

@ -26,11 +26,14 @@
<string name="wait">אנא המתן...</string>
<!--Status Bar-->
<!--Side Menu-->
<string name="menu_settings">הגדרות</string>
<string name="menu_about">אודות</string>
<!--Call-->
<string name="unknown_incoming_call_name">לא מוכר</string>
<string name="call_stats_audio">שמע</string>
<string name="call_stats_video">וידאו</string>
<string name="call_stats_codec">קודק:</string>
<string name="call">קריאה</string>
<!--About-->
<!--Service-->
<!--Errors-->

6
res/values-ja/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">Linphone</string>
<string name="notification_title">Linphone</string>
<string name="wait_dialog_text">はじめる</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">linphoneに問い合わせる</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="today_date_format">HH:mm</string>
<string name="picture_name_format">linphone-mms-%s.jpg</string>
<string name="tunnel_host"></string>
@ -38,6 +36,7 @@
<string name="assistant_account_validated">確認済みのアカウントです。</string>
<string name="wizard_failed">エラーが発生しました。のちほど再試行してください。</string>
<string name="wizard_username_unavailable">このユーザー名はすでに使われています。</string>
<string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
<!--Dailer-->
<!--History-->
<string name="today">今日</string>
@ -68,6 +67,8 @@
<string name="status_error">登録できませんでした</string>
<string name="voicemail_unread">未読メッセージ</string>
<!--Side Menu-->
<string name="menu_settings">設定</string>
<string name="menu_about">概要</string>
<!--Call-->
<string name="unknown_incoming_call_name">不明</string>
<string name="call_stats_audio">オーディオ</string>
@ -77,6 +78,7 @@
<string name="call_stats_download">ダウンロード幅:</string>
<string name="call_stats_ice">ICE 接続:</string>
<string name="call_stats_video_resolution">ビデオ解像度:</string>
<string name="call">発信</string>
<!--About-->
<string name="menu_send_log">ログを送信する</string>
<string name="menu_reset_log">ログをリセットする</string>

3
res/values-nl/strings.xml
View file

@ -43,6 +43,8 @@
<!--Status Bar-->
<string name="status_connected">Geregistreerd</string>
<!--Side Menu-->
<string name="menu_settings">Instellingen</string>
<string name="menu_about">Over</string>
<!--Call-->
<string name="unknown_incoming_call_name">Onbekend</string>
<string name="call_stats_audio">Audio</string>
@ -51,6 +53,7 @@
<string name="call_stats_upload">Uploadbandbreedte:</string>
<string name="call_stats_download">Downloadbandbreedte:</string>
<string name="call_stats_video_resolution">Videogrootte:</string>
<string name="call">Oproep</string>
<!--About-->
<string name="menu_send_log">Log versturen</string>
<!--Service-->

4
res/values-pt-rBR/strings.xml
View file

@ -27,6 +27,7 @@
<string name="assistant_account_validated">Sua conta foi validada.</string>
<string name="wizard_failed">Ocorreu um erro, tente novamente mais tarde.</string>
<string name="wizard_username_unavailable">Este nome de usuário já está em uso.</string>
<string name="first_launch_no_login_password">Por favor, digite seu usuário e senha</string>
<!--Dailer-->
<!--History-->
<string name="today">Hoje</string>
@ -57,6 +58,8 @@
<string name="status_error">Registro falhou</string>
<string name="voicemail_unread"> mensagens não lidas</string>
<!--Side Menu-->
<string name="menu_settings">Configurações</string>
<string name="menu_about">Sobre</string>
<!--Call-->
<string name="unknown_incoming_call_name">Unknown</string>
<string name="call_stats_audio">Audio</string>
@ -66,6 +69,7 @@
<string name="call_stats_download">Velocidade de Download:</string>
<string name="call_stats_ice">Conectividade ICE:</string>
<string name="call_stats_video_resolution">Tamanho de video:</string>
<string name="call">Ligar</string>
<!--About-->
<string name="menu_send_log">Enviar log</string>
<string name="menu_reset_log">Limpar log</string>

4
res/values-ru/strings.xml
View file

@ -31,6 +31,7 @@
<string name="assistant_account_validated">Ваша учётная запись подтверждена.</string>
<string name="wizard_failed">Произошла ошибка, попробуйте повторить позже.</string>
<string name="wizard_username_unavailable">Это имя пользователя уже использовано.</string>
<string name="first_launch_no_login_password">Пожалуйста введите имя пользователя и пароль</string>
<!--Dailer-->
<!--History-->
<string name="today">Сегодня</string>
@ -59,6 +60,8 @@
<string name="status_in_progress">В процессе регистрации</string>
<string name="status_error">Ошибка регистрации</string>
<!--Side Menu-->
<string name="menu_settings">Настройки</string>
<string name="menu_about">О программе</string>
<!--Call-->
<string name="unknown_incoming_call_name">Неизвестнвй</string>
<string name="call_stats_audio">Аудио</string>
@ -68,6 +71,7 @@
<string name="call_stats_download">Полоса пропускания скачивания:</string>
<string name="call_stats_ice">Подключение ICE:</string>
<string name="call_stats_video_resolution">Video size:</string>
<string name="call">Звонок</string>
<!--About-->
<!--Service-->
<string name="incall_notif_active">Идёт Аудио звонок</string>

6
res/values-sr/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">Линфон</string>
<string name="notification_title">Линфон</string>
<string name="wait_dialog_text">Покрећем се</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">контакти линфона</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="today_date_format">ЧЧ:мм</string>
<string name="picture_name_format">linphone-mms-%s.jpg</string>
<string name="tunnel_host"></string>
@ -38,6 +36,7 @@
<string name="assistant_account_validated">Ваш налог је потврђен.</string>
<string name="wizard_failed">Дошло је до грепке, пробајте опет касније.</string>
<string name="wizard_username_unavailable">Ово корисничко име је већ у употреби.</string>
<string name="first_launch_no_login_password">Упишите вашу пријаву и лозинку</string>
<!--Dailer-->
<!--History-->
<string name="today">Данас</string>
@ -68,6 +67,8 @@
<string name="status_error">Упис није успео</string>
<string name="voicemail_unread"> непрочитане поруке</string>
<!--Side Menu-->
<string name="menu_settings">Подешавања</string>
<string name="menu_about">Инфо</string>
<!--Call-->
<string name="unknown_incoming_call_name">Непознато</string>
<string name="call_stats_audio">Звук</string>
@ -77,6 +78,7 @@
<string name="call_stats_download">Пропусни опсег преузимања:</string>
<string name="call_stats_ice">ИЦЕ повезивост:</string>
<string name="call_stats_video_resolution">Величина видеа:</string>
<string name="call">Позови</string>
<!--About-->
<string name="menu_send_log">Пошаљи дневник</string>
<string name="menu_reset_log">Поврати дневник</string>

6
res/values-sv/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">Linphone</string>
<string name="notification_title">Linphone</string>
<string name="wait_dialog_text">Startar upp</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">linphone-kontakter</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="tunnel_host"></string>
<!--Common-->
<string name="username">Användarnamn</string>
@ -31,6 +29,7 @@
<!--Launch screen-->
<!--Assistant-->
<string name="wizard_username_unavailable">Detta användarnamn används redan.</string>
<string name="first_launch_no_login_password">Ange din inloggning och lösenord</string>
<!--Dailer-->
<!--History-->
<string name="today">Idag</string>
@ -58,6 +57,8 @@
<string name="status_error">Registrering misslyckades</string>
<string name="voicemail_unread">olästa meddelanden</string>
<!--Side Menu-->
<string name="menu_settings">Inställningar</string>
<string name="menu_about">Om</string>
<!--Call-->
<string name="unknown_incoming_call_name">Okänd</string>
<string name="call_stats_audio">Ljud</string>
@ -66,6 +67,7 @@
<string name="call_stats_download">Nerladdningsbandbredd:</string>
<string name="call_stats_ice">ICE-anslutning:</string>
<string name="call_stats_video_resolution">Video-storlek:</string>
<string name="call">Ring</string>
<!--About-->
<string name="menu_send_log">Skicka logg</string>
<string name="menu_reset_log">Nollställ logg</string>

6
res/values-tr/strings.xml
View file

@ -6,9 +6,7 @@
<string name="addressbook_label">Linphone</string>
<string name="notification_title">Linphone</string>
<string name="wait_dialog_text">Başlatılıyor</string>
<string name="sync_account_type">org.linphone</string>
<string name="sync_account_name">Linphone bağlantıları</string>
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
<string name="today_date_format">SS:dd</string>
<string name="picture_name_format">linphone-mms-%s.jpg</string>
<string name="tunnel_host"></string>
@ -38,6 +36,7 @@
<string name="assistant_account_validated">Hesabınız onaylandı.</string>
<string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
<string name="wizard_username_unavailable">Bu kullanıcı adı zaten kullanılıyor.</string>
<string name="first_launch_no_login_password">Lütfen giriş adınızı ve parolanızı girin</string>
<!--Dailer-->
<!--History-->
<string name="today">Bugün</string>
@ -67,6 +66,8 @@
<string name="status_error">Kayıt başarısız</string>
<string name="voicemail_unread">okunmamış iletiler</string>
<!--Side Menu-->
<string name="menu_settings">Ayarlar</string>
<string name="menu_about">Hakkında</string>
<!--Call-->
<string name="unknown_incoming_call_name">Bilinmeyen</string>
<string name="call_stats_audio">Ses</string>
@ -76,6 +77,7 @@
<string name="call_stats_download">İndirme hızı:</string>
<string name="call_stats_ice">İCE bağlanılabilirliği:</string>
<string name="call_stats_video_resolution">Görüntü boyutu:</string>
<string name="call">Çağrı</string>
<!--About-->
<string name="menu_send_log">Günlük gönder</string>
<string name="menu_reset_log">Günlüğü sıfırla</string>

3
res/values-zh-rTW/strings.xml
View file

@ -52,6 +52,8 @@
<string name="status_error">註冊失敗</string>
<string name="voicemail_unread">未讀訊息</string>
<!--Side Menu-->
<string name="menu_settings">設定</string>
<string name="menu_about">關於</string>
<!--Call-->
<string name="unknown_incoming_call_name">未知</string>
<string name="call_stats_audio">音訊</string>
@ -60,6 +62,7 @@
<string name="call_stats_upload">上傳頻寬：</string>
<string name="call_stats_download">下載頻寬：</string>
<string name="call_stats_video_resolution">視訊大小：</string>
<string name="call">通話</string>
<!--About-->
<!--Service-->
<string name="unread_messages">%i 未讀訊息</string>

31
src/org/linphone/ChatFragment.java
View file

@ -449,23 +449,26 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
LinphoneAddress lAddress = null;
try {
lAddress = lc.interpretUrl(sipUri);
} catch (Exception e){
//TODO Error popup and quit chat
}
if(sipUri == null){
initNewChatConversation();
} else {
try {
lAddress = lc.interpretUrl(sipUri);
} catch (Exception e) {
//TODO Error popup and quit chat
}
if (lAddress != null) {
chatRoom = lc.getChatRoom(lAddress);
chatRoom.markAsRead();
LinphoneActivity.instance().updateMissedChatCount();
contact = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), lAddress);
if(chatRoom != null) {
displayChatHeader(lAddress);
dispayMessageList();
if (lAddress != null) {
chatRoom = lc.getChatRoom(lAddress);
chatRoom.markAsRead();
LinphoneActivity.instance().updateMissedChatCount();
contact = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), lAddress);
if (chatRoom != null) {
displayChatHeader(lAddress);
dispayMessageList();
}
}
}
}
public void dispayMessageList() {

37
src/org/linphone/ChatListFragment.java
View file

@ -185,14 +185,10 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
hideAndDisplayMessageIfNoChat();
}
private boolean isVersionUsingNewChatStorage() {
try {
Context context = LinphoneActivity.instance();
return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode >= 2200;
} catch (NameNotFoundException e) {
e.printStackTrace();
public void displayFirstChat(){
if(mConversations.size() > 0) {
LinphoneActivity.instance().displayChat(mConversations.get(0));
}
return true;
}
@Override
@ -325,33 +321,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
}
}
private boolean importAndroidStoredMessagedIntoLibLinphoneStorage() {
Log.w("Importing previous messages into new database...");
try {
ChatStorage db = LinphoneActivity.instance().getChatStorage();
List<String> conversations = db.getChatList();
for (int j = conversations.size() - 1; j >= 0; j--) {
String correspondent = conversations.get(j);
LinphoneChatRoom room = LinphoneManager.getLc().getOrCreateChatRoom(correspondent);
for (ChatMessage message : db.getMessages(correspondent)) {
LinphoneChatMessage msg = room.createLinphoneChatMessage(message.getMessage(), message.getUrl(), message.getStatus(), Long.parseLong(message.getTimestamp()), true, message.isIncoming());
if (message.getImage() != null) {
String path = saveImageAsFile(message.getId(), message.getImage());
if (path != null)
msg.setExternalBodyUrl(path);
}
msg.store();
}
db.removeDiscussion(correspondent);
}
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
private String saveImageAsFile(int id, Bitmap bm) {
try {
String path = Environment.getExternalStorageDirectory().toString();

6
src/org/linphone/ContactsListFragment.java
View file

@ -322,6 +322,12 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
invalidate();
}
public void displayFirstContact(){
if(contactsList.getAdapter().getCount() > 0){
LinphoneActivity.instance().displayContact((Contact) contactsList.getAdapter().getItem(0),false);
}
}
private void searchContacts() {
searchContacts(searchField.getText().toString());
}

11
src/org/linphone/HistoryListFragment.java
View file

@ -123,6 +123,17 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
}
}
public void displayFirstLog(){
if(mLogs.size() > 0){
LinphoneCallLog log = mLogs.get(0);
if (log.getDirection() == CallDirection.Incoming) {
LinphoneActivity.instance().displayHistoryDetail(mLogs.get(0).getFrom().toString(), mLogs.get(0));
} else {
LinphoneActivity.instance().displayHistoryDetail(mLogs.get(0).getTo().toString(), mLogs.get(0));
}
}
}
private void removeCallLogs(){
int size = historyList.getAdapter().getCount();
for(int i=0; i<size; i++) {

128
src/org/linphone/LinphoneActivity.java
View file

@ -105,7 +105,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private ImageView cancel;
private FragmentsAvailable currentFragment, nextFragment;
private List<FragmentsAvailable> fragmentsHistory;
private Fragment dialerFragment, messageListFragment;
private Fragment dialerFragment, chatListFragment, historyListFragment, contactListFragment;
private ChatFragment chatFragment;
private Fragment.SavedState dialerSavedState;
private boolean newProxyConfig;
@ -191,8 +191,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
cr.markAsRead();
}
displayMissedChats(getUnreadMessageCount());
if (messageListFragment != null && messageListFragment.isVisible()) {
((ChatListFragment) messageListFragment).refresh();
if (chatListFragment != null && chatListFragment.isVisible()) {
((ChatListFragment) chatListFragment).refresh();
}
}
@ -351,12 +351,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
switch (newFragmentType) {
case HISTORY_LIST:
newFragment = new HistoryListFragment();
historyListFragment = newFragment;
break;
case HISTORY_DETAIL:
newFragment = new HistoryDetailFragment();
break;
case CONTACTS_LIST:
newFragment = new ContactsListFragment();
contactListFragment = newFragment;
break;
case CONTACT_DETAIL:
newFragment = new ContactDetailsFragment();
@ -382,7 +384,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
break;
case CHAT_LIST:
newFragment = new ChatListFragment();
messageListFragment = newFragment;
chatListFragment = newFragment;
break;
case CHAT:
newFragment = new ChatFragment();
@ -617,67 +619,66 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
return;
}
if(sipUri == null) {
Bundle extras = new Bundle();
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
} else {
LinphoneAddress lAddress;
String pictureUri = null;
String thumbnailUri = null;
String displayName = null;
LinphoneAddress lAddress = null;
if(sipUri != null) {
try {
lAddress = LinphoneManager.getLc().interpretUrl(sipUri);
} catch (LinphoneCoreException e) {
//TODO display error message
Log.e("Cannot display chat",e);
Log.e("Cannot display chat", e);
return;
}
Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), lAddress);
String displayName = contact != null ? contact.getName() : null;
displayName = contact != null ? contact.getName() : null;
String pictureUri = null;
String thumbnailUri = null;
if(contact != null && contact.getPhotoUri() != null){
if (contact != null && contact.getPhotoUri() != null) {
pictureUri = contact.getPhotoUri().toString();
thumbnailUri = contact.getThumbnailUri().toString();
}
if (currentFragment == FragmentsAvailable.CHAT_LIST || currentFragment == FragmentsAvailable.CHAT) {
Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT) {
ChatFragment chatFragment = (ChatFragment) fragment2;
chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri);
} else {
Bundle extras = new Bundle();
extras.putString("SipUri", sipUri);
if (lAddress.getDisplayName() != null) {
extras.putString("DisplayName", displayName);
extras.putString("PictureUri", pictureUri);
extras.putString("ThumbnailUri", thumbnailUri);
}
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
} else {
if(isTablet()){
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
displayChat(sipUri);
} else {
Bundle extras = new Bundle();
extras.putString("SipUri", sipUri);
if (lAddress.getDisplayName() != null) {
extras.putString("DisplayName", displayName);
extras.putString("PictureUri", pictureUri);
extras.putString("ThumbnailUri", thumbnailUri);
}
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
}
if (messageListFragment != null && messageListFragment.isVisible()) {
((ChatListFragment) messageListFragment).refresh();
}
LinphoneService.instance().resetMessageNotifCount();
LinphoneService.instance().removeMessageNotification();
displayMissedChats(getUnreadMessageCount());
}
if (currentFragment == FragmentsAvailable.CHAT_LIST || currentFragment == FragmentsAvailable.CHAT) {
Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT) {
ChatFragment chatFragment = (ChatFragment) fragment2;
chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri);
} else {
Bundle extras = new Bundle();
extras.putString("SipUri", sipUri);
if (sipUri != null && lAddress.getDisplayName() != null) {
extras.putString("DisplayName", displayName);
extras.putString("PictureUri", pictureUri);
extras.putString("ThumbnailUri", thumbnailUri);
}
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
} else {
if(isTablet()){
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
displayChat(sipUri);
} else {
Bundle extras = new Bundle();
extras.putString("SipUri", sipUri);
if (sipUri != null && lAddress.getDisplayName() != null) {
extras.putString("DisplayName", displayName);
extras.putString("PictureUri", pictureUri);
extras.putString("ThumbnailUri", thumbnailUri);
}
changeCurrentFragment(FragmentsAvailable.CHAT, extras);
}
}
if (chatListFragment != null && chatListFragment.isVisible()) {
((ChatListFragment) chatListFragment).refresh();
}
LinphoneService.instance().resetMessageNotifCount();
LinphoneService.instance().removeMessageNotification();
displayMissedChats(getUnreadMessageCount());
}
@Override
@ -690,15 +691,30 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
history_selected.setVisibility(View.VISIBLE);
LinphoneManager.getLc().resetMissedCallsCount();
displayMissedCalls(0);
if(isTablet()) {
if (historyListFragment != null && historyListFragment.isVisible()) {
((HistoryListFragment) historyListFragment).displayFirstLog();
}
}
} else if (id == R.id.contacts) {
changeCurrentFragment(FragmentsAvailable.CONTACTS_LIST, null);
contacts_selected.setVisibility(View.VISIBLE);
if(isTablet()) {
if (contactListFragment != null && contactListFragment.isVisible()) {
((ContactsListFragment) contactListFragment).displayFirstContact();
}
}
} else if (id == R.id.dialer) {
changeCurrentFragment(FragmentsAvailable.DIALER, null);
dialer_selected.setVisibility(View.VISIBLE);
} else if (id == R.id.chat) {
changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
chat_selected.setVisibility(View.VISIBLE);
if(isTablet()) {
if (chatListFragment != null && chatListFragment.isVisible()) {
((ChatListFragment) chatListFragment).displayFirstChat();
}
}
} else if (id == R.id.cancel){
hideTopBar();
displayDialer();
@ -765,7 +781,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
public void updateChatListFragment(ChatListFragment fragment) {
messageListFragment = fragment;
chatListFragment = fragment;
}
public void updateStatusFragment(StatusFragment fragment) {
@ -826,8 +842,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
public int onMessageSent(String to, String message) {
getChatStorage().deleteDraft(to);
if (messageListFragment != null && messageListFragment.isVisible()) {
((ChatListFragment) messageListFragment).refresh();
if (chatListFragment != null && chatListFragment.isVisible()) {
((ChatListFragment) chatListFragment).refresh();
}
return getChatStorage().saveTextMessage("", to, message, System.currentTimeMillis());

2
submodules/msx264

@ -1 +1 @@
Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790
Subproject commit 244713da4c687fe54391b8f6e7d724ff2d31ff53

1
tests/src/org/linphone/test/ConferenceAndMultiCall.java
View file

@ -268,6 +268,7 @@ public class ConferenceAndMultiCall extends SampleTest {
private void startConference() {
startTwoCalls();
solo.clickOnView(solo.getView(org.linphone.R.id.options));
solo.clickOnView(solo.getView(org.linphone.R.id.conference));
solo.sleep(1000);

2
tests/src/org/linphone/test/Contacts.java
View file

@ -34,7 +34,7 @@ public class Contacts extends SampleTest {
Assert.assertTrue(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnView(solo.getView(org.linphone.R.id.delete_contact));
solo.clickOnView(solo.getView(org.linphone.R.id.deleteContact));
solo.sleep(1000);
solo.clickOnView(solo.getView(org.linphone.R.id.delete_button));