[Switch submodule branch] Merge branch 'master' of gitlab.linphone.org:BC/public/linphone-android into dev_group_chat

AndroidManifest.xml

@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="16"
-        android:targetSdkVersion="26"/>
+        android:targetSdkVersion="27"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>

AndroidManifestSdk.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="org.linphone"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          android:installLocation="auto"
+          android:versionCode="4001"
+          android:versionName="4.0.0">
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="27"/>
+</manifest>

README.md

@@ -1,3 +1,5 @@
+[![pipeline status](https://gitlab.linphone.org/BC/public/linphone-android/badges/master/pipeline.svg)](https://gitlab.linphone.org/BC/public/linphone-android/commits/master)
+
 Linphone is a free VoIP and video softphone based on the SIP protocol.
 
 # COMPILATION INSTRUCTIONS

build.gradle

@@ -47,7 +47,7 @@ dependencies {
     if (firebaseEnable()) {
         implementation 'com.google.firebase:firebase-messaging:15.0.2'
     }
-    implementation 'com.android.support:support-v4:26.0.1'
+    implementation 'com.android.support:support-v4:27.0.1'
     implementation project(':liblinphone-sdk')
 }
 
@@ -79,6 +79,7 @@ excludePackage.add('**/LICENSE.txt')
 android {
     defaultConfig {
         compileSdkVersion 26
+        buildToolsVersion "27.0.3"
         applicationId getPackageName()
         multiDexEnabled true
 
@@ -155,7 +156,7 @@ android {
     packagingOptions {
         pickFirst 'META-INF/NOTICE'
         pickFirst 'META-INF/LICENSE'
-	pickFirst 'META-INF/MANIFEST.MF'
+        exclude 'META-INF/MANIFEST.MF'
     }
 }
 

liblinphone-sdk/build.gradle

@@ -73,7 +73,7 @@ android {
 
     defaultConfig {
         compileSdkVersion 26
-        buildToolsVersion "26.0.0"
+        buildToolsVersion "27.0.3"
         multiDexEnabled true
     }
 

linphoneAndroidSdk.gradle

@@ -26,7 +26,7 @@ allprojects {
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile group: 'org.apache.commons', name: 'commons-compress', version: '+'
+    compile group: 'org.apache.commons', name: 'commons-compress', version: '1.16.1'
     compile 'com.android.support:support-v4:26.0.2'
 }
 
@@ -49,6 +49,7 @@ excludePackage.add('**/LICENSE.txt')
 android {
     defaultConfig {
         compileSdkVersion 26
+        buildToolsVersion "27.0.3"
         multiDexEnabled true
     }
 
@@ -61,7 +62,7 @@ android {
 
     sourceSets {
         main {
-            manifest.srcFile 'AndroidManifestLibrary.xml'
+            manifest.srcFile 'AndroidManifestSdk.xml'
             java.srcDirs = srcDirs
             resources.srcDirs = srcDirs
             aidl.srcDirs = srcDirs

src/android/org/linphone/LinphoneManager.java

@@ -584,7 +584,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 		BluetoothManagerDestroy();
 		try {
 			mTimer.cancel();
-			mLc = null;
+			destroyLinphoneCore();
 		}
 		catch (RuntimeException e) {
 			Log.e(e);
@@ -623,6 +623,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 		}
 	}
 
+
 	public void restartCore() {
 		destroyCore();
 		startLibLinphone(mServiceContext);
@@ -917,51 +918,6 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 		mLc = null;
 	}
 
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
-	private void doDestroy() {
-		ContactsManagerDestroy();
-		BluetoothManagerDestroy();
-		try {
-			mTimer.cancel();
-			destroyLinphoneCore();
-		}
-		catch (RuntimeException e) {
-			Log.e(e);
-		}
-		finally {
-			try {
-				if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-					mServiceContext.unregisterReceiver(mNetworkReceiver);
-				}
-			} catch (Exception e) {
-				Log.e(e);
-			}
-			try {
-				mServiceContext.unregisterReceiver(mHookReceiver);
-			} catch (Exception e) {
-				Log.e(e);
-			}
-			try {
-				mServiceContext.unregisterReceiver(mKeepAliveReceiver);
-			} catch (Exception e) {
-				Log.e(e);
-			}
-			try {
-				mServiceContext.unregisterReceiver(mCallReceiver);
-			} catch (Exception e) {
-				Log.e(e);
-			}
-			try {
-				dozeManager(false);
-			} catch (IllegalArgumentException iae) {
-				Log.e(iae);
-			} catch (Exception e) {
-				Log.e(e);
-			}
-			instance = null;
-		}
-	}
-
 	public void dozeManager(boolean enable) {
 		if (enable) {
 			Log.i("[Doze Mode]: register");
@@ -1045,7 +1001,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 		if (instance == null) return;
 		getInstance().changeStatusToOffline();
 		sExited = true;
-		instance.doDestroy();
+		instance.destroyCore();
 	}
 
 	private String getString(int key) {

src/android/org/linphone/LinphonePreferences.java

@@ -370,6 +370,13 @@ public class LinphonePreferences {
 			prxCfg.setQualityReportingCollector(tempQualityReportingCollector);
 			prxCfg.setQualityReportingInterval(tempQualityReportingInterval);
 
+			String regId = LinphonePreferences.instance().getPushNotificationRegistrationID();
+			String appId = LinphonePreferences.instance().getString(R.string.push_sender_id);
+			if (regId != null && LinphonePreferences.instance().isPushNotificationEnabled()) {
+				String contactInfos = "app-id=" + appId + ";pn-type=" + LinphonePreferences.instance().getString(R.string.push_type) + ";pn-tok=" + regId + ";pn-silent=1";
+				prxCfg.setContactUriParameters(contactInfos);
+			}
+
 			if(tempPrefix != null){
 				prxCfg.setDialPrefix(tempPrefix);
 			}

src/android/org/linphone/LinphoneUtils.java

@@ -609,11 +609,7 @@ public final class LinphoneUtils {
 			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 (split.length >= 1) return Environment.getExternalStorageDirectory() + "/" + split[1];
-
-				if ("primary".equalsIgnoreCase(type)) {
-					return Environment.getExternalStorageDirectory() + "/" + split[1];
-				}
 
 				// TODO handle non-primary volumes
 			}// Docs storage

src/android/org/linphone/firebase/FirebaseMessaging.java

@@ -39,6 +39,7 @@ public class FirebaseMessaging extends FirebaseMessagingService {
         android.util.Log.i("FirebaseMessaging","[Push Notification] Received");
 
         if (!LinphoneService.isReady()) {
+            android.util.Log.i("FirebaseMessaging","[Push Notification] Starting Service");
             startService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
         } else if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0) {
             LinphoneUtils.dispatchOnUIThread(new Runnable(){

submodules/externals/mbedtls

@@ -1 +1 @@
-Subproject commit d9385339a5c2979786cfc844c0527593c14662c5
+Subproject commit 83d21d543c26a31943b2bd08c66b029f2ef742be

submodules/linphone

@@ -1 +1 @@
-Subproject commit b1e084c4c842b6dd5722f418184bf6ec228e5058
+Subproject commit c448d2e0018ca9baa45afe216241fc354cc4edef

submodules/mediastreamer2

@@ -1 +1 @@
-Subproject commit f6e4cc2142821b2c8ac80c644405d9cd42b3216e
+Subproject commit 9add24c2041e1bcf7b51ae580575ef56aa408f3e

test.patch

@@ -1,23 +0,0 @@
-diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 9ee95b62..bb763a24 100755
---- a/AndroidManifest.xml
-+++ b/AndroidManifest.xml
-@@ -287,15 +287,15 @@
-             </intent-filter>
-         </service>
- 
--        <provider
-+        <!--<provider
-             android:name="android.support.v4.content.FileProvider"
--            android:authorities="org.linphone.provider"
-+            android:authorities="org.linphone.provider${linphone_app_id}"
-             android:exported="false"
-             android:grantUriPermissions="true">
-             <meta-data
-                 android:name="android.support.FILE_PROVIDER_PATHS"
-                 android:resource="@xml/provider_paths"/>
--        </provider>
-+        </provider>-->
- 
-         <activity
-             android:name=".tutorials.TutorialLauncherActivity"