From 26694587f87ab094073e69b9fd89957a2a0e57a5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 17 Jun 2013 17:15:12 +0200 Subject: [PATCH 01/10] Updated mssilk submodule --- submodules/mssilk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mssilk b/submodules/mssilk index 2958b2904..b1bbc5f3e 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 2958b2904de6f58372cda7068db3828308563f7d +Subproject commit b1bbc5f3e4dd602ef86dd1555da84dd19a5ac033 From 92ba15cfc24e75e71887de44c930d5965756d0c7 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Tue, 18 Jun 2013 09:37:49 +0200 Subject: [PATCH 02/10] Remove prebuilts, better use the awsome ccache. --- jni/Android.mk | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 4f6f676c4..6390ab9c2 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -49,31 +49,17 @@ include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk endif # Speex -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk),) include $(linphone-root-dir)/submodules/externals/build/speex/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/speex.mk -endif # Gsm -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk),) include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk -endif include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk # Openssl -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),) include $(linphone-root-dir)/submodules/externals/openssl/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk -include $(linphone-root-dir)/submodules/externals/prebuilts/crypto.mk -endif - include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk @@ -101,19 +87,11 @@ ifeq (,$(DUMP_VAR)) $(info Build X264 plugin for mediastreamer2) endif include $(linphone-root-dir)/submodules/msx264/Android.mk -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk),) include $(linphone-root-dir)/submodules/externals/build/x264/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/x264.mk -endif endif -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk),) include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/ffmpeg.mk -endif include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk endif #armeabi-v7a @@ -123,11 +101,7 @@ ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq (,$(DUMP_VAR)) $(info Build ZRTP support - makes application GPLv3) endif -ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk),) include $(linphone-root-dir)/submodules/externals/build/libzrtpcpp/Android.mk -else -include $(linphone-root-dir)/submodules/externals/prebuilts/zrtpcpp.mk -endif endif ifeq ($(BUILD_SRTP), 1) From ae9dcdfc65455bb3b7109c81b2f1921a938fcb02 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 18 Jun 2013 12:08:12 +0200 Subject: [PATCH 03/10] update mssilk --- submodules/mssilk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mssilk b/submodules/mssilk index b1bbc5f3e..b3392dc7f 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit b1bbc5f3e4dd602ef86dd1555da84dd19a5ac033 +Subproject commit b3392dc7f07c94a27eb270eafaa861a127189555 From 1b638b780d18d4cf77c1372b3f3598c58e0b7a5a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 18 Jun 2013 15:24:39 +0200 Subject: [PATCH 04/10] Feature to auto fill email filed in wizard using google account email --- AndroidManifest.xml | 2 ++ res/layout/incoming.xml | 3 ++- res/values/non_localizable_custom.xml | 1 + src/org/linphone/setup/WizardFragment.java | 19 ++++++++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d649a1660..6b64ba6e3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -34,6 +34,8 @@ + + diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml index 663abddbb..1446ab81e 100644 --- a/res/layout/incoming.xml +++ b/res/layout/incoming.xml @@ -1,5 +1,6 @@ + android:layout_marginBottom="80dp" /> diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index f322106a4..50248a500 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -51,6 +51,7 @@ false + true false true true diff --git a/src/org/linphone/setup/WizardFragment.java b/src/org/linphone/setup/WizardFragment.java index 4309edff2..15c8ee055 100644 --- a/src/org/linphone/setup/WizardFragment.java +++ b/src/org/linphone/setup/WizardFragment.java @@ -18,17 +18,21 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import java.net.URL; +import java.util.regex.Pattern; import org.linphone.LinphoneManager; import org.linphone.LinphoneService; import org.linphone.R; +import android.accounts.Account; +import android.accounts.AccountManager; import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.support.v4.app.Fragment; import android.text.Editable; import android.text.TextWatcher; +import android.util.Patterns; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -86,6 +90,18 @@ public class WizardFragment extends Fragment { } }); + if (getResources().getBoolean(R.bool.pre_fill_email_in_wizard)) { + Account[] accounts = AccountManager.get(getActivity()).getAccountsByType("com.google"); + + for (Account account: accounts) { + if (isEmailCorrect(account.name)) { + String possibleEmail = account.name; + email.setText(possibleEmail); + break; + } + } + } + return view; } @@ -152,7 +168,8 @@ public class WizardFragment extends Fragment { } private boolean isEmailCorrect(String email) { - return email.matches("^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$"); + Pattern emailPattern = Patterns.EMAIL_ADDRESS; + return emailPattern.matcher(email).matches(); } private boolean isPasswordCorrect(String password) { From 7c78912dc76749eecb52b9e21d9ddc06fed294b2 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 19 Jun 2013 18:02:53 +0200 Subject: [PATCH 05/10] Version code set to 2100 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6b64ba6e3..3054f22a9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="2100" android:installLocation="auto"> From 7899a0f811a7868b19d2f56112afd70faad85e56 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 19 Jun 2013 18:01:23 +0200 Subject: [PATCH 06/10] Allow customization of service name. --- AndroidManifest.xml | 4 +++- res/values/custom.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3054f22a9..351e23859 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -103,7 +103,9 @@ - + diff --git a/res/values/custom.xml b/res/values/custom.xml index b96131b80..e767c7538 100644 --- a/res/values/custom.xml +++ b/res/values/custom.xml @@ -8,6 +8,7 @@ linphone-mms-%s.jpg Linphone + Linphone Service Linphone Linphone Starting up From ceff51c34b36b67123345256a1361bef2079249e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 20 Jun 2013 09:37:00 +0200 Subject: [PATCH 07/10] Fix incall crash for tablets --- src/org/linphone/InCallActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index b509dcbbb..f5f7f8cf1 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -252,15 +252,15 @@ public class InCallActivity extends FragmentActivity implements if (LinphoneManager.getInstance().isBluetoothScoConnected) { try { routeLayout.setVisibility(View.VISIBLE); + audioRoute.setVisibility(View.VISIBLE); + speaker.setVisibility(View.GONE); } catch (NullPointerException npe) {} - audioRoute.setVisibility(View.VISIBLE); - speaker.setVisibility(View.GONE); } else { try { routeLayout.setVisibility(View.GONE); + audioRoute.setVisibility(View.GONE); + speaker.setVisibility(View.VISIBLE); } catch (NullPointerException npe) {} - audioRoute.setVisibility(View.GONE); - speaker.setVisibility(View.VISIBLE); } } From 72259bd3bdbee86dc0b368dad81899ea560fb692 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 Jun 2013 11:59:50 +0200 Subject: [PATCH 08/10] update linphone submodule (allow contact to be changed during call updates) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 743594103..3bff0cef8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 74359410314eb7a49e5eeb56c4d995f234d36bac +Subproject commit 3bff0cef821cf8f8c42fc78aa30917469d7bf0b2 From ff06c15863ab2050617abfe45246c28ffdcc1813 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 20 Jun 2013 16:18:15 +0200 Subject: [PATCH 09/10] Abandon audio focus again on call released. Fix FM radio not resuming after outgoing call terminated. --- src/org/linphone/LinphoneManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 7741e1465..f35da5dcf 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -29,6 +29,7 @@ import static org.linphone.R.string.pref_codec_speex32_key; import static org.linphone.R.string.pref_video_enable_key; import static org.linphone.core.LinphoneCall.State.CallEnd; import static org.linphone.core.LinphoneCall.State.Error; +import static org.linphone.core.LinphoneCall.State.CallReleased; import static org.linphone.core.LinphoneCall.State.IncomingReceived; import java.io.File; @@ -1216,7 +1217,8 @@ public class LinphoneManager implements LinphoneCoreListener { if (state == LinphoneCall.State.Connected) { if (mLc.getCallsNb() == 1) { - Log.d("Audio focus requested: " + (mAudioManager.requestAudioFocus(null, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); + int res=mAudioManager.requestAudioFocus(null, AudioManager.STREAM_VOICE_CALL, AudioManager.AUDIOFOCUS_GAIN); + Log.d("Audio focus requested: " + (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); } } @@ -1232,9 +1234,10 @@ public class LinphoneManager implements LinphoneCoreListener { stopRinging(); } - if (state == CallEnd || state == Error) { + if (state == CallEnd || state == Error || state == CallReleased) { if (mLc.getCallsNb() == 0) { - Log.d("Audio focus released: " + (mAudioManager.abandonAudioFocus(null) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); + int res=mAudioManager.abandonAudioFocus(null); + Log.d("Audio focus released: " + (res == AudioManager.AUDIOFOCUS_REQUEST_GRANTED ? "Granted" : "Denied")); mAudioManager.setMode(AudioManager.MODE_NORMAL); } Context activity = getContext(); From e0686990feb700a5962daae7f820a4a6680da3ad Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Fri, 21 Jun 2013 10:47:11 +0200 Subject: [PATCH 10/10] Allow choosing silk 8k --- res/values/non_localizable_defaults.xml | 1 + res/xml/preferences.xml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/res/values/non_localizable_defaults.xml b/res/values/non_localizable_defaults.xml index 1b5bd2618..271048727 100644 --- a/res/values/non_localizable_defaults.xml +++ b/res/values/non_localizable_defaults.xml @@ -17,6 +17,7 @@ false false true + false true true diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 03474fd02..12a0438b9 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -102,6 +102,11 @@ android:defaultValue="@bool/pref_codec_g722_default" android:title="@string/pref_codec_g722"/> + +