From 530c02996b1a16d83a8f84a9c023df72efb31f3c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 19 Jun 2018 22:35:24 +0200 Subject: [PATCH 1/5] Fix Null pointer exception when putting the call on hold. --- src/android/org/linphone/call/CallActivity.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index 2fe3a2db2..e97a50ef5 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -140,6 +140,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList private HashMap mEncoderTexts; private HashMap mDecoderTexts; private CallListenerStub mCallListener; + private Call mCallDisplayedInStats; private boolean oldIsSpeakerEnabled = false; @@ -1675,9 +1676,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList } public void initCallStatsRefresher(final Call call, final View view) { + if (mCallDisplayedInStats == call) return; + if (mTimer != null && mTask != null) { - return; + mTimer.cancel(); + mTimer = null; + mTask = null; } + mCallDisplayedInStats = call; + + if (call == null) return; final TextView titleAudio = (TextView) view.findViewById(R.id.call_stats_audio); final TextView titleVideo = (TextView) view.findViewById(R.id.call_stats_video); @@ -1742,7 +1750,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList public void run() { if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() == null) return; synchronized(LinphoneManager.getLc()) { - if (LinphoneActivity.isInstanciated()) { + if (LinphoneActivity.isInstanciated() && call.getState() != Call.State.Released) { CallParams params = call.getCurrentParams(); if (params != null) { CallStats audioStats = call.getStats(StreamType.Audio); From e2d2d60d739c44e215c87e939b652e0baa59c49b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 20 Jun 2018 09:08:12 +0200 Subject: [PATCH 2/5] fix gradle build --- liblinphone-sdk/build.gradle | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle index ab99818cc..9889fe322 100644 --- a/liblinphone-sdk/build.gradle +++ b/liblinphone-sdk/build.gradle @@ -94,7 +94,7 @@ android { packaged { initWith release signingConfig null - matchingFallbacks = ['debug', 'release'] + //matchingFallbacks = ['debug', 'release'] } } diff --git a/submodules/linphone b/submodules/linphone index f9384facd..e289a58a4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f9384facd9e19c79cad20c14f7596e7c18d7b20c +Subproject commit e289a58a44bc4f91dd0d0130ff8121d75903a576 From 439e0a40920370f554d2dbe5e58f58726e8c88a0 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 25 Jun 2018 10:43:32 +0200 Subject: [PATCH 3/5] update submodule linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index d7b16228a..0f999ecc3 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit d7b16228a2746644a5dea76be9fff45708773130 +Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8 diff --git a/submodules/linphone b/submodules/linphone index e289a58a4..b085154c6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e289a58a44bc4f91dd0d0130ff8121d75903a576 +Subproject commit b085154c6f21aee15f5b8af0fbe601d026b0167f From 3c0a2eaddad71c85ad1aaca6508400621f8ab669 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 26 Jun 2018 16:47:54 +0200 Subject: [PATCH 4/5] Update submodules for lime v2. --- .gitmodules | 6 ++++++ submodules/bctoolbox | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/externals/decaf | 1 + submodules/lime | 1 + submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 8 files changed, 13 insertions(+), 5 deletions(-) create mode 160000 submodules/externals/decaf create mode 160000 submodules/lime diff --git a/.gitmodules b/.gitmodules index cdfee6b31..e10bf033b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -120,3 +120,9 @@ [submodule "submodules/externals/zxing-cpp"] path = submodules/externals/zxing-cpp url = git://git.linphone.org/zxing-cpp.git +[submodule "submodules/lime"] + path = submodules/lime + url = gitosis@git.linphone.org:lime.git +[submodule "submodules/externals/decaf"] + path = submodules/externals/decaf + url = git://git.linphone.org/decaf.git diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 3eef7b372..4dab4917c 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 3eef7b37214cc8a3fc1453fe92ac483a6b388f08 +Subproject commit 4dab4917c02456a1a0ccb2988b57dc98475077b7 diff --git a/submodules/bzrtp b/submodules/bzrtp index 7515af934..94f0d8d3a 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 7515af934e5fa96c7e59f94f49c8bd25dd3ce071 +Subproject commit 94f0d8d3a267f899e9604604c74e876baba26306 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d389b30b6..213000a18 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc +Subproject commit 213000a187fa7d5ed912e4c1dc05e9ae0ab8f054 diff --git a/submodules/externals/decaf b/submodules/externals/decaf new file mode 160000 index 000000000..8feefdc98 --- /dev/null +++ b/submodules/externals/decaf @@ -0,0 +1 @@ +Subproject commit 8feefdc98b0a7ff6efb1442bd474dd14aa7ac9cf diff --git a/submodules/lime b/submodules/lime new file mode 160000 index 000000000..619bb9107 --- /dev/null +++ b/submodules/lime @@ -0,0 +1 @@ +Subproject commit 619bb91077cdbf3e2e3922588b80a1b053bc2809 diff --git a/submodules/linphone b/submodules/linphone index b085154c6..b72bec13a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b085154c6f21aee15f5b8af0fbe601d026b0167f +Subproject commit b72bec13af73f03cb2e5befcfb504f4a6e9f9e31 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index e02b12e57..db95e67be 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit e02b12e579faee6c792bcf34c6cca9ac20f88251 +Subproject commit db95e67bef9084b5ea7cd8ff53ff717299933223 From 4f0f16b561163cdc36f34a5c913817f723992395 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 26 Jun 2018 17:22:49 +0200 Subject: [PATCH 5/5] Add new lime v2 callback --- src/android/org/linphone/LinphoneManager.java | 9 ++++++++- .../org/linphone/assistant/AssistantActivity.java | 10 ++++++++++ .../assistant/CreateAccountActivationFragment.java | 10 ++++++++++ .../assistant/CreateAccountCodeActivationFragment.java | 10 ++++++++++ .../org/linphone/assistant/CreateAccountFragment.java | 10 ++++++++++ .../org/linphone/assistant/LinphoneLoginFragment.java | 10 ++++++++++ .../linphone/fragments/AccountPreferencesFragment.java | 10 ++++++++++ submodules/linphone | 2 +- 8 files changed, 69 insertions(+), 2 deletions(-) diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index 677f41225..d38cc94d9 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1771,6 +1771,13 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou } } - public void onQrcodeFound(Core lc, String something){ + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + } } diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java index 3ed24da84..997d4a1bb 100644 --- a/src/android/org/linphone/assistant/AssistantActivity.java +++ b/src/android/org/linphone/assistant/AssistantActivity.java @@ -762,6 +762,16 @@ private static AssistantActivity instance; } + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } + public CountryListAdapter getCountryListAdapter() { return countryListAdapter; } diff --git a/src/android/org/linphone/assistant/CreateAccountActivationFragment.java b/src/android/org/linphone/assistant/CreateAccountActivationFragment.java index 081ea93d6..29498d3d3 100644 --- a/src/android/org/linphone/assistant/CreateAccountActivationFragment.java +++ b/src/android/org/linphone/assistant/CreateAccountActivationFragment.java @@ -123,4 +123,14 @@ public class CreateAccountActivationFragment extends Fragment implements OnClick public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) { } + + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String resp) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } } diff --git a/src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java b/src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java index dec3380c4..8013650db 100644 --- a/src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java +++ b/src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java @@ -210,4 +210,14 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Acc public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) { } + + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } } diff --git a/src/android/org/linphone/assistant/CreateAccountFragment.java b/src/android/org/linphone/assistant/CreateAccountFragment.java index 4f4ad8254..c0441a837 100644 --- a/src/android/org/linphone/assistant/CreateAccountFragment.java +++ b/src/android/org/linphone/assistant/CreateAccountFragment.java @@ -705,4 +705,14 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On public void onUpdateAccount(AccountCreator accountCreator, Status status, String resp) { } + + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } } diff --git a/src/android/org/linphone/assistant/LinphoneLoginFragment.java b/src/android/org/linphone/assistant/LinphoneLoginFragment.java index 0b0222993..74b0a40dd 100644 --- a/src/android/org/linphone/assistant/LinphoneLoginFragment.java +++ b/src/android/org/linphone/assistant/LinphoneLoginFragment.java @@ -399,4 +399,14 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) { } + + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } } diff --git a/src/android/org/linphone/fragments/AccountPreferencesFragment.java b/src/android/org/linphone/fragments/AccountPreferencesFragment.java index 245a46841..5a6c16b0c 100644 --- a/src/android/org/linphone/fragments/AccountPreferencesFragment.java +++ b/src/android/org/linphone/fragments/AccountPreferencesFragment.java @@ -678,4 +678,14 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), LinphoneActivity.instance()); } } + + @Override + public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) { + + } + + @Override + public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) { + + } } diff --git a/submodules/linphone b/submodules/linphone index b72bec13a..d7ac8b620 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b72bec13af73f03cb2e5befcfb504f4a6e9f9e31 +Subproject commit d7ac8b620e13fd0c7468fe0a2e6ebbfb3e4651d2