From 8cd8080f1d9230a66cbd9bdaa385ee8385f89bea Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 17 Feb 2016 14:03:58 +0100 Subject: [PATCH 1/3] Updated msx264 to fix compil --- submodules/msx264 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/msx264 b/submodules/msx264 index 427e20aea..244713da4 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790 +Subproject commit 244713da4c687fe54391b8f6e7d724ff2d31ff53 From 3866fde790947638b8a2286291ede105270af8b4 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 16 Feb 2016 14:36:53 +0100 Subject: [PATCH 2/3] Update translations --- res/values-ar/strings.xml | 6 ++++-- res/values-de/strings.xml | 6 ++++-- res/values-es/strings.xml | 4 +++- res/values-fi/strings.xml | 14 +++++--------- res/values-fr/strings.xml | 13 ++++--------- res/values-he/strings.xml | 3 +++ res/values-ja/strings.xml | 6 ++++-- res/values-nl/strings.xml | 3 +++ res/values-pt-rBR/strings.xml | 4 ++++ res/values-ru/strings.xml | 4 ++++ res/values-sr/strings.xml | 6 ++++-- res/values-sv/strings.xml | 6 ++++-- res/values-tr/strings.xml | 6 ++++-- res/values-zh-rTW/strings.xml | 3 +++ 14 files changed, 53 insertions(+), 31 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index b85779bf6..4533e920b 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -6,9 +6,7 @@ لِنْفُونْ لِنْفُونْ يجري التشغيل - org.linphone جهات اتصال Linphone - vnd.android.cursor.item/org.linphone.profile HH:mm linphone-mms-%s.jpg @@ -38,6 +36,7 @@ تم تأكيد حسابك. حدث خطأ، حاول لاحقا. إن إسم المستخدم هذا مُستعمَل. + يُرجى إدخال إسم المستخدم وكلمة السر اليوم @@ -68,6 +67,8 @@ فشِل التسجيل الرسائل غير المقروءة + اﻹعدادات + حول مجهول الصوت @@ -77,6 +78,7 @@ صبيب التنزيل : توصيل ICE : مقاس الفيديو : + مكالمة إرسال السجل إعادة تعيين السجل diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 394125098..8ef10a3fa 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -6,9 +6,7 @@ Linphone Linphone Startvorgang - org.linphone Linphone-Kontakte - vnd.android.cursor.item/org.linphone.profile HH:mm linphone-mms-%s.jpg @@ -38,6 +36,7 @@ Ihr Konto wurde überprüft. Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal Der Benutzername wird bereits verwendet. + Bitte geben Sie Ihren Benutzername und Ihr Passwort ein Heute @@ -68,6 +67,8 @@ Registierung fehlgeschlagen ungelesene Nachrichten + Einstellungen + Über Unbekannt Audio @@ -77,6 +78,7 @@ Download-Bandbreite: ICE-Konnektivität: Videogröße: + Anruf Protokoll senden Protokoll zurücksetzen diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 8546d93e7..cff97e2f8 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -6,7 +6,6 @@ Linphone Linphone Iniciando - org.linphone contactos linphone HH:mm @@ -34,6 +33,7 @@ Su cuenta ha sido verificada. Ha ocurrido un error, pruebe más tarde. Este nombre de usuario está en uso. + Por favor, introduzca su usuario y contraseña Hoy @@ -62,6 +62,7 @@ Fallo al registrar mensajes sin leer + Configuración Desconocido Audio @@ -71,6 +72,7 @@ Ancho de banda de bajada: Conectividad ICE Tamaño de vídeo: + Llamar Enviar registro Reiniciar registro diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index df8e8d6c4..7f27609f5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -8,11 +8,7 @@ Käynnistetään Rekisteröity kohteeseen %s Epäonnistui rekisteröidä kohteeseen %s - Linphone %s SIP (rfc 3261) yhteensopiva puhelimissa, joissa on GNU Public License V2 - http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2015 Belledonne Communications - org.linphone linphone yhteystiedot - vnd.android.cursor.item/org.linphone.profile VVV, p KKK esim. Maanantai, 1 Tam vvvv/KK/dd - TT:mm - esim 2012/11/22 - 12:34 pp/KK, TT:mm esim 22/11, 12:34 @@ -81,6 +77,7 @@ Salasanasi ei ole kelvollinen (6 merkkiä vähintään). Antamasi salasanat ovat erillaiset. Sinun käyttäjätunnus tulee olemaan %s.\r\n\r\nIt voiden muuttua, jotta vaatiukset täyttyisivät .\r\nHyväksytkö? + Anna käyttäjätunnus ja salasana Anna numero tai osoite @@ -121,11 +118,9 @@ Rekisterityminen epäonnistui lukemattomia viestejä - - Avustaja - Asetukset - Tietoja - + Avustaja + Asetukset + Tietoja Lopeta tuleva puhelu @@ -143,6 +138,7 @@ Latauskaistanleveys: ICE yhdistettävyys: Videon koko: + Puhelu Lähetä loki Tyhjennä loki diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 79eb09055..5eb9e8510 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -8,14 +8,7 @@ Démarrage %s enregistré %s n\'a pas pu s\'enregistrer - Linphone Android %s - Linphone Core %s - GNU General Public License V2\n © 2010-2016 Belledonne Communications - www.linphone.org - - org.linphone contacts linphone - vnd.android.cursor.item/org.linphone.profile EEE, d MMM dd/MM/yyy - HH:mm - dd/MM, HH:mm @@ -85,6 +78,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer. Votre mot de passe est invalide (6 caractères minimum). Les mots de passes ne correspondent pas. Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut différer de votre saisie.\r\nContinuer ? + Entrez votre nom d\'utilisateur et votre mot de passe Entrez un numéro ou une adresse @@ -126,8 +120,8 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer. messages non lus Assistant - Paramètres - À Propos + Options + A propos Quitter appel entrant @@ -145,6 +139,7 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer. Bande passante réception : Connexion ICE : Taille vidéo: + Appel Envoyer les logs Vider les logs diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 07fcabcd2..62a333b27 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -26,11 +26,14 @@ אנא המתן... + הגדרות + אודות לא מוכר שמע וידאו קודק: + קריאה diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index af20cf37b..c9f8c3d78 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -6,9 +6,7 @@ Linphone Linphone はじめる - org.linphone linphoneに問い合わせる - vnd.android.cursor.item/org.linphone.profile HH:mm linphone-mms-%s.jpg @@ -38,6 +36,7 @@ 確認済みのアカウントです。 エラーが発生しました。のちほど再試行してください。 このユーザー名はすでに使われています。 + ユーザー名とパスワードを入力してください 今日 @@ -68,6 +67,8 @@ 登録できませんでした 未読メッセージ + 設定 + 概要 不明 オーディオ @@ -77,6 +78,7 @@ ダウンロード幅: ICE 接続: ビデオ解像度: + 発信 ログを送信する ログをリセットする diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 8a0cd5603..b829fa3cc 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -43,6 +43,8 @@ Geregistreerd + Instellingen + Over Onbekend Audio @@ -51,6 +53,7 @@ Uploadbandbreedte: Downloadbandbreedte: Videogrootte: + Oproep Log versturen diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 181cf4ea0..e4c5f3ef0 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -27,6 +27,7 @@ Sua conta foi validada. Ocorreu um erro, tente novamente mais tarde. Este nome de usuário já está em uso. + Por favor, digite seu usuário e senha Hoje @@ -57,6 +58,8 @@ Registro falhou mensagens não lidas + Configurações + Sobre Unknown Audio @@ -66,6 +69,7 @@ Velocidade de Download: Conectividade ICE: Tamanho de video: + Ligar Enviar log Limpar log diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index edc7ab6ab..d1ce28bb8 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -31,6 +31,7 @@ Ваша учётная запись подтверждена. Произошла ошибка, попробуйте повторить позже. Это имя пользователя уже использовано. + Пожалуйста введите имя пользователя и пароль Сегодня @@ -59,6 +60,8 @@ В процессе регистрации Ошибка регистрации + Настройки + О программе Неизвестнвй Аудио @@ -68,6 +71,7 @@ Полоса пропускания скачивания: Подключение ICE: Video size: + Звонок Идёт Аудио звонок diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 5f423dcd4..38f1fc351 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -6,9 +6,7 @@ Линфон Линфон Покрећем се - org.linphone контакти линфона - vnd.android.cursor.item/org.linphone.profile ЧЧ:мм linphone-mms-%s.jpg @@ -38,6 +36,7 @@ Ваш налог је потврђен. Дошло је до грепке, пробајте опет касније. Ово корисничко име је већ у употреби. + Упишите вашу пријаву и лозинку Данас @@ -68,6 +67,8 @@ Упис није успео непрочитане поруке + Подешавања + Инфо Непознато Звук @@ -77,6 +78,7 @@ Пропусни опсег преузимања: ИЦЕ повезивост: Величина видеа: + Позови Пошаљи дневник Поврати дневник diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 48bf38a57..d93db6371 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -6,9 +6,7 @@ Linphone Linphone Startar upp - org.linphone linphone-kontakter - vnd.android.cursor.item/org.linphone.profile Användarnamn @@ -31,6 +29,7 @@ Detta användarnamn används redan. + Ange din inloggning och lösenord Idag @@ -58,6 +57,8 @@ Registrering misslyckades olästa meddelanden + Inställningar + Om Okänd Ljud @@ -66,6 +67,7 @@ Nerladdningsbandbredd: ICE-anslutning: Video-storlek: + Ring Skicka logg Nollställ logg diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index adfd340ee..b1c1d107a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -6,9 +6,7 @@ Linphone Linphone Başlatılıyor - org.linphone Linphone bağlantıları - vnd.android.cursor.item/org.linphone.profile SS:dd linphone-mms-%s.jpg @@ -38,6 +36,7 @@ Hesabınız onaylandı. Bir hata oluştu,daha sonra tekrar deneyin. Bu kullanıcı adı zaten kullanılıyor. + Lütfen giriş adınızı ve parolanızı girin Bugün @@ -67,6 +66,8 @@ Kayıt başarısız okunmamış iletiler + Ayarlar + Hakkında Bilinmeyen Ses @@ -76,6 +77,7 @@ İndirme hızı: İCE bağlanılabilirliği: Görüntü boyutu: + Çağrı Günlük gönder Günlüğü sıfırla diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 09fb8ea65..579c52332 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -52,6 +52,8 @@ 註冊失敗 未讀訊息 + 設定 + 關於 未知 音訊 @@ -60,6 +62,7 @@ 上傳頻寬： 下載頻寬： 視訊大小： + 通話 %i 未讀訊息 From f68df2c584ba27b3b5bd1c18f42e49a321ba5659 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 17 Feb 2016 15:19:08 +0100 Subject: [PATCH 3/3] Tablet: Fix new chat conversation and display first listview element --- src/org/linphone/ChatFragment.java | 31 +++-- src/org/linphone/ChatListFragment.java | 37 +---- src/org/linphone/ContactsListFragment.java | 6 + src/org/linphone/HistoryListFragment.java | 11 ++ src/org/linphone/LinphoneActivity.java | 128 ++++++++++-------- .../linphone/test/ConferenceAndMultiCall.java | 3 +- tests/src/org/linphone/test/Contacts.java | 2 +- 7 files changed, 112 insertions(+), 106 deletions(-) diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index f3bf54afd..e48610f8a 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -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() { diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index 0ea6b9f1e..bdd9828bc 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -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 @@ -324,33 +320,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte LinphoneActivity.instance().displayChat(sipUri); } } - - private boolean importAndroidStoredMessagedIntoLibLinphoneStorage() { - Log.w("Importing previous messages into new database..."); - try { - ChatStorage db = LinphoneActivity.instance().getChatStorage(); - List 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 { diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java index bdb71ed9e..379faa6ef 100644 --- a/src/org/linphone/ContactsListFragment.java +++ b/src/org/linphone/ContactsListFragment.java @@ -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()); } diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java index 46a8ce54b..b8ffe0a6d 100644 --- a/src/org/linphone/HistoryListFragment.java +++ b/src/org/linphone/HistoryListFragment.java @@ -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 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()); diff --git a/tests/src/org/linphone/test/ConferenceAndMultiCall.java b/tests/src/org/linphone/test/ConferenceAndMultiCall.java index 518d0851c..1c71dbe78 100644 --- a/tests/src/org/linphone/test/ConferenceAndMultiCall.java +++ b/tests/src/org/linphone/test/ConferenceAndMultiCall.java @@ -267,7 +267,8 @@ 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); diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java index 2bbcaaf62..a2cfecdd4 100644 --- a/tests/src/org/linphone/test/Contacts.java +++ b/tests/src/org/linphone/test/Contacts.java @@ -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));