From 36ec7b2a408a52a67610162edb45957c2961b4e0 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 2 Nov 2017 16:58:51 +0100 Subject: [PATCH 01/31] Fixed issue when picking a file from some places --- src/android/org/linphone/LinphoneUtils.java | 50 +++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index aa7b39f07..c189f47fc 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import android.app.Activity; import android.app.AlertDialog; import android.content.ContentResolver; +import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.CursorLoader; @@ -36,6 +37,7 @@ import android.net.Uri; import android.os.Build; import android.os.Environment; import android.os.ParcelFileDescriptor; +import android.provider.DocumentsContract; import android.provider.MediaStore; import android.provider.MediaStore.Images; import android.telephony.TelephonyManager; @@ -741,9 +743,51 @@ public final class LinphoneUtils { ************************************************************************************************/ public static String getFilePath(final Context context, final Uri uri) { - // Google photo uri example - // content://com.google.android.apps.photos.contentprovider/0/1/mediakey%3A%2FAF1QipMObgoK_wDY66gu0QkMAi/ORIGINAL/NONE/114919 - if ("content".equalsIgnoreCase(uri.getScheme())) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) { + // ExternalStorageProvider + if ("com.android.externalstorage.documents".equals(uri.getAuthority())) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + if ("primary".equalsIgnoreCase(type)) { + return Environment.getExternalStorageDirectory() + "/" + split[1]; + } + + // TODO handle non-primary volumes + } + // DownloadsProvider + else if ("com.android.providers.downloads.documents".equals(uri.getAuthority())) { + + final String id = DocumentsContract.getDocumentId(uri); + final Uri contentUri = ContentUris.withAppendedId( + Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); + + return getDataColumn(context, contentUri, null, null); + } + // MediaProvider + else if ("com.android.providers.media.documents".equals(uri.getAuthority())) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } else if ("video".equals(type)) { + contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI; + } else if ("audio".equals(type)) { + contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[] { + split[1] + }; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } else if ("content".equalsIgnoreCase(uri.getScheme())) { String type = getTypeFromUri(uri, context); String result = getDataColumn(context, uri, null, null); // if (TextUtils.isEmpty(result)) From dda2a36c3ed8c1290ff0ae14bd55d424a08cdbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 6 Nov 2017 14:16:50 +0100 Subject: [PATCH 02/31] Update Linphone submodule (Fixes build errors when ENABLE_SQLITE_STORAGE=NO) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index fba4cd41c..757c396fb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fba4cd41cfe9aad4fd6cfdceffe88c2d603917db +Subproject commit 757c396fbfd145f8c96359a96490f940d0d3579b From af5ef35357460cb39b2a775b98573ce2ac636d49 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 6 Nov 2017 16:50:47 +0100 Subject: [PATCH 03/31] update ortp (fixes bandwidth computation in tunnel mode) --- submodules/oRTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/oRTP b/submodules/oRTP index 5f8fcddce..37ee5af65 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 5f8fcddce392f1510768949a4691f9e8c170badb +Subproject commit 37ee5af65daf9b34c0dcd2badccb16d5e3d7c668 From 002d6b3f3271a30e439438a2f32b61de39957c62 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 6 Nov 2017 22:08:37 +0100 Subject: [PATCH 04/31] update belle-sip and mediastreamer2 (to make consistent with new logging domains requested in liblinphone) --- submodules/belle-sip | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index e3b9709cc..51906fb43 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e3b9709cc5c01250aa944a7cb6f8abbee885113f +Subproject commit 51906fb43d56a698f86f5d72b3fe0ead4ad22910 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 279e03c54..abe1751f0 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 279e03c54ad635a7370fbe8cece50518169f29b0 +Subproject commit abe1751f0c5cd652542744822711cc45f98c44ab From 25ac2e04fa0d7c244e8c3eb32b3cd3a9a0b38ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 7 Nov 2017 11:18:26 +0100 Subject: [PATCH 05/31] Update cmake-builder and libxml submodules. (Fix build for armv5 platforms) [Switch submodule branch] --- submodules/cmake-builder | 2 +- submodules/externals/libxml2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 935fc3a60..dd7df8808 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 935fc3a6034ed1b8f9abc4d6198aa525614c9f8c +Subproject commit dd7df8808a5c0c96a298260f8147779e0d604953 diff --git a/submodules/externals/libxml2 b/submodules/externals/libxml2 index c943f708f..bc5a5d658 160000 --- a/submodules/externals/libxml2 +++ b/submodules/externals/libxml2 @@ -1 +1 @@ -Subproject commit c943f708f1853de4eb15e5a94cf0b35d108da87a +Subproject commit bc5a5d658320c37e206fe4e7b525b4a24466d0c6 From 4c974ecbba48e1409b52f4e61a4f679754bfd963 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 9 Nov 2017 15:00:57 +0100 Subject: [PATCH 06/31] update bctoolbox and linphone --- submodules/bctoolbox | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index f479ecd07..c6bd84568 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit f479ecd07f5ed8577afec2c36bb9efbdbe0317be +Subproject commit c6bd845683bd58c192e23c357d033cd393dc0f02 diff --git a/submodules/linphone b/submodules/linphone index 757c396fb..c6a06ea0a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 757c396fbfd145f8c96359a96490f940d0d3579b +Subproject commit c6a06ea0a7640be8a4e45094d3c2af6909c9ed3f From 699a6f2442c6514f2843ff698fce9c982df5b869 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 10 Nov 2017 11:05:45 +0100 Subject: [PATCH 07/31] update submodules (fixes issue with logging) --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index c6bd84568..382138241 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit c6bd845683bd58c192e23c357d033cd393dc0f02 +Subproject commit 38213824116fca5b6917de9635bdf416be6f23ec diff --git a/submodules/belle-sip b/submodules/belle-sip index 51906fb43..d8c5e9e08 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 51906fb43d56a698f86f5d72b3fe0ead4ad22910 +Subproject commit d8c5e9e08b3bd6640898e46850333f1ad900c8d2 diff --git a/submodules/linphone b/submodules/linphone index c6a06ea0a..7e58bc828 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c6a06ea0a7640be8a4e45094d3c2af6909c9ed3f +Subproject commit 7e58bc828af46600407232b4177872ba939b56e4 From 9465aac20c767f5a4cdf699231182c581c7b053f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 13 Nov 2017 18:44:34 +0100 Subject: [PATCH 08/31] update ms2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index abe1751f0..7ea2dae51 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit abe1751f0c5cd652542744822711cc45f98c44ab +Subproject commit 7ea2dae516d78e060bae7f55fd2346bf493583d2 From 1dfbf9243f4bd37e4a0a7534015bda9141eb0aba Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 14 Nov 2017 14:23:58 +0100 Subject: [PATCH 09/31] Adding make install-test to prepare --- prepare.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/prepare.py b/prepare.py index 442668615..8e2d0db82 100755 --- a/prepare.py +++ b/prepare.py @@ -219,6 +219,12 @@ clean: java-clean install: install-apk run-linphone +install-test: +\t$(MAKE) -C liblinphone_tester copy-libs +\t$(MAKE) -C liblinphone_tester copy-files +\t./gradlew -b liblinphone_tester/build.gradle assembleDebug +\t./gradlew -b liblinphone_tester/build.gradle installDebug + java-clean: \t./gradlew clean From 88025f40632b66cb4f7d74b657c783c6a9ae324a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 14 Nov 2017 14:45:42 +0100 Subject: [PATCH 10/31] Updated linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7e58bc828..dde2e3009 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7e58bc828af46600407232b4177872ba939b56e4 +Subproject commit dde2e3009f285733b29c48370b3b6ec52270c531 From 1627fc8995dd95a313e58da988fd44fc43c5eb0a Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 14 Nov 2017 15:26:22 +0100 Subject: [PATCH 11/31] Adding make unsigned to prepare --- build.gradle | 4 ++++ prepare.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index f07d012aa..782f277b5 100644 --- a/build.gradle +++ b/build.gradle @@ -113,6 +113,10 @@ android { release { signingConfig signingConfigs.release } + packaged { + initWith release + signingConfig null + } } sourceSets { main { diff --git a/prepare.py b/prepare.py index 8e2d0db82..ad53ada9c 100755 --- a/prepare.py +++ b/prepare.py @@ -341,6 +341,9 @@ uninstall: release: java-clean build copy-libs \t./gradlew assembleRelease +unsigned: java-clean build copy-libs +\t./gradlew assemblePackaged + generate-sdk: liblinphone-android-sdk generate-javadoc: From 87657a7871190defbc535fef1bf872aba4b4cf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 14 Nov 2017 16:26:22 +0100 Subject: [PATCH 12/31] Update bcmatroska2 submodule (Fix crash with last Android NDKs) --- submodules/bcmatroska2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2 index f4b87c521..85e73f9fa 160000 --- a/submodules/bcmatroska2 +++ b/submodules/bcmatroska2 @@ -1 +1 @@ -Subproject commit f4b87c521a513b540f34a72ef82a52364929d0be +Subproject commit 85e73f9fa892b09af8d71419a9079f8c804e70b7 From 94768e100954e6d8f9e28cb22517ef1da8144a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 15 Nov 2017 10:46:35 +0100 Subject: [PATCH 13/31] Update linphone submodule (Fills private data in LinphoneChatMessage with zeros) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index dde2e3009..bd08e5940 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit dde2e3009f285733b29c48370b3b6ec52270c531 +Subproject commit bd08e5940c7358a945fff0d0e47678440a1b4ba5 From 7d1e331eb37a161afab78d5c266cc32cf876c644 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 15 Nov 2017 11:41:48 +0100 Subject: [PATCH 14/31] Fix the name of liblinphone sdk --- prepare.py | 1 + 1 file changed, 1 insertion(+) diff --git a/prepare.py b/prepare.py index ad53ada9c..0b4ab8df9 100755 --- a/prepare.py +++ b/prepare.py @@ -354,6 +354,7 @@ liblinphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem \t./gradlew -b libLinphoneAndroidSdk.gradle androidJavadocsJar \t./gradlew -b libLinphoneAndroidSdk.gradle sourcesJar \t./gradlew -b libLinphoneAndroidSdk.gradle assembleRelease +\t@mv $(TOPDIR)/bin/outputs/aar/*.aar $(TOPDIR)/bin/outputs/aar/liblinphone-sdk.aar \t./gradlew -b libLinphoneAndroidSdk.gradle sdkZip linphone-android-sdk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem From e8037ffb2b4d57290f03a02c8617b62d12902f5d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 15 Nov 2017 14:22:23 +0100 Subject: [PATCH 15/31] update cmake builder (fixes x86_64 build) --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index dd7df8808..cc58ec55f 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit dd7df8808a5c0c96a298260f8147779e0d604953 +Subproject commit cc58ec55f47e094c187097d55b77829d665dc4d3 From f018fd46b848b6dec8265e82e02be15be1935cf6 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 15 Nov 2017 14:34:02 +0100 Subject: [PATCH 16/31] Add all architecture option in prepare.py --- prepare.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 0b4ab8df9..07e1ca57d 100755 --- a/prepare.py +++ b/prepare.py @@ -91,10 +91,14 @@ android_targets = { 'x86_64': AndroidX86_64Target() } +android_virtual_targets= { + 'all': ['arm', 'armv7', 'arm64', 'x86', 'x86_64'] +} + class AndroidPreparator(prepare.Preparator): def __init__(self, targets=android_targets): - prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64', 'x86']) + prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64', 'x86'], virtual_targets=android_virtual_targets) self.min_supported_ndk = 11 self.max_supported_ndk = 15 self.unsupported_ndk_version = None From 946cb24eb377c434917a21e238ada98cd0ac45cd Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 15 Nov 2017 15:08:19 +0100 Subject: [PATCH 17/31] Fix problem with mediastreamer log --- .../org/linphone/BluetoothManager.java | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/src/android/org/linphone/BluetoothManager.java b/src/android/org/linphone/BluetoothManager.java index 414c9813c..5c4fa652a 100644 --- a/src/android/org/linphone/BluetoothManager.java +++ b/src/android/org/linphone/BluetoothManager.java @@ -20,8 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import java.util.List; -import org.linphone.mediastream.Log; - import android.annotation.TargetApi; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAssignedNumbers; @@ -65,14 +63,14 @@ public class BluetoothManager extends BroadcastReceiver { public BluetoothManager() { isBluetoothConnected = false; if (!ensureInit()) { - Log.w("[Bluetooth] Manager tried to init but LinphoneService not ready yet..."); + android.util.Log.w("BluetoothManager", "[Bluetooth] Manager tried to init but LinphoneService not ready yet..."); } instance = this; } public void initBluetooth() { if (!ensureInit()) { - Log.w("[Bluetooth] Manager tried to init bluetooth but LinphoneService not ready yet..."); + android.util.Log.w("BluetoothManager", "[Bluetooth] Manager tried to init bluetooth but LinphoneService not ready yet..."); return; } @@ -82,14 +80,14 @@ public class BluetoothManager extends BroadcastReceiver { filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); filter.addAction(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT); mContext.registerReceiver(this, filter); - Log.d("[Bluetooth] Receiver started"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Receiver started"); startBluetooth(); } private void startBluetooth() { if (isBluetoothConnected) { - Log.e("[Bluetooth] Already started, skipping..."); + android.util.Log.e("BluetoothManager", "[Bluetooth] Already started, skipping..."); return; } @@ -97,14 +95,14 @@ public class BluetoothManager extends BroadcastReceiver { if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) { if (mProfileListener != null) { - Log.w("[Bluetooth] Headset profile was already opened, let's close it"); + android.util.Log.w("BluetoothManager", "[Bluetooth] Headset profile was already opened, let's close it"); mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset); } mProfileListener = new BluetoothProfile.ServiceListener() { public void onServiceConnected(int profile, BluetoothProfile proxy) { if (profile == BluetoothProfile.HEADSET) { - Log.d("[Bluetooth] Headset connected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Headset connected"); mBluetoothHeadset = (BluetoothHeadset) proxy; isBluetoothConnected = true; } @@ -113,17 +111,17 @@ public class BluetoothManager extends BroadcastReceiver { if (profile == BluetoothProfile.HEADSET) { mBluetoothHeadset = null; isBluetoothConnected = false; - Log.d("[Bluetooth] Headset disconnected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Headset disconnected"); LinphoneManager.getInstance().routeAudioToReceiver(); } } }; boolean success = mBluetoothAdapter.getProfileProxy(mContext, mProfileListener, BluetoothProfile.HEADSET); if (!success) { - Log.e("[Bluetooth] getProfileProxy failed !"); + android.util.Log.e("BluetoothManager", "[Bluetooth] getProfileProxy failed !"); } } else { - Log.w("[Bluetooth] Interface disabled on device"); + android.util.Log.w("BluetoothManager", "[Bluetooth] Interface disabled on device"); } } @@ -156,7 +154,7 @@ public class BluetoothManager extends BroadcastReceiver { if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled() && mAudioManager != null && mAudioManager.isBluetoothScoAvailableOffCall()) { if (isBluetoothHeadsetAvailable()) { if (mAudioManager != null && !mAudioManager.isBluetoothScoOn()) { - Log.d("[Bluetooth] SCO off, let's start it"); + android.util.Log.d("BluetoothManager", "[Bluetooth] SCO off, let's start it"); mAudioManager.setBluetoothScoOn(true); mAudioManager.startBluetoothSco(); } @@ -183,12 +181,12 @@ public class BluetoothManager extends BroadcastReceiver { } if (ok) { if (retries > 0) { - Log.d("[Bluetooth] Audio route ok after " + retries + " retries"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route ok after " + retries + " retries"); } else { - Log.d("[Bluetooth] Audio route ok"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route ok"); } } else { - Log.d("[Bluetooth] Audio route still not ok..."); + android.util.Log.d("BluetoothManager", "[Bluetooth] Audio route still not ok..."); } return ok; @@ -215,7 +213,7 @@ public class BluetoothManager extends BroadcastReceiver { break; } } - Log.d(isHeadsetConnected ? "[Bluetooth] Headset found, bluetooth audio route available" : "[Bluetooth] No headset found, bluetooth audio route unavailable"); + android.util.Log.d("BluetoothManager", isHeadsetConnected ? "[Bluetooth] Headset found, bluetooth audio route available" : "[Bluetooth] No headset found, bluetooth audio route unavailable"); } return isHeadsetConnected; } @@ -240,12 +238,12 @@ public class BluetoothManager extends BroadcastReceiver { mAudioManager.stopBluetoothSco(); mAudioManager.setBluetoothScoOn(false); } - Log.w("[Bluetooth] SCO disconnected!"); + android.util.Log.w("BluetoothManager", "[Bluetooth] SCO disconnected!"); } } public void stopBluetooth() { - Log.w("[Bluetooth] Stopping..."); + android.util.Log.w("BluetoothManager", "[Bluetooth] Stopping..."); isBluetoothConnected = false; disableBluetoothSCO(); @@ -256,7 +254,7 @@ public class BluetoothManager extends BroadcastReceiver { } mBluetoothDevice = null; - Log.w("[Bluetooth] Stopped!"); + android.util.Log.w("BluetoothManager", "[Bluetooth] Stopped!"); if (LinphoneManager.isInstanciated()) { LinphoneManager.getInstance().routeAudioToReceiver(); @@ -271,10 +269,10 @@ public class BluetoothManager extends BroadcastReceiver { try { mContext.unregisterReceiver(this); - Log.d("[Bluetooth] Receiver stopped"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Receiver stopped"); } catch (Exception e) {} } catch (Exception e) { - Log.e(e); + android.util.Log.e("BluetoothManager", e.getMessage()); } } @@ -286,32 +284,32 @@ public class BluetoothManager extends BroadcastReceiver { if (AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED.equals(action)) { int state = intent.getIntExtra(AudioManager.EXTRA_SCO_AUDIO_STATE, 0); if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) { - Log.d("[Bluetooth] SCO state: connected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: connected"); // LinphoneManager.getInstance().audioStateChanged(AudioState.BLUETOOTH); isScoConnected = true; } else if (state == AudioManager.SCO_AUDIO_STATE_DISCONNECTED) { - Log.d("[Bluetooth] SCO state: disconnected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: disconnected"); // LinphoneManager.getInstance().audioStateChanged(AudioState.SPEAKER); isScoConnected = false; } else if (state == AudioManager.SCO_AUDIO_STATE_CONNECTING) { - Log.d("[Bluetooth] SCO state: connecting"); + android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: connecting"); // LinphoneManager.getInstance().audioStateChanged(AudioState.BLUETOOTH); isScoConnected = true; } else { - Log.d("[Bluetooth] SCO state: " + state); + android.util.Log.d("BluetoothManager", "[Bluetooth] SCO state: " + state); } refreshCallView(); } else if (BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED.equals(action)) { int state = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, BluetoothAdapter.STATE_DISCONNECTED); if (state == 0) { - Log.d("[Bluetooth] State: disconnected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] State: disconnected"); stopBluetooth(); } else if (state == 2) { - Log.d("[Bluetooth] State: connected"); + android.util.Log.d("BluetoothManager", "[Bluetooth] State: connected"); startBluetooth(); } else { - Log.d("[Bluetooth] State: " + state); + android.util.Log.d("BluetoothManager", "[Bluetooth] State: " + state); } } else if (intent.getAction().equals(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT)) { @@ -320,16 +318,16 @@ public class BluetoothManager extends BroadcastReceiver { Object[] args = (Object[]) intent.getExtras().get(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS); if (args.length <= 0) { - Log.d("[Bluetooth] Event: " + command + ", no args"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + ", no args"); return; } String eventName = (args[0]).toString(); if (eventName.equals("BUTTON") && args.length >= 3) { String buttonID = args[1].toString(); String mode = args[2].toString(); - Log.d("[Bluetooth] Event: " + command + " : " + eventName + ", id = " + buttonID + " (" + mode + ")"); + android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + " : " + eventName + ", id = " + buttonID + " (" + mode + ")"); } else { - Log.d("[Bluetooth] Event: " + command + " : " + eventName); + android.util.Log.d("BluetoothManager", "[Bluetooth] Event: " + command + " : " + eventName); } } } From d7302206dc6300c7fb664e2b44a4b524f7445aaf Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 15 Nov 2017 15:09:23 +0100 Subject: [PATCH 18/31] Some fix to avoid crash --- src/android/org/linphone/BootReceiver.java | 6 +++++- src/android/org/linphone/LinphoneManager.java | 7 +++++-- src/android/org/linphone/LinphoneUtils.java | 2 +- src/android/org/linphone/assistant/AssistantActivity.java | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/android/org/linphone/BootReceiver.java b/src/android/org/linphone/BootReceiver.java index 3ec7f2148..87e4fc84b 100644 --- a/src/android/org/linphone/BootReceiver.java +++ b/src/android/org/linphone/BootReceiver.java @@ -42,7 +42,11 @@ public class BootReceiver extends BroadcastReceiver { if (autostart) { Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN); lLinphoneServiceIntent.setClass(context, LinphoneService.class); - context.startService(lLinphoneServiceIntent); + try { + context.startService(lLinphoneServiceIntent); + } catch (RuntimeException e) { + Log.e(e); + } } } } diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java index d78212bf9..76e1267bb 100644 --- a/src/android/org/linphone/LinphoneManager.java +++ b/src/android/org/linphone/LinphoneManager.java @@ -1401,8 +1401,11 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag try { if (mLc.getCallsNb() > 0) { mLc.acceptCall(call); - LinphoneManager.getInstance().routeAudioToReceiver(); - LinphoneActivity.instance().startIncallActivity(call); + if (LinphoneManager.getInstance() != null) { + LinphoneManager.getInstance().routeAudioToReceiver(); + if (LinphoneActivity.instance() != null) + LinphoneActivity.instance().startIncallActivity(call); + } } } catch (LinphoneCoreException e) { Log.e(e); diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java index c189f47fc..02aa76f85 100644 --- a/src/android/org/linphone/LinphoneUtils.java +++ b/src/android/org/linphone/LinphoneUtils.java @@ -728,7 +728,7 @@ public final class LinphoneUtils { } public static void displayErrorAlert(String msg, Context ctxt) { - if (ctxt != null) { + if (ctxt != null && msg != null) { AlertDialog.Builder builder = new AlertDialog.Builder(ctxt); builder.setMessage(msg) .setCancelable(false) diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java index 90db60512..fc4127b4c 100644 --- a/src/android/org/linphone/assistant/AssistantActivity.java +++ b/src/android/org/linphone/assistant/AssistantActivity.java @@ -138,8 +138,10 @@ private static AssistantActivity instance; mPrefs = LinphonePreferences.instance(); status.enableSideMenu(false); - accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl()); - accountCreator.setListener(this); + if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { + accountCreator = LinphoneCoreFactory.instance().createAccountCreator(LinphoneManager.getLc(), LinphonePreferences.instance().getXmlrpcUrl()); + accountCreator.setListener(this); + } countryListAdapter = new CountryListAdapter(getApplicationContext()); mListener = new LinphoneCoreListenerBase() { From 90ebbea213b54ea7d7ba65668bada3ac6d9d3900 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 15 Nov 2017 17:02:41 +0100 Subject: [PATCH 19/31] Fix disable proximity sensor with video --- src/android/org/linphone/CallActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/android/org/linphone/CallActivity.java b/src/android/org/linphone/CallActivity.java index 1bbdf2c17..e9ddc504f 100644 --- a/src/android/org/linphone/CallActivity.java +++ b/src/android/org/linphone/CallActivity.java @@ -892,7 +892,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList protected void toggleSpeaker() { isSpeakerEnabled = !isSpeakerEnabled; if (LinphoneManager.getLc().getCurrentCall() != null) { - LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled); + if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) + LinphoneManager.getInstance().enableProximitySensing(false); + else + LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled); } if (isSpeakerEnabled) { LinphoneManager.getInstance().routeAudioToSpeaker(); From 86ce8efd2184b09e326e37ce1e69ddd14a51569d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 16 Nov 2017 10:50:28 +0100 Subject: [PATCH 20/31] update ms2 (fixes MediaCodec issue) --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 7ea2dae51..eeac01685 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 7ea2dae516d78e060bae7f55fd2346bf493583d2 +Subproject commit eeac016851352b9919a902be43460ba0a94c8fb7 From dc9f7cc26f332d43e83e34bea4e9cf23fe78458b Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 16 Nov 2017 11:53:02 +0100 Subject: [PATCH 21/31] Update submodule linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bd08e5940..8b1498247 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bd08e5940c7358a945fff0d0e47678440a1b4ba5 +Subproject commit 8b1498247a0fdcfa797fcc4cae8fc03a53e89472 From 51bc43cf575b6c347b0cad98f04778d84ff19dcf Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 16 Nov 2017 14:22:00 +0100 Subject: [PATCH 22/31] Fix the contact of phone number in history --- src/android/org/linphone/HistoryListFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/android/org/linphone/HistoryListFragment.java b/src/android/org/linphone/HistoryListFragment.java index 01e4ead15..134a228c0 100644 --- a/src/android/org/linphone/HistoryListFragment.java +++ b/src/android/org/linphone/HistoryListFragment.java @@ -468,6 +468,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On } LinphoneContact c = ContactsManager.getInstance().findContactFromAddress(address); + if (c == null) c = ContactsManager.getInstance().findContactFromPhoneNumber(address.getUserName()); String displayName = null; final String sipUri = address.asString(); if (c != null) { From bfcd07475867a602413346d4d73d036fa06a8fc1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 16 Nov 2017 14:26:55 +0100 Subject: [PATCH 23/31] Change directory of BuildConfig for aar --- AndroidManifestLibrary.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifestLibrary.xml b/AndroidManifestLibrary.xml index 08ac46283..51d751ad7 100755 --- a/AndroidManifestLibrary.xml +++ b/AndroidManifestLibrary.xml @@ -1,5 +1,5 @@ - Date: Thu, 16 Nov 2017 14:28:01 +0100 Subject: [PATCH 24/31] Update transifex --- res/values-ar/strings.xml | 3 +- res/values-de/strings.xml | 1 + res/values-es/strings.xml | 5 +++ res/values-fi/strings.xml | 1 + res/values-fr/strings.xml | 3 +- res/values-ja/strings.xml | 3 +- res/values-ka/strings.xml | 2 +- res/values-nl/strings.xml | 1 + res/values-pl/strings.xml | 3 +- res/values-pt-rBR/strings.xml | 1 + res/values-ru/strings.xml | 2 +- res/values-sr/strings.xml | 1 + res/values-sv/strings.xml | 4 +-- res/values-tr/strings.xml | 60 +++++++++++++++++++++++------------ res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 1 + res/values/strings.xml | 2 +- 17 files changed, 61 insertions(+), 34 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 54c7c9833..42b421acb 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -110,8 +110,6 @@ استخدم عنوان البريد الإلكتروني لتأكيد الحساب استعمل اسم المستخدم وكلمة السر عوضا عن رقم هاتفك لأي غرض سيجري استخدام رقم هاتفي ؟ - -\nبفضل رقم هاتفك، سيجدك أصدقاؤك بسهولة.\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n \nسيجدك أصدقاؤك بسهولة إن ربطت حسابك برقم هاتفك\\n\nسوف تجد في دفتر عناوينك من يستخدم لِنْفُونْ وسيتمكن أصدقاؤك من الوصول إليك بواسطة لِنْفُونْ كذلك.لِنْفُونْ.\n يمكنك استخدام رقم هاتفي واحد مع حساب لنفون واحد.\n\nإن ربطت رقم هاتفك مع حساب آخر لكنك تود استخدام هذا الحساب، يمكنك ببساطة ربطه مع رقم هاتفك تلقائيا وسيُنقَل هذا الأخير إلى هذا الحساب. @@ -454,5 +452,6 @@ خيارات المكالمة توجيه الصوت مغادرة الاجتماع + خدمة لِنْفُونْ إشعارات لِنْفُونْ diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e64a4e312..1a50481b8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -444,5 +444,6 @@ Anrufoptionen Audioroute Konferenz beenden + Linphone-Dienst Linphone-Benachrichtigung diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 185baf6c5..e7a9e7d83 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -10,9 +10,12 @@ contactos linphone Nombre de usuario + ID de usuario (opcional) Número de teléfono Nombre a mostrar Contraseña + Contraseña de confirmación + Dominio Borrar Reintentar Cancelar @@ -36,6 +39,7 @@ Ha ocurrido un error, pruebe más tarde. Este nombre de usuario está en uso. Por favor, introduzca su usuario y contraseña + Use la dirección de correo electrónico para la validación de la cuenta @@ -203,4 +207,5 @@ Apellido Transferir Bluetooth + Linphone Service diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 8d08b4d9f..6d982194d 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -304,4 +304,5 @@ Sukunimi Siirrä Bluetooth + Linphone Palvelin diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fb53093ef..139485461 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -109,8 +109,6 @@ Utiliser une adresse mail pour créer un compte Utiliser votre nom d\'utilisateur et votre mot de passe plutôt que votre numéro Comment mon numéro de téléphone sera-t-il utilisé ? - -Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n Vos amis pourront vous joindre plus facilement si vous associez votre compte à votre numéro de téléphone\n\nVous verrez dans votre carnet d\'adresses les contacts qui utilisent Linphone et vos amis sauront qu\'ils peuvent vous contacter.\n Vous ne pouvez associer votre numéro qu\'à un seul compte Linphone.\n\nSi vous avez déjà associé votre numéro à un autre compte mais préférez utiliser ce compte-ci, suivez la procédure d\'association et votre numéro sera automatiquement transféré à ce compte. @@ -442,4 +440,5 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à Options d\'appel Route audio Quitter la conférence + Linphone Service diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index bd5d0a6d7..05219bf0e 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -105,8 +105,6 @@ アカウント認証にメールアドレスを使う 電話番号の代わりにユーザー名とパスワードを使う 私の電話番号は何のために使われますか？ - -\nあなたの電話番号のおかげで、あなたの友人はあなたをより簡単に見つけるでしょう。 \n\nLinphoneを使用しているあなたのアドレス帳にあなたが表示され、あなたの友人はLinphoneでもあなたを呼び出せる事を知ります。\n \nLinphoneを使用しているあなたのアドレス帳に\nあなたが表示され、あなたの友人は\nLinphoneでもあなたに連絡できることを把握します。 アカウントを自分の電話番号にリンクすると、友人があなたをより簡単に見つけることができます。\n\n電話番号は、1つのLinphoneアカウントでのみ使用できます。\n\n既にあなたの番号を他のアカウントにリンクしていたが、\n\nこの番号を使用したい場合は、今すぐリンクする事で番号が自動的にこのアカウントに移動されます。 @@ -429,4 +427,5 @@ 発信オプション オーディオルート 会議を終了する + サービス diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index a076c2d2d..2a825c299 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -111,7 +111,6 @@ ელფოსტის მისამართის გამოყენება ანგარიშის დასადატურებლად თქვენი მომხმარებლის სახელის და პაროლის გამოყენება თქვენი ტელეფონის ნომრის მაგივრად რისთვის იქნება გამოყენებული ჩემი ტელეფონის ნომერი? - \nთქვენი ტელეფონის ნომრის დახმარებით, თქვენი მეგობრები შეძლებენ გიპოვონ უფრო მარტივად.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n \nთქვენი მეგობრები გიპოვიან უფრო მარტივად, თუ მიაბამთ თქვენს ანგარიშს თქვენს ტელფონის ნომერზე.\n\nთქვენ დაინახავთ თქვენს მისამართები წიგნში ვინ იყენებს Linphone-ს და თქვენს მეგობრებს ეცოდინებათ, რომ შეუძლიათ ასევე დაგიკავშირდნენ Linphone-ით.\n თქვენ შეგიძლიათ გამოიყენოთ თქვენი ტელეფონის ნომერი მხოლოდ ერთ Linphone ანგარიშთან.\n\nთუ უკვე მიბმული გაქვთ თქვენი ნომერი სხვა ანგარიშზე, მაგრამ გსურთ ამის გამოყენება, უბრალოდ მიაბით იგი ახლა და თქვენი ნომერი იქნება ავტომატურად გადმოტანილი ამ ანგარიშზე. @@ -456,5 +455,6 @@ ზარის პარამეტრები ხმის მარშრუტი კონფერენციიდან გამოსვლა + Linphone სერვისი Linphone-ის შეტყობინება diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index ffe45a90a..687decc36 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -155,4 +155,5 @@ Voornaam Achternaam Bluetooth + Linphone-dienst diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index f9ae013fc..9dcf4f805 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -105,8 +105,6 @@ Użyj adresu e-mail do weryfikacji konta Użyj nazwy użytkownika i hasła, zamiast numeru telefonu Jaki będzie używany mój numer telefonu? - -\nDzięki twojemu numerowi telefonu twoi znajomi będą mogli znaleźć cię łatwiej.\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n \nTwoi znajomi będą mogli znaleźć cię łatwiej, jeśli połączysz swoje konto do swojego numeru telefonu\n\nZobaczysz w książce adresowej, kto używa Linphone i twoi znajomi będą wiedzieli, że mogą dotrzeć do ciebie również na Linphone.\n Można używać tylko swój numer telefonu z jednego konta Linphone.\n\nIf Jeśli masz już połączony swój numer do innego konta, ale wolisz używać tego jednego, wystarczy połączyć go teraz i numer zostanie automatycznie przeniesiony do tego konta. @@ -424,4 +422,5 @@ Wpisz wyświetlaną nazwę (opcjonalnie) Opcje połączeń Przesyłanie audio Wyjście konferencji + Linphone Service diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index d012d33c2..f0ed01be0 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -357,4 +357,5 @@ Opcões de chamadas Route de áudio Sair da conferência + Linphone Service diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index bdfe085f8..718af1e54 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -111,7 +111,6 @@ Использовать адрес электронной почты для проверки учетной записи Вместо номера телефона использовать имя пользователя и пароль Для чего будет использоваться мой номер телефона? - \nБлагодаря номеру телефона вашим друзьям будет проще вас найти.\n\n В вашей адресной книге вы увидите, кто использует Linphone, а ваши друзья смогут узнать, что вы также зарегистрированы в Linphone.\n \nВашим друзьям будет проще связаться с вами, если вы свяжете свою учетную запись со своим номером телефона.\n\nВ вашей адресной книге вы увидите, кто использует Linphone, а ваши друзья смогут узнать, что вы также зарегистрированы в Linphone.\n Номер телефона можно использовать только с одной учетной записью Linphone.\n\nЕсли ваш номер уже был связан с другой учетной записью, но вы предпочитаете использовать его, просто свяжите его сейчас, и ваш номер будет автоматически перенесен в эту учетную запись. @@ -457,5 +456,6 @@ Параметры вызова Аудио маршрут Выйти из конференции + Служба Linphone Уведомление Linphone diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 82144eb6f..eb1cf8454 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -245,4 +245,5 @@ Презиме Пребаци Блутут + Услуга Линфона diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 31e779931..f0440abc6 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -24,7 +24,7 @@ Domän Webbadress E-post - Är du säker på att du vill radera ta bort val? + Är du säker på att du vill ta bort val? Ta bort Försök igen Avbryt @@ -111,7 +111,6 @@ Använd e-postadress för kontovalidering Använd ditt användarnamn och lösenord istället för ditt telefonnummer Vad ska mitt telefonnummer användas för? - \nTack vare ditt telefonnummer kommer dina vänner att hitta dig lättare.\n\nDu kommer att se i din adressbok vem som använder Linphone och dina vänner kommer att veta att de även kan nå dig på Linphone.\n \nDina vänner hittar dig lättare om du kopplar ditt konto till ditt telefonnummer\n\nDu ser i din adressbok vilka som använder Linphone och dina vänner vet att de når dig på Linphone också.\n Du kan bara använda ditt telefonnummer med ett Linphone-konto.\n\nOm du redan har länkat ditt nummer till ett annat konto, men du föredrar att använda det här, kopplar du bara det nu och ditt nummer flyttas automatiskt till det här kontot. @@ -454,5 +453,6 @@ Samtalsalternativ Ljudväg Avsluta konferens + Linphone-tjänst Linphone-avisering diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 2c15e0000..084bc32f4 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -16,6 +16,7 @@ Linphone bağlantıları Kullanıcı adı + Kullanıcı kimliği (isteğe bağlı) Telefon numarası Görünen ad Parola @@ -45,6 +46,7 @@ Belki daha sonra Daha sonra Hayır + Tamam Evet Hesabını bağla @@ -68,7 +70,7 @@ Linphone hesabı kullan SIP hesabı kullan Uzaktan yapılandırma al - Lütfen ülke kodunuzu onaylayın ve telefon numaranızı girin + Lütfen ülke kodunuzu doğrulayın ve telefon numaranızı girin Telefon numaranıza SMS ile bir doğrulama kodu gönderdik: Telefon numarası doğrulamayı tamamlamak için, lütfen 4 haneli kodu aşağı girin:\n Lütfen Linphone hesabınız için bir kullanıcı adı, e-posta ve parola girin @@ -90,7 +92,7 @@ OpenH264 çözücüsünü kullanmadan önce %s\'u yeniden başlatmalısınız. Üzgünüz bir hata oluştu. Cisco Systems, Inc. tarafından sağlanan OpenH264 Video çözücüsü indirildi. - Bir hata oluştu,daha sonra tekrar deneyin. + Bir hata oluştu, daha sonra yeniden deneyin. Sunucuya ulaşılamıyor,ağ bağlantınızı kontrol edin. Bu kullanıcı adı zaten kullanılıyor. Bu telefon numarası zaten kullanıldı.\r\nLütfen değişik bir numara girin.\r\nEğer telefon numaranızı yeniden kullanmak istiyorsanız var olan hesabınızı silebilirsiniz. @@ -109,7 +111,6 @@ Hesap doğrulama için e-posta adresi kullan Telefon numaranız yerine kullanıcı adınızı ve parolanızı kullanın Telefon numaram ne için kullanılacak? - \nTelefon numaranız sayesinde arkadaşların seni daha kolay bulacak.\n\n Adres defterinde kimlerin Linphone kullandığını göreceksin ve arkadaşların da sana Linphone üzerinden ulaşabileceklerini bilecek.\n \nEğer hesabını telefon numarana bağlarsan arkadaşların seni daha kolay bulacak\n\nAdres listende kimlerin Linphone kullandığını göreceksin ve arkadaşların da sana Linphone üzerinden ulaşabileceğini bilecek.\n Telefon numaranı yalnızca tek Linphone hesabıyla kullanabilirsin.\n\nEğer hesabını zaten başka bir hesaba bağladıysan ama bunu kullanmak istiyorsan, şimdi bağla ve numaran kendiliğinden bu hesaba taşınsın. @@ -141,7 +142,7 @@ Çağrı geçmişiniz boş Geçmişinizde yanıtsız çağrı yok - Seçilmiş çağrı kayıtlarını silmek ister misin? + Seçilen çağrı kayıtlarını silmek ister misin? Bugün Dün @@ -174,6 +175,9 @@ Bu iletinin şifresini çözemezsiniz. ZRTP ile doğrulanmamış bir kişiye LIME kullanarak ileti göndermek istiyorsunuz.\nLütfen bu kişiyi arayın ve iletilerinizi göndermeden önce onun ZRTP anahtarını doğrulayın. Görüntü işleniyor, dosyanın boyutuna bağlı olarak bir kaç saniye sürebilir + Okundu + Ulaştırıldı + Yeniden gönder Kayıtlı Kayıtsız @@ -188,9 +192,14 @@ Gelen çağrı Giden çağrı - Etkin arama yok + Görüştüğünüz kişi görüntüyü açmak istiyor + Etkin çağrı yok + Görüştüğünüz kişi çağrıyı duraklattı Gelen aramanın kabulünde bir hata oluştu Eş ile aşağıdaki SAS\'ı doğrulayın:\nSöyleyin: %s + \nGörüştüğünüz kişi şunu söylemeli: %s + SAS + Eşiniz ile önceki SAS kodunuzu doğrulayın Bilinmeyen Ses Görüntü @@ -198,11 +207,15 @@ IP Ailesi: Karşıya yükleme hızı: İndirme hızı: + Tahmini indirme bant genişliği: İCE bağlanılabilirliği: - Giden video çözünürlüğü: - Alınan video çözünürlüğü: + Giden görüntü çözünürlüğü: + Alınan görüntü çözünürlüğü: + Giden görüntü fps\'si: + Alınan görüntü fps\'si: Gönderici kayıp oranı: Alıcı kayıp oranı: + Jitter tamponu: Kodlayıcı: Çözücü: Çağrı @@ -210,9 +223,9 @@ Günlük gönder Günlüğü sıfırla - Sesli arama sürüyor - süregiden arama duraklatıldı - Görüntülü görüşme sürüyor + Sesli çağrı sürüyor + Duraklayan çağrı sürüyor + Görüntülü çağrı sürüyor Başladı %i okunmamış iletiler Yanıtsız çağrı @@ -226,11 +239,12 @@ Kullanıcı meşgul Kullanıcı bulunamadı Uyumsuz ortam değişkenleri + Görüştüğünüz kişinin bant genişliği düşük, görüntü başlatılamaz Ağa erişim yok Referansı kötü Kimlik doğrulanmadı Ağ hatası - İndirme başarısız. Lütfen ağ bağlantınızı gözden geçirin ya da daha sonra tekrar deneyin. + İndirme başarısız. Lütfen ağ bağlantınızı gözden geçirin ya da daha sonra yeniden deneyin. Uzaktan yetkilendirme profili indirilirmesi ya da uygulanması başarısız... Uzaktan yetkilendirme Uzaktan yetkilendirme adresinizi değiştirmek istiyor musunuz? @@ -284,7 +298,7 @@ Hiçbiri Yeğlenenler - Görüntü etkin + Görüntüyü Etkinleştir Ses Yankı giderme @@ -300,10 +314,10 @@ Çözücüler Görüntü - Video örten katmanı - Uygulamanın dışındayken çağrı videosunu örten tabakada göster + Görüntü örten katmanı + Uygulamanın dışındayken çağrı görüntüsünü örten tabakada göster Ön kamerayı kullan - Görüntülü arama başlat + Görüntülü çağrı başlat Görüntü isteğini her zaman gönder Gelen görüntü isteklerini kabul et Görüntü isteklerini her zaman kabul et @@ -316,8 +330,10 @@ Çağrı Aygıt zil sesini kullan Gelen çağrıları kendiliğinden yanıtla + Kendiliğinden yanıtlama zamanı (milisaniye türünde) Bant içi DTMF(RFC2833) gönder Bant dışı DTMF(SIP INFO) gönder + Çağrı zaman aşımı (saniye türünde) Sesli posta adresi Konuşma @@ -331,6 +347,7 @@ Ağ Yalnızca WiFi kullan + Hafif uyku kipi STUN / TURN sunucusu ICE etkin TURN etkin @@ -350,6 +367,7 @@ Gelişmiş Hata ayıklama Hata ayıklama + Arkadaş listesi aboneliği Artalan kipi Animasyonlar etkin Hizmet bildirimi etkin @@ -389,7 +407,7 @@ İleti gönder Ayrıntılar Sil - Arama ekle + Çağrı ekle Yeni tartışma Arama Bağlantı ara @@ -400,13 +418,13 @@ Tüm çağrılar Yanıtsız çağrılar Görüntü düğmesi - Arama ekle + Çağrı ekle Duraklat Sayısal tuş takımı Geçmiş düğmesi Konuşma düğmesi Bağlantılar düğmesi - Çağrı kalitesi + Çağrı niteliği Şifreleme Kamera düğmesi İptal düğmesi @@ -418,7 +436,7 @@ Görünen ad alanı Alan adı alanı Uzaktan yetkilendirme alanı - Parola onaylama alanı + Parola doğrulama alanı Eposta alanı Öntanımlı hesap Tüm seçilenleri iptal et @@ -427,7 +445,7 @@ Ad Soyadı Kuruluş - Aramaya dön + Çağrıya dön Bir dosya gönder Gelen dosya İleti @@ -438,4 +456,6 @@ Çağrı seçenekleri Ses yolu Görüşmeden çık + Linphone Hizmeti + Linphone Bildirimi diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index c6470e632..3e61efc1a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -108,7 +108,6 @@ 使用邮箱地址来激活帐户 用您的用户名和密码来代替电话号码 我的电话号码将用于？ - 如果将您的帐户关联您的电话号码，您的朋友们可以更容易的找到你。您在通讯录里可以查看谁在使用Linphone，他们也同样可以通过Linphone联系您。 如果将您的帐户关联您的电话号码，您的朋友们可以更容易的找到你。您在通讯录里可以查看谁在使用Linphone，他们也同样可以通过Linphone联系您。 您的电话号码只能关联一个Linphone帐户。如果您已经把您的号码关联了其他账户，但是你更想使用这个。只需关联您现在的帐户，你的号码就会自动转移到这个账户。 @@ -435,4 +434,5 @@ 通话选项 音频路由 退出会话 + Linphone服务 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 9f6ec6ce1..af71ea2be 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -309,4 +309,5 @@ 轉接 藍牙 通話選項 + Linphone 服務 diff --git a/res/values/strings.xml b/res/values/strings.xml index 592efc051..d6d3ff052 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -115,7 +115,7 @@ Use email address for account validation Use your username and password instead of your phone number What will my phone number be used for? - \nThanks to your phone number, your friends will find you more easily.\n\n You will see in your address book who is using Linphone and your friends will know that they can rach you on Linphone as well.\n + \nThanks to your phone number, your friends will find you more easily.\n\n You will see in your address book who is using Linphone and your friends will know that they can reach you on Linphone as well.\n \nYour friends will find you more easily if you link your account to your phone number\n\nYou will see in your address book who is using Linphone and your friends will know that they can reach you on Linphone as well.\n You can only use your phone number with one Linphone account.\n\nIf you had already linked your number to an other account but you prefer to use this one, simply link it now and your number will automatically be moved to this account. From 352701270b28aec86e017a36ad5bac06218fd4f8 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 17 Nov 2017 10:32:50 +0100 Subject: [PATCH 25/31] Fix problem with default avatar in contacts list --- src/android/org/linphone/ContactsListFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/android/org/linphone/ContactsListFragment.java b/src/android/org/linphone/ContactsListFragment.java index 146bd6d67..570cf0ce3 100644 --- a/src/android/org/linphone/ContactsListFragment.java +++ b/src/android/org/linphone/ContactsListFragment.java @@ -548,10 +548,9 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O holder.linphoneFriend.setVisibility(View.GONE); } + holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); if (contact.hasPhoto()) { LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri()); - } else { - holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); } boolean isOrgVisible = getResources().getBoolean(R.bool.display_contact_organization); From 808d03494f2627c99ed79b924d0167f0bea24124 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 17 Nov 2017 12:01:13 +0100 Subject: [PATCH 26/31] Fixed start at boot time crash on Android O --- src/android/org/linphone/BootReceiver.java | 15 ++++++--------- .../linphone/compatibility/ApiSixteenPlus.java | 5 +++++ .../linphone/compatibility/ApiTwentySixPlus.java | 5 +++++ .../org/linphone/compatibility/Compatibility.java | 9 +++++++++ 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/android/org/linphone/BootReceiver.java b/src/android/org/linphone/BootReceiver.java index 87e4fc84b..f11d33a43 100644 --- a/src/android/org/linphone/BootReceiver.java +++ b/src/android/org/linphone/BootReceiver.java @@ -19,18 +19,19 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import org.linphone.core.LinphoneCoreFactory; -import org.linphone.core.LpConfig; -import org.linphone.mediastream.Log; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import org.linphone.compatibility.Compatibility; +import org.linphone.core.LinphoneCoreFactory; +import org.linphone.core.LpConfig; + public class BootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + LinphonePreferences.instance().setContext(context); if (intent.getAction().equalsIgnoreCase(Intent.ACTION_SHUTDOWN)) { android.util.Log.d("LinphoneBootReceiver", "Device is shutting down, destroying LinphoneCore to unregister"); LinphoneManager.destroy(); @@ -42,11 +43,7 @@ public class BootReceiver extends BroadcastReceiver { if (autostart) { Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN); lLinphoneServiceIntent.setClass(context, LinphoneService.class); - try { - context.startService(lLinphoneServiceIntent); - } catch (RuntimeException e) { - Log.e(e); - } + Compatibility.startService(context, lLinphoneServiceIntent); } } } diff --git a/src/android/org/linphone/compatibility/ApiSixteenPlus.java b/src/android/org/linphone/compatibility/ApiSixteenPlus.java index f9d0c1184..9c31506ef 100644 --- a/src/android/org/linphone/compatibility/ApiSixteenPlus.java +++ b/src/android/org/linphone/compatibility/ApiSixteenPlus.java @@ -6,6 +6,7 @@ import android.annotation.TargetApi; import android.app.Notification; import android.app.PendingIntent; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.OnGlobalLayoutListener; @@ -137,4 +138,8 @@ public class ApiSixteenPlus { return notif; } + + public static void startService(Context context, Intent intent) { + context.startService(intent); + } } diff --git a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java index 2360bd0c6..bcf26b074 100644 --- a/src/android/org/linphone/compatibility/ApiTwentySixPlus.java +++ b/src/android/org/linphone/compatibility/ApiTwentySixPlus.java @@ -7,6 +7,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; import android.media.AudioAttributes; import android.view.ViewTreeObserver; @@ -176,4 +177,8 @@ public class ApiTwentySixPlus { return notif; } + + public static void startService(Context context, Intent intent) { + context.startForegroundService(intent); + } } diff --git a/src/android/org/linphone/compatibility/Compatibility.java b/src/android/org/linphone/compatibility/Compatibility.java index 171bf5444..6f147f971 100644 --- a/src/android/org/linphone/compatibility/Compatibility.java +++ b/src/android/org/linphone/compatibility/Compatibility.java @@ -23,6 +23,7 @@ import android.app.AlarmManager; import android.app.Notification; import android.app.PendingIntent; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; import android.os.Build; import android.os.PowerManager; @@ -154,4 +155,12 @@ public class Compatibility { ApiElevenPlus.scheduleAlarm(alarmManager, type, triggerAtMillis, operation); } } + + public static void startService(Context context, Intent intent) { + if (Version.sdkAboveOrEqual(Version.API26_O_80)) { + ApiTwentySixPlus.startService(context, intent); + } else { + ApiSixteenPlus.startService(context, intent); + } + } } From e145bdb4611292702371d90466ed56d6f8eb2016 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 20 Nov 2017 15:19:23 +0100 Subject: [PATCH 27/31] Fixed incoming call ringing even if do not disturb mode is on --- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 8b1498247..28950cd3f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8b1498247a0fdcfa797fcc4cae8fc03a53e89472 +Subproject commit 28950cd3f4419edf984e8fa1229076dbee8a74cf diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index eeac01685..9268b7723 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit eeac016851352b9919a902be43460ba0a94c8fb7 +Subproject commit 9268b7723cadc4b46641a48c150f448e45418f3e From dd5a46bc0995b59c14152dd1354ccb259643b3d9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Nov 2017 16:07:22 +0100 Subject: [PATCH 28/31] Update ortp, mediastreamer2 and linphone submodules. --- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/oRTP | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 28950cd3f..bbf8b49e0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 28950cd3f4419edf984e8fa1229076dbee8a74cf +Subproject commit bbf8b49e03b46a9ad6b1e7f32e6d48b0836aa6e3 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 9268b7723..05fda93c2 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9268b7723cadc4b46641a48c150f448e45418f3e +Subproject commit 05fda93c22f364f3e88b29138aefd73bc44087c9 diff --git a/submodules/oRTP b/submodules/oRTP index 37ee5af65..3319a460d 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 37ee5af65daf9b34c0dcd2badccb16d5e3d7c668 +Subproject commit 3319a460d5f55b343899c091cb15c395a4f3fea4 From 775ea9d74177b9e440d8ed28b8a26685283f65a5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 21 Nov 2017 11:18:50 +0100 Subject: [PATCH 29/31] Update cmake-builder submodule. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index cc58ec55f..a063b3751 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit cc58ec55f47e094c187097d55b77829d665dc4d3 +Subproject commit a063b3751e259f217191f72c960af102a867cd39 From bc3403ac8db7006a08a8109cbd0b7d5230761ce5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 21 Nov 2017 12:10:50 +0100 Subject: [PATCH 30/31] Fixed address bar background color not being the same behind address and erase button --- res/layout/dialer.xml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml index 0ac31123c..cb3409994 100644 --- a/res/layout/dialer.xml +++ b/res/layout/dialer.xml @@ -1,6 +1,7 @@ @@ -17,25 +18,26 @@ - + Date: Tue, 21 Nov 2017 14:39:31 +0100 Subject: [PATCH 31/31] fix dtmf player --- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index bbf8b49e0..d17635390 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bbf8b49e03b46a9ad6b1e7f32e6d48b0836aa6e3 +Subproject commit d1763539033ef552a491c227e03df2e6af5ba607 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 05fda93c2..f82450663 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 05fda93c22f364f3e88b29138aefd73bc44087c9 +Subproject commit f82450663f3d89aa6aa4dc4bae7d060b3a5be495