From e48c4a2bd10e8fcce6534fe7f935d6c8ac6230c5 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Thu, 15 Sep 2016 15:18:39 +0200 Subject: [PATCH 01/13] Update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a6e7eec3b..09e861e19 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a6e7eec3b3ec268e7d86f85ae268b53eca5c10de +Subproject commit 09e861e19e0e7d9e58f3f3eb5995efba937026c8 From c7321069e50f9d4e8c0e0d84eb5dfa0bcf3ef6ad Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 19 Sep 2016 11:49:02 +0200 Subject: [PATCH 02/13] Fix chat on tablet --- src/org/linphone/ChatFragment.java | 33 ++++++++++++++++++++---- src/org/linphone/FragmentsAvailable.java | 2 +- src/org/linphone/LinphoneActivity.java | 7 +++++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index 13d29ea46..416a384a2 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -271,6 +271,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC if (message != null) { outState.putString("messageDraft", message.getText().toString()); } + if (contact != null) { + outState.putSerializable("contactDraft",contact); + outState.putString("sipUriDraft",sipUri); + } super.onSaveInstanceState(outState); } @@ -340,6 +344,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC LinphoneAddress lAddress = null; if (sipUri == null) { + contact = null; // Tablet rotation issue initNewChatConversation(); } else { try { @@ -354,6 +359,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC LinphoneActivity.instance().updateMissedChatCount(); contact = ContactsManager.getInstance().findContactFromAddress(lAddress); if (chatRoom != null) { + searchContactField.setVisibility(View.GONE); + resultContactsSearch.setVisibility(View.GONE); displayChatHeader(lAddress); displayMessageList(); } @@ -376,13 +383,19 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } } messagesList.setAdapter(adapter); + messagesList.setVisibility(ListView.VISIBLE); } private void displayChatHeader(LinphoneAddress address) { - if (contact != null) { - contactName.setText(contact.getFullName()); - } else if(address != null){ - contactName.setText(LinphoneUtils.getAddressDisplayName(address)); + if (contact != null || address != null) { + if (contact != null) { + contactName.setText(contact.getFullName()); + } else { + contactName.setText(LinphoneUtils.getAddressDisplayName(address)); + } + topBar.setVisibility(View.VISIBLE); + edit.setVisibility(View.VISIBLE); + contactName.setVisibility(View.VISIBLE); } } @@ -512,8 +525,14 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC String draft = getArguments().getString("messageDraft"); message.setText(draft); + contact = (LinphoneContact)getArguments().getSerializable("contactDraft"); + if (contact != null) { + contactName.setText(contact.getFullName()); + sipUri = getArguments().getString("sipUriDraft"); + getArguments().clear(); + } - if (!newChatConversation) { + if (!newChatConversation || contact != null) { initChatRoom(sipUri); searchContactField.setVisibility(View.GONE); resultContactsSearch.setVisibility(View.GONE); @@ -635,6 +654,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC chatRoom.sendChatMessage(message); lAddress = chatRoom.getPeerAddress(); + if (LinphoneActivity.isInstanciated()) { + LinphoneActivity.instance().onMessageSent(sipUri, messageToSend); + } + message.setListener(LinphoneManager.getInstance()); if (newChatConversation) { exitNewConversationMode(lAddress.asStringUriOnly()); diff --git a/src/org/linphone/FragmentsAvailable.java b/src/org/linphone/FragmentsAvailable.java index acfc008b8..172b05506 100644 --- a/src/org/linphone/FragmentsAvailable.java +++ b/src/org/linphone/FragmentsAvailable.java @@ -89,7 +89,7 @@ public enum FragmentsAvailable { return fragment == CONTACT_DETAIL || fragment == CONTACTS_LIST; case CHAT: - return fragment == CHAT_LIST; + return fragment == CHAT_LIST || fragment == CHAT; default: return false; diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 0c01061ca..7cbb7cd9f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -775,6 +775,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); } + public void onMessageSent(String to, String message) { + Fragment fragment = getFragmentManager().findFragmentById(R.id.fragmentContainer); + if (fragment.getClass() == ChatListFragment.class) { + ((ChatListFragment)fragment).refresh(); + } + } + public void updateStatusFragment(StatusFragment fragment) { statusFragment = fragment; } From d9cbea010e7836573fd1083e32b5a023bf141686 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 19 Sep 2016 16:13:23 +0200 Subject: [PATCH 03/13] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 09e861e19..9aa49cdcc 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 09e861e19e0e7d9e58f3f3eb5995efba937026c8 +Subproject commit 9aa49cdcc9140b38bae49177db23ab56f6a471bf From 186656c10d3c4b5c752ad14d87ed741deb013d73 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Sep 2016 18:11:23 +0200 Subject: [PATCH 04/13] Updated linphone & belle-sip --- src/org/linphone/LinphoneActivity.java | 2 +- src/org/linphone/LinphoneManager.java | 3 ++- src/org/linphone/tutorials/TutorialCardDavSync.java | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- tests/src/org/linphone/test/LinphoneTestManager.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 7cbb7cd9f..b47439a1e 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -213,7 +213,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } @Override - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) { + public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain, LinphoneCore.AuthMethod method) { //authInfoPassword = displayWrongPasswordDialog(username, realm, domain); //authInfoPassword.show(); } diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index b0721d1ed..698e153d4 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -50,6 +50,7 @@ import org.linphone.core.LinphoneCore.GlobalState; import org.linphone.core.LinphoneCore.LogCollectionUploadState; import org.linphone.core.LinphoneCore.RegistrationState; import org.linphone.core.LinphoneCore.RemoteProvisioningState; +import org.linphone.core.LinphoneAuthInfo; import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreListener; @@ -927,7 +928,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void displayWarning(LinphoneCore lc, String message) {} - public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {} + public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain, LinphoneCore.AuthMethod method) {} public void byeReceived(LinphoneCore lc, String from) {} public void displayMessage(LinphoneCore lc, String message) {} public void show(LinphoneCore lc) {} diff --git a/src/org/linphone/tutorials/TutorialCardDavSync.java b/src/org/linphone/tutorials/TutorialCardDavSync.java index efcd4bd0d..539349a83 100644 --- a/src/org/linphone/tutorials/TutorialCardDavSync.java +++ b/src/org/linphone/tutorials/TutorialCardDavSync.java @@ -195,7 +195,7 @@ public class TutorialCardDavSync extends Activity implements OnClickListener, Li @Override public void authInfoRequested(LinphoneCore lc, String realm, - String username, String Domain) { + String username, String Domain, LinphoneCore.AuthMethod method) { // TODO Auto-generated method stub } diff --git a/submodules/belle-sip b/submodules/belle-sip index b61dd749d..727db8b6d 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit b61dd749dec10d1f4bb715de6e0868b50c40f0d6 +Subproject commit 727db8b6d041be0d561d34aa1914dbebc1922459 diff --git a/submodules/linphone b/submodules/linphone index 9aa49cdcc..f42568dc7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9aa49cdcc9140b38bae49177db23ab56f6a471bf +Subproject commit f42568dc719704e8549c3b4f9acce34fcb99b7bc diff --git a/tests/src/org/linphone/test/LinphoneTestManager.java b/tests/src/org/linphone/test/LinphoneTestManager.java index b4caa9655..66da48285 100644 --- a/tests/src/org/linphone/test/LinphoneTestManager.java +++ b/tests/src/org/linphone/test/LinphoneTestManager.java @@ -433,7 +433,7 @@ public class LinphoneTestManager implements LinphoneCoreListener{ @Override public void authInfoRequested(LinphoneCore lc, String realm, - String username, String Domain) { + String username, String Domain, LinphoneCore.AuthMethod method) { // TODO Auto-generated method stub } From 4ff7acf40cb29d0b12e40da86929af86445e7818 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 21 Sep 2016 11:15:02 +0200 Subject: [PATCH 05/13] Don't download Openh264 if not enabled on the project --- .../assistant_linphone_login.xml | 2 +- res/layout/assistant_codec_downloader.xml | 9 ++-- res/values/strings.xml | 1 + src/org/linphone/CallOutgoingActivity.java | 2 + src/org/linphone/LinphoneManager.java | 18 +++---- src/org/linphone/SettingsFragment.java | 54 ++++++++++--------- src/org/linphone/StatusFragment.java | 5 +- .../linphone/assistant/AssistantActivity.java | 20 ++++--- 8 files changed, 61 insertions(+), 50 deletions(-) diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml index 1c9d8df64..28bc16612 100644 --- a/res/layout-sw533dp-land/assistant_linphone_login.xml +++ b/res/layout-sw533dp-land/assistant_linphone_login.xml @@ -61,7 +61,7 @@ android:paddingLeft="30dp" android:layout_width="0dp" android:layout_weight="1" - android:layout_height="wrap_content"> + android:layout_height="match_parent"> + android:layout_toStartOf="@+id/imageView" />