From 91fc847fd3168be7aa6bc37fe37212cd3e30ba65 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Thu, 5 Apr 2018 16:20:10 +0200
Subject: [PATCH 01/16] Implementing qrcode to linphone android

---
 .gitmodules                                   | 3 +++
 build.gradle                                  | 2 +-
 src/android/org/linphone/LinphoneManager.java | 7 ++++++-
 submodules/bctoolbox                          | 2 +-
 submodules/cmake-builder                      | 2 +-
 submodules/externals/zxing-cpp                | 1 +
 submodules/linphone                           | 2 +-
 submodules/mediastreamer2                     | 2 +-
 submodules/oRTP                               | 2 +-
 9 files changed, 16 insertions(+), 7 deletions(-)
 create mode 160000 submodules/externals/zxing-cpp

diff --git a/.gitmodules b/.gitmodules
index 2328eab8c..944c1c75a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -117,3 +117,6 @@
 [submodule "submodules/externals/soci"]
 	path = submodules/externals/soci
 	url = git://git.linphone.org/soci
+[submodule "submodules/externals/zxing-cpp"]
+	path = submodules/externals/zxing-cpp
+	url = git://git.linphone.org/zxing-cpp.git
diff --git a/build.gradle b/build.gradle
index 8df9233cc..4f8b9f066 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ dependencies {
         compile 'com.google.firebase:firebase-messaging:11.+'
     } else {
         compile fileTree(include: 'gcm.jar', dir: 'libs')
-        compile 'com.android.support:support-v4:+'
+        compile 'com.android.support:support-v4:26.0.1'
     }
 }
 
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 5e8a901e0..e72e36b87 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -376,7 +376,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 	public void changeStatusToOnThePhone() {
 		Core lc = getLcIfManagerNotDestroyedOrNull();
 		if (lc == null) return;
-		
+
 		if (isInstanciated() && isPresenceModelActivitySet() && lc.getPresenceModel().getActivity().getType() != PresenceActivity.Type.OnThePhone) {
 			lc.getPresenceModel().getActivity().setType(PresenceActivity.Type.OnThePhone);
 		} else if (isInstanciated() && !isPresenceModelActivitySet()) {
@@ -1301,6 +1301,11 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 
 	}
 
+	@Override
+	public void onQrcodeFounded(Core lc, String result) {
+		
+	}
+
 	public void onCallEncryptionChanged(Core lc, Call call,
 			boolean encrypted, String authenticationToken) {
 	}
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 312f1e41b..e9473d2e5 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 312f1e41b217b1cb69bcad193046b01774be5341
+Subproject commit e9473d2e5772c9ad1aea83c504b9c6aa9a92bc67
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 4232e757c..d389b30b6 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 4232e757cc9ede121b6f35bc4da149d8aaa14e0f
+Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc
diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp
new file mode 160000
index 000000000..9d5bfe077
--- /dev/null
+++ b/submodules/externals/zxing-cpp
@@ -0,0 +1 @@
+Subproject commit 9d5bfe077dc53968ea1a4b386be7a2af14121aa0
diff --git a/submodules/linphone b/submodules/linphone
index cd08c6e2f..f985c8a7c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cd08c6e2fee6c99ead64dde6783337714c5aedc8
+Subproject commit f985c8a7c3b84df3de6bb557c8fe0eabcb56ab05
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index f49b3d5ea..9c69731ad 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765
+Subproject commit 9c69731add9f4d9fa9642ac6b163d610d48bcae8
diff --git a/submodules/oRTP b/submodules/oRTP
index 996a3d651..1fcd6fd15 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit 996a3d651288e7976581c1b77e2a439c3cfb255d
+Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b

From 14e16907c5ca1a9ec4b282feb517d1f0e5184aeb Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 10 Apr 2018 10:09:39 +0200
Subject: [PATCH 02/16] First try to implement Qrcode view on assistant

---
 res/layout/assistant_remote_provisioning.xml  |  13 +++
 res/layout/qrcode.xml                         |  15 +++
 res/layout/video.xml                          |  32 ++---
 res/values/strings.xml                        |   1 +
 src/android/org/linphone/LinphoneManager.java |   4 +-
 .../linphone/assistant/AssistantActivity.java |  52 +++++++--
 .../assistant/AssistantFragmentsEnum.java     |   3 +-
 .../linphone/assistant/QrcodeFragment.java    | 110 ++++++++++++++++++
 .../assistant/RemoteProvisioningFragment.java |   6 +-
 submodules/linphone                           |   2 +-
 submodules/mediastreamer2                     |   2 +-
 11 files changed, 211 insertions(+), 29 deletions(-)
 create mode 100644 res/layout/qrcode.xml
 create mode 100644 src/android/org/linphone/assistant/QrcodeFragment.java

diff --git a/res/layout/assistant_remote_provisioning.xml b/res/layout/assistant_remote_provisioning.xml
index c81a66f15..000bd4f53 100644
--- a/res/layout/assistant_remote_provisioning.xml
+++ b/res/layout/assistant_remote_provisioning.xml
@@ -59,5 +59,18 @@
 			android:paddingRight="10dp"
 			android:layout_marginTop="20dp"/>
 
+		<Button
+			android:id="@+id/assistant_qrcode"
+			android:text="@string/assistant_launch_qrcode"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_width="wrap_content"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"/>
+
 	</LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/qrcode.xml b/res/layout/qrcode.xml
new file mode 100644
index 000000000..d2e51fef2
--- /dev/null
+++ b/res/layout/qrcode.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/qrcode_frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+
+    <org.linphone.mediastream.video.display.GL2JNIView
+        android:id="@+id/qrcodeCaptureSurface"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/video.xml b/res/layout/video.xml
index 86b7465e8..0180f70b4 100644
--- a/res/layout/video.xml
+++ b/res/layout/video.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <org.linphone.mediastream.video.display.GL2JNIView 
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
+				android:id="@+id/video_frame"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent">
+
+<org.linphone.mediastream.video.display.GL2JNIView
+	android:visibility="visible"
+	android:layout_height="match_parent"
+	android:layout_width="match_parent"
+	android:id="@+id/videoSurface" />
+
+<SurfaceView
+	android:id="@+id/videoCaptureSurface"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_alignParentBottom="true"
+	android:layout_alignParentRight="true" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ec07acec..5a422e2f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -84,6 +84,7 @@
     <string name="assistant_generic_account">Use SIP account</string>
     <string name="assistant_remote_provisioning_title">Fetch remote configuration</string>
     <string name="assistant_fetch_apply">Fetch and apply</string>
+    <string name="assistant_launch_qrcode">QRCode</string>
     <string name="assistant_login">Login</string>
     <string name="assistant_ec_calibration">Echo canceler calibration in progress</string>
     <string name="assistant_remote_provisioning_login">Enter your login</string>
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index e72e36b87..59138e3bc 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1302,8 +1302,8 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 	}
 
 	@Override
-	public void onQrcodeFounded(Core lc, String result) {
-		
+	public void onQrcodeFound(Core lc, String result) {
+
 	}
 
 	public void onCallEncryptionChanged(Core lc, Call call,
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index 409c7f3d6..ac20daf3f 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -100,6 +100,8 @@ private static AssistantActivity instance;
 	private boolean remoteProvisioningInProgress;
 	private boolean echoCancellerAlreadyDone;
 	private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
+	private static final int PERMISSIONS_REQUEST_CAMERA = 202;
+	private static final int PERMISSIONS_ENABLED_CAMERA = 203;
 	private AccountCreator mAccountCreator;
 	private CountryListAdapter countryListAdapter;
 
@@ -190,6 +192,16 @@ private static AssistantActivity instance;
 					}
 				}
         	}
+
+	        @Override
+	        public void onQrcodeFound(Core lc, String result) {
+		        AlertDialog.Builder builder = new AlertDialog.Builder(AssistantActivity.instance());
+		        builder.setMessage("QRCODE found: " + result);
+		        builder.setCancelable(false);
+		        builder.setNeutralButton(getString(R.string.ok), null);
+		        builder.show();
+	        }
+
         };
         instance = this;
 	}
@@ -308,6 +320,8 @@ private static AssistantActivity instance;
 			} else {
 				displayCreateAccount();
 			}
+		} else if (currentFragment == AssistantFragmentsEnum.QRCODE_READER) {
+			displayRemoteProvisioning();
 		}
 	}
 
@@ -323,6 +337,10 @@ private static AssistantActivity instance;
 		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, 0);
 	}
 
+	public void checkAndRequestVideoPermission() {
+		checkAndRequestPermission(Manifest.permission.CAMERA, 0);
+	}
+
 	public void checkAndRequestPermission(String permission, int result) {
 		int permissionGranted = getPackageManager().checkPermission(permission, getPackageName());
 		Log.i("[Permission] " + permission + " is " + (permissionGranted == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
@@ -336,17 +354,30 @@ private static AssistantActivity instance;
 	}
 
 	@Override
-	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, final int[] grantResults) {
 		for (int i = 0; i < permissions.length; i++) {
 			Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
 		}
 
-		if (requestCode == PERMISSIONS_REQUEST_RECORD_AUDIO) {
-			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-				launchEchoCancellerCalibration(true);
-			} else {
-				isEchoCalibrationFinished();
-			}
+		switch (requestCode) {
+			case PERMISSIONS_REQUEST_CAMERA:
+
+				break;
+			case PERMISSIONS_ENABLED_CAMERA:
+
+				break;
+			case PERMISSIONS_REQUEST_RECORD_AUDIO:
+				LinphoneUtils.dispatchOnUIThread(new Runnable() {
+					@Override
+					public void run() {
+						if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+							launchEchoCancellerCalibration(true);
+						} else {
+							isEchoCalibrationFinished();
+						}
+					}
+				});
+				break;
 		}
 	}
 
@@ -491,6 +522,13 @@ private static AssistantActivity instance;
 		back.setVisibility(View.VISIBLE);
 	}
 
+	public void displayQRCodeReader() {
+		fragment = new QrcodeFragment();
+		changeFragment(fragment);
+		currentFragment = AssistantFragmentsEnum.QRCODE_READER;
+		back.setVisibility(View.VISIBLE);
+	}
+
 	public void displayCountryChooser() {
 		fragment = new CountryListFragment();
 		changeFragment(fragment);
diff --git a/src/android/org/linphone/assistant/AssistantFragmentsEnum.java b/src/android/org/linphone/assistant/AssistantFragmentsEnum.java
index 52fcdd38a..eb9f6c8d3 100644
--- a/src/android/org/linphone/assistant/AssistantFragmentsEnum.java
+++ b/src/android/org/linphone/assistant/AssistantFragmentsEnum.java
@@ -28,5 +28,6 @@ public enum AssistantFragmentsEnum {
 	LOGIN,
 	REMOTE_PROVISIONING,
 	ECHO_CANCELLER_CALIBRATION,
-	DOWNLOAD_CODEC;
+	DOWNLOAD_CODEC,
+	QRCODE_READER
 }
diff --git a/src/android/org/linphone/assistant/QrcodeFragment.java b/src/android/org/linphone/assistant/QrcodeFragment.java
new file mode 100644
index 000000000..5fdad540d
--- /dev/null
+++ b/src/android/org/linphone/assistant/QrcodeFragment.java
@@ -0,0 +1,110 @@
+package org.linphone.assistant;
+
+/*
+QrcodeFragment.java
+Copyright (C) 2018  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+import org.linphone.LinphoneManager;
+import org.linphone.R;
+import org.linphone.mediastream.video.AndroidVideoWindowImpl;
+import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
+
+public class QrcodeFragment extends Fragment {
+	private SurfaceView mQrcodeView;
+	private AndroidVideoWindowImpl androidVideoWindowImpl;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState) {
+		View view = inflater.inflate(R.layout.qrcode, container, false);
+
+		mQrcodeView = (SurfaceView) view.findViewById(R.id.qrcodeCaptureSurface);
+
+		return view;
+	}
+
+	private void enableQrcodeReader(boolean enable) {
+		//LinphoneManager.getLc().enableQrcodeVideoPreview(enable);
+		LinphoneManager.getLc().enableVideoPreview(enable);
+	}
+
+	private void setBackCamera(boolean useBackCamera) {
+		int camId = 0;
+		AndroidCameraConfiguration.AndroidCamera[] cameras = AndroidCameraConfiguration.retrieveCameras();
+		for (AndroidCameraConfiguration.AndroidCamera androidCamera : cameras) {
+			if (androidCamera.frontFacing == !useBackCamera)
+				camId = androidCamera.id;
+		}
+		String[] devices = LinphoneManager.getLc().getVideoDevicesList();
+		String newDevice = devices[camId];
+		LinphoneManager.getLc().setVideoDevice(newDevice);
+	}
+
+	private void launchQrcodeReader() {
+		setBackCamera(true);
+
+		androidVideoWindowImpl = new AndroidVideoWindowImpl(null, mQrcodeView, new AndroidVideoWindowImpl.VideoWindowListener() {
+			public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
+
+			}
+
+			public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) {
+
+			}
+
+			public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
+				mQrcodeView = surface;
+				LinphoneManager.getLc().setNativePreviewWindowId(vw);
+			}
+
+			public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
+
+			}
+		});
+
+		enableQrcodeReader(true);
+		LinphoneManager.getLc().setQrcodeDecodeRect(500,220,280,280);
+	}
+
+	@Override
+	public void onStart() {
+		AssistantActivity.instance().checkAndRequestVideoPermission();
+		super.onStart();
+	}
+
+	@Override
+	public void onResume() {
+		launchQrcodeReader();
+		super.onResume();
+	}
+
+	@Override
+	public void onPause() {
+		LinphoneManager.getLc().setNativePreviewWindowId(null);
+		androidVideoWindowImpl.release();
+		enableQrcodeReader(false);
+		setBackCamera(false);
+		super.onPause();
+	}
+}
diff --git a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
index c02587003..17ddfec54 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -36,7 +36,7 @@ import android.widget.EditText;
 
 public class RemoteProvisioningFragment extends Fragment implements OnClickListener, TextWatcher{
 	private EditText remoteProvisioningUrl;
-	private Button apply;
+	private Button apply, qrcode;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -45,6 +45,8 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 
 		remoteProvisioningUrl = (EditText) view.findViewById(R.id.assistant_remote_provisioning_url);
 		remoteProvisioningUrl.addTextChangedListener(this);
+		qrcode = (Button) view.findViewById(R.id.assistant_qrcode);
+		qrcode.setOnClickListener(this);
 		apply = (Button) view.findViewById(R.id.assistant_apply);
 		apply.setEnabled(false);
 		apply.setOnClickListener(this);
@@ -62,6 +64,8 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 			LinphonePreferences.instance().setRemoteProvisioningUrl(url);
 			LinphoneManager.getInstance().restartCore();
 			AssistantActivity.instance().setCoreListener();
+		} else if (id == R.id.assistant_qrcode) {
+			AssistantActivity.instance().displayQRCodeReader();
 		}
 	}
 
diff --git a/submodules/linphone b/submodules/linphone
index f985c8a7c..451f75275 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f985c8a7c3b84df3de6bb557c8fe0eabcb56ab05
+Subproject commit 451f75275ccb37866f4808c79c62c5f360980d17
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 9c69731ad..a46973154 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9c69731add9f4d9fa9642ac6b163d610d48bcae8
+Subproject commit a46973154acaab7ea7aca926e382acff4445bb17

From 93b2aec9b5beed6d39231787c5fe8aa1e8ae4cb6 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Sun, 15 Apr 2018 17:32:07 +0200
Subject: [PATCH 03/16] Fixing android tester

---
 liblinphone_tester/res/raw/cpim_grammar         | Bin 0 -> 5239 bytes
 liblinphone_tester/res/raw/vcard_grammar        | Bin 0 -> 18454 bytes
 .../src/org/linphone/tester/SuitesActivity.java |   7 +++++++
 .../src/org/linphone/tester/Tester.java         |   3 +++
 prepare.py                                      |   1 +
 5 files changed, 11 insertions(+)
 create mode 100644 liblinphone_tester/res/raw/cpim_grammar
 create mode 100644 liblinphone_tester/res/raw/vcard_grammar

diff --git a/liblinphone_tester/res/raw/cpim_grammar b/liblinphone_tester/res/raw/cpim_grammar
new file mode 100644
index 0000000000000000000000000000000000000000..6f8b36d954a126b6509342fa2bd3096c72aa2c24
GIT binary patch
literal 5239
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
R=j7>vx^ZUVA2s+<^grM`!EgWo

literal 0
HcmV?d00001

diff --git a/liblinphone_tester/res/raw/vcard_grammar b/liblinphone_tester/res/raw/vcard_grammar
new file mode 100644
index 0000000000000000000000000000000000000000..48ceb8e37075aff072b445bf6973ec1f3eb78fec
GIT binary patch
literal 18454
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
CB^qh~

literal 0
HcmV?d00001

diff --git a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
index dd1ca2224..678893a9c 100644
--- a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
+++ b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java
@@ -2,6 +2,7 @@ package org.linphone.tester;
 
 import android.os.Bundle;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.view.Gravity;
 import android.view.Menu;
@@ -19,6 +20,7 @@ public class SuitesActivity extends Activity {
 		if (extras != null) {
 			mSuite = extras.getString("suite");
 		    if(mSuite != null) {
+			    Tester.setApplicationContext(getBaseContext());
 		    	this.setTitle(this.getResources().getString(R.string.app_name) + " | " + mSuite);
 				TesterList suitesTest = new TesterList();
 				suitesTest.run(new String[]{"tester", "--list-tests", mSuite});
@@ -59,6 +61,11 @@ public class SuitesActivity extends Activity {
 	}
 
 
+	@Override
+	public void onDestroy() {
+		Tester.removeApplicationContext();
+		super.onDestroy();
+	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 603036e95..8c3827a7b 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -6,6 +6,7 @@ import org.linphone.core.Factory;
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
+import android.content.Context;
 
 public class Tester {
 	public static String TAG = "liblinphone-tester";
@@ -49,6 +50,8 @@ public class Tester {
 		}
 	}
 
+	public static native void setApplicationContext(Context ct);
+	public static native void removeApplicationContext();
 	public native int run(String args[]);
 	public static native void keepAccounts(boolean keep);
 	public static native void clearAccounts();
diff --git a/prepare.py b/prepare.py
index 331bd6909..eaef9a101 100755
--- a/prepare.py
+++ b/prepare.py
@@ -241,6 +241,7 @@ 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 clean
 \t./gradlew -b liblinphone_tester/build.gradle assembleDebug
 \t./gradlew -b liblinphone_tester/build.gradle installDebug
 

From 1e1db71a00a6374e9c847e1fd6ba840b13af10d5 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Sun, 15 Apr 2018 17:32:59 +0200
Subject: [PATCH 04/16] Some fix for qrcode, but this is crash in zxing lib

---
 res/layout/qrcode.xml                         |  5 +--
 .../linphone/assistant/AssistantActivity.java | 34 +++++++++++++------
 .../linphone/assistant/QrcodeFragment.java    | 30 ++++++++++++----
 .../assistant/RemoteProvisioningFragment.java |  2 ++
 submodules/linphone                           |  2 +-
 submodules/mediastreamer2                     |  2 +-
 6 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/res/layout/qrcode.xml b/res/layout/qrcode.xml
index d2e51fef2..f92359c03 100644
--- a/res/layout/qrcode.xml
+++ b/res/layout/qrcode.xml
@@ -2,10 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/qrcode_frame"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:screenOrientation="portrait" >
 
 
-    <org.linphone.mediastream.video.display.GL2JNIView
+    <SurfaceView
         android:id="@+id/qrcodeCaptureSurface"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index ac20daf3f..c2fbeccb6 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -64,6 +64,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -334,11 +335,11 @@ private static AssistantActivity instance;
 	}
 
 	public void checkAndRequestAudioPermission() {
-		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, 0);
+		checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, PERMISSIONS_REQUEST_RECORD_AUDIO);
 	}
 
 	public void checkAndRequestVideoPermission() {
-		checkAndRequestPermission(Manifest.permission.CAMERA, 0);
+		checkAndRequestPermission(Manifest.permission.CAMERA, PERMISSIONS_REQUEST_CAMERA);
 	}
 
 	public void checkAndRequestPermission(String permission, int result) {
@@ -361,10 +362,9 @@ private static AssistantActivity instance;
 
 		switch (requestCode) {
 			case PERMISSIONS_REQUEST_CAMERA:
-
-				break;
-			case PERMISSIONS_ENABLED_CAMERA:
-
+				if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+					displayQRCodeReader();
+				}
 				break;
 			case PERMISSIONS_REQUEST_RECORD_AUDIO:
 				LinphoneUtils.dispatchOnUIThread(new Runnable() {
@@ -523,10 +523,15 @@ private static AssistantActivity instance;
 	}
 
 	public void displayQRCodeReader() {
-		fragment = new QrcodeFragment();
-		changeFragment(fragment);
-		currentFragment = AssistantFragmentsEnum.QRCODE_READER;
-		back.setVisibility(View.VISIBLE);
+		if (getPackageManager().checkPermission(Manifest.permission.CAMERA,
+				getPackageName()) != PackageManager.PERMISSION_GRANTED) {
+			checkAndRequestVideoPermission();
+		} else {
+			fragment = new QrcodeFragment();
+			changeFragment(fragment);
+			currentFragment = AssistantFragmentsEnum.QRCODE_READER;
+			back.setVisibility(View.VISIBLE);
+		}
 	}
 
 	public void displayCountryChooser() {
@@ -804,6 +809,15 @@ private static AssistantActivity instance;
 		return countryListAdapter;
 	}
 
+	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		if (currentFragment == AssistantFragmentsEnum.QRCODE_READER) {
+			this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+		}
+
+	}
+
 	/**
 	 * This class reads a JSON file containing Country-specific phone number description,
 	 * and allows to present them into a ListView
diff --git a/src/android/org/linphone/assistant/QrcodeFragment.java b/src/android/org/linphone/assistant/QrcodeFragment.java
index 5fdad540d..766eb023e 100644
--- a/src/android/org/linphone/assistant/QrcodeFragment.java
+++ b/src/android/org/linphone/assistant/QrcodeFragment.java
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import android.app.Fragment;
+import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.SurfaceView;
@@ -45,7 +46,7 @@ public class QrcodeFragment extends Fragment {
 	}
 
 	private void enableQrcodeReader(boolean enable) {
-		//LinphoneManager.getLc().enableQrcodeVideoPreview(enable);
+		LinphoneManager.getLc().enableQrcodeVideoPreview(enable);
 		LinphoneManager.getLc().enableVideoPreview(enable);
 	}
 
@@ -74,8 +75,7 @@ public class QrcodeFragment extends Fragment {
 			}
 
 			public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
-				mQrcodeView = surface;
-				LinphoneManager.getLc().setNativePreviewWindowId(vw);
+				LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
 			}
 
 			public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
@@ -84,27 +84,43 @@ public class QrcodeFragment extends Fragment {
 		});
 
 		enableQrcodeReader(true);
-		LinphoneManager.getLc().setQrcodeDecodeRect(500,220,280,280);
+		//LinphoneManager.getLc().setQrcodeDecodeRect(500,220,280,280);
 	}
 
 	@Override
 	public void onStart() {
-		AssistantActivity.instance().checkAndRequestVideoPermission();
 		super.onStart();
 	}
 
 	@Override
 	public void onResume() {
 		launchQrcodeReader();
+		if (androidVideoWindowImpl != null) {
+			synchronized (androidVideoWindowImpl) {
+				LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
+			}
+		}
 		super.onResume();
 	}
 
 	@Override
 	public void onPause() {
-		LinphoneManager.getLc().setNativePreviewWindowId(null);
-		androidVideoWindowImpl.release();
+		if (androidVideoWindowImpl != null) {
+			synchronized (androidVideoWindowImpl) {
+				LinphoneManager.getLc().setNativePreviewWindowId(null);
+			}
+		}
 		enableQrcodeReader(false);
 		setBackCamera(false);
 		super.onPause();
 	}
+
+	@Override
+	public void onDestroy() {
+		if (androidVideoWindowImpl != null) {
+			androidVideoWindowImpl.release();
+			androidVideoWindowImpl = null;
+		}
+		super.onDestroy();
+	}
 }
diff --git a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
index 17ddfec54..db8288155 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -21,9 +21,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
+import org.linphone.Manifest;
 import org.linphone.R;
 
 import android.app.Fragment;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
diff --git a/submodules/linphone b/submodules/linphone
index 451f75275..6638137dc 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 451f75275ccb37866f4808c79c62c5f360980d17
+Subproject commit 6638137dcb941ad2ae51cf9bd36c6407075dc0d5
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index a46973154..bf220563f 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit a46973154acaab7ea7aca926e382acff4445bb17
+Subproject commit bf220563fef1d18fb6a0bd3c388951dede6ecf07

From 8ff76c100d430d2669bfdcb9f8a947008fcadd41 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 16 May 2018 10:58:52 +0200
Subject: [PATCH 05/16] Read qrcode from assitant

---
 .../linphone/assistant/AssistantActivity.java | 17 +++++-----------
 .../linphone/assistant/QrcodeFragment.java    | 20 +++++++++++++++++--
 .../assistant/RemoteProvisioningFragment.java |  4 ++++
 .../linphone/assistant/WelcomeFragment.java   |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java
index c2fbeccb6..5ea955f1d 100644
--- a/src/android/org/linphone/assistant/AssistantActivity.java
+++ b/src/android/org/linphone/assistant/AssistantActivity.java
@@ -193,16 +193,6 @@ private static AssistantActivity instance;
 					}
 				}
         	}
-
-	        @Override
-	        public void onQrcodeFound(Core lc, String result) {
-		        AlertDialog.Builder builder = new AlertDialog.Builder(AssistantActivity.instance());
-		        builder.setMessage("QRCODE found: " + result);
-		        builder.setCancelable(false);
-		        builder.setNeutralButton(getString(R.string.ok), null);
-		        builder.show();
-	        }
-
         };
         instance = this;
 	}
@@ -322,7 +312,7 @@ private static AssistantActivity instance;
 				displayCreateAccount();
 			}
 		} else if (currentFragment == AssistantFragmentsEnum.QRCODE_READER) {
-			displayRemoteProvisioning();
+			displayRemoteProvisioning("");
 		}
 	}
 
@@ -515,8 +505,11 @@ private static AssistantActivity instance;
 		back.setVisibility(View.VISIBLE);
 	}
 
-	public void displayRemoteProvisioning() {
+	public void displayRemoteProvisioning(String url) {
 		fragment = new RemoteProvisioningFragment();
+		Bundle extra = new Bundle();
+		extra.putString("RemoteUrl", url);
+		fragment.setArguments(extra);
 		changeFragment(fragment);
 		currentFragment = AssistantFragmentsEnum.REMOTE_PROVISIONING;
 		back.setVisibility(View.VISIBLE);
diff --git a/src/android/org/linphone/assistant/QrcodeFragment.java b/src/android/org/linphone/assistant/QrcodeFragment.java
index 766eb023e..140287d05 100644
--- a/src/android/org/linphone/assistant/QrcodeFragment.java
+++ b/src/android/org/linphone/assistant/QrcodeFragment.java
@@ -20,19 +20,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import android.app.Fragment;
-import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
+
 import org.linphone.LinphoneManager;
 import org.linphone.R;
+import org.linphone.core.Core;
+import org.linphone.core.CoreListenerStub;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
 public class QrcodeFragment extends Fragment {
 	private SurfaceView mQrcodeView;
+	private CoreListenerStub mListener;
 	private AndroidVideoWindowImpl androidVideoWindowImpl;
 
 	@Override
@@ -42,12 +45,26 @@ public class QrcodeFragment extends Fragment {
 
 		mQrcodeView = (SurfaceView) view.findViewById(R.id.qrcodeCaptureSurface);
 
+		mListener = new CoreListenerStub() {
+			@Override
+			public void onQrcodeFound(Core lc, String result) {
+				enableQrcodeReader(false);
+				AssistantActivity.instance().displayRemoteProvisioning(result);
+			}
+
+		};
+
 		return view;
 	}
 
 	private void enableQrcodeReader(boolean enable) {
 		LinphoneManager.getLc().enableQrcodeVideoPreview(enable);
 		LinphoneManager.getLc().enableVideoPreview(enable);
+		if (enable) {
+			LinphoneManager.getLc().addListener(mListener);
+		} else {
+			LinphoneManager.getLc().removeListener(mListener);
+		}
 	}
 
 	private void setBackCamera(boolean useBackCamera) {
@@ -84,7 +101,6 @@ public class QrcodeFragment extends Fragment {
 		});
 
 		enableQrcodeReader(true);
-		//LinphoneManager.getLc().setQrcodeDecodeRect(500,220,280,280);
 	}
 
 	@Override
diff --git a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
index db8288155..9f8e012ef 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -53,6 +53,10 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 		apply.setEnabled(false);
 		apply.setOnClickListener(this);
 
+		if (!getArguments().getString("RemoteUrl").isEmpty()) {
+			remoteProvisioningUrl.setText(getArguments().getString("RemoteUrl"));
+		}
+
 		return view;
 	}
 
diff --git a/src/android/org/linphone/assistant/WelcomeFragment.java b/src/android/org/linphone/assistant/WelcomeFragment.java
index 2dc7ca5cc..d95598285 100644
--- a/src/android/org/linphone/assistant/WelcomeFragment.java
+++ b/src/android/org/linphone/assistant/WelcomeFragment.java
@@ -72,7 +72,7 @@ public class WelcomeFragment extends Fragment implements OnClickListener {
 		} else if (id == R.id.create_account) {
 			AssistantActivity.instance().displayCreateAccount();
 		} else if (id == R.id.remote_provisioning) {
-			AssistantActivity.instance().displayRemoteProvisioning();
+			AssistantActivity.instance().displayRemoteProvisioning("");
 		}
 	}
 }

From 13d8b47a2eafc1060e439633a38a02a8ee56a4e6 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 16 May 2018 10:59:40 +0200
Subject: [PATCH 06/16] Update submodules

---
 submodules/linphone       | 2 +-
 submodules/mediastreamer2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/linphone b/submodules/linphone
index 6638137dc..3d7e53022 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 6638137dcb941ad2ae51cf9bd36c6407075dc0d5
+Subproject commit 3d7e530222c9ff128f3db96108da6320987b17bf
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index bf220563f..1149d4bef 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit bf220563fef1d18fb6a0bd3c388951dede6ecf07
+Subproject commit 1149d4befcdd8a0f16b90a336d683a27081c59c0

From 54df44fe0c5ba6bfeb0b9eff415e0f0dd1e8cdde Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 18 May 2018 14:52:17 +0200
Subject: [PATCH 07/16] Fixing remote provisioning

---
 .../linphone/assistant/RemoteProvisioningActivity.java   | 9 ++-------
 .../linphone/assistant/RemoteProvisioningFragment.java   | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/android/org/linphone/assistant/RemoteProvisioningActivity.java b/src/android/org/linphone/assistant/RemoteProvisioningActivity.java
index f7c717065..fb4bbf667 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningActivity.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningActivity.java
@@ -178,13 +178,8 @@ public class RemoteProvisioningActivity extends Activity {
 
 		LinphonePreferences.instance().setContext(this); // Needed, else the next call will crash
 		LinphonePreferences.instance().setRemoteProvisioningUrl(configUri);
-
-		mHandler.postDelayed(new Runnable() {
-			@Override
-			public void run() {
-				LinphoneManager.getInstance().restartCore();
-			}
-		}, 1000);
+		LinphoneManager.getLc().getConfig().sync();
+		LinphoneManager.getInstance().restartCore();
 	}
 
 	private void goToLinphoneActivity() {
diff --git a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
index 9f8e012ef..51c7498c3 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -68,6 +68,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 			String url = remoteProvisioningUrl.getText().toString();
 			AssistantActivity.instance().displayRemoteProvisioningInProgressDialog();
 			LinphonePreferences.instance().setRemoteProvisioningUrl(url);
+			LinphoneManager.getLc().getConfig().sync();
 			LinphoneManager.getInstance().restartCore();
 			AssistantActivity.instance().setCoreListener();
 		} else if (id == R.id.assistant_qrcode) {

From 3f48b865d14c6803706c90c0f0659b20d04552dd Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 21 May 2018 17:17:17 +0200
Subject: [PATCH 08/16] Update submodules

---
 submodules/linphone       | 2 +-
 submodules/mediastreamer2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/linphone b/submodules/linphone
index 64fc28497..b0f5d446a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 64fc28497ffb0cf93ec851f2f2f6cfd72f116c3a
+Subproject commit b0f5d446a1b062736a55e681030049f4f4ce4a33
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 5dc5219af..3dc928852 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5dc5219afe2d6f4d32a91ad6017ffc070eaf4eb6
+Subproject commit 3dc9288523c1108bc3366a462ffb2944da15a2f3

From 99595a3f2f377d4d07690a87406ee0fc3c9237e5 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 27 Jun 2018 10:14:13 +0200
Subject: [PATCH 09/16] Fix useless method

---
 src/android/org/linphone/LinphoneManager.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 94962484d..3a2307f0e 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1775,7 +1775,4 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 			mUnreadChatsPerRoom.put(key, 1);
 		}
 	}
-
-	public void onQrcodeFound(Core lc, String something){
-	}
 }

From 3b8fab797e8e01edeb91916327f18e45fd597c8d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 27 Jun 2018 10:16:26 +0200
Subject: [PATCH 10/16] Update submodule

---
 submodules/belcard        | 2 +-
 submodules/cmake-builder  | 2 +-
 submodules/mediastreamer2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/submodules/belcard b/submodules/belcard
index ab5416d66..b1622d7dd 160000
--- a/submodules/belcard
+++ b/submodules/belcard
@@ -1 +1 @@
-Subproject commit ab5416d66620f32ff6882b6e29dec63203dbca41
+Subproject commit b1622d7ddf1cbe6a0f929537861dfa8b45b293c4
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/mediastreamer2 b/submodules/mediastreamer2
index 54a79f731..1e53888bb 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 54a79f731fea61d345dfff4f8fcb2fc390c2fed7
+Subproject commit 1e53888bb49135c528a0bb32494bfb5ceaddb5f8

From e91beec3eb157ca4f00c4eb761e7bcce0ad2f6ca Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 26 Jul 2018 11:22:34 +0200
Subject: [PATCH 11/16] fix compilation issue

---
 .../org/linphone/assistant/RemoteProvisioningFragment.java      | 1 -
 submodules/externals/openh264                                   | 2 +-
 submodules/linphone                                             | 2 +-
 submodules/mediastreamer2                                       | 2 +-
 submodules/oRTP                                                 | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
index 51c7498c3..b1e1c4231 100644
--- a/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/android/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import org.linphone.LinphoneManager;
 import org.linphone.LinphonePreferences;
-import org.linphone.Manifest;
 import org.linphone.R;
 
 import android.app.Fragment;
diff --git a/submodules/externals/openh264 b/submodules/externals/openh264
index 852d23c72..9e75838c8 160000
--- a/submodules/externals/openh264
+++ b/submodules/externals/openh264
@@ -1 +1 @@
-Subproject commit 852d23c72acd537b75e4b95af93b866925d31bda
+Subproject commit 9e75838c8638c48a32b15c73c9da7b1fe942fd5f
diff --git a/submodules/linphone b/submodules/linphone
index 852166f0a..61e38e370 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 852166f0a30613f6ea26172f00fe2446b7195c99
+Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 52d316934..1e53888bb 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 52d3169349b55b27090ecb81f88d10ebb65fa469
+Subproject commit 1e53888bb49135c528a0bb32494bfb5ceaddb5f8
diff --git a/submodules/oRTP b/submodules/oRTP
index a88be02b9..3afc47570 160000
--- a/submodules/oRTP
+++ b/submodules/oRTP
@@ -1 +1 @@
-Subproject commit a88be02b93e2274ae3fcf80e1e0032adc43c0448
+Subproject commit 3afc47570a1c9f34bd2f1a759ae00fb7ecd26a0e

From 93ed92b94a9468077c8545c2b991f021a2d39843 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 27 Jul 2018 10:26:48 +0200
Subject: [PATCH 12/16] update ms2

---
 AndroidManifest.xml                                    | 2 +-
 src/android/org/linphone/assistant/QrcodeFragment.java | 6 +++---
 submodules/mediastreamer2                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 946406175..0f4e9b3bc 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -52,7 +52,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <!-- Needed for kill application yourself -->
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
-
+    <uses-feature android:name="android.hardware.camera.autofocus" />
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
diff --git a/src/android/org/linphone/assistant/QrcodeFragment.java b/src/android/org/linphone/assistant/QrcodeFragment.java
index 140287d05..a779a39c6 100644
--- a/src/android/org/linphone/assistant/QrcodeFragment.java
+++ b/src/android/org/linphone/assistant/QrcodeFragment.java
@@ -113,7 +113,7 @@ public class QrcodeFragment extends Fragment {
 		launchQrcodeReader();
 		if (androidVideoWindowImpl != null) {
 			synchronized (androidVideoWindowImpl) {
-				LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
+				//LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
 			}
 		}
 		super.onResume();
@@ -123,11 +123,11 @@ public class QrcodeFragment extends Fragment {
 	public void onPause() {
 		if (androidVideoWindowImpl != null) {
 			synchronized (androidVideoWindowImpl) {
-				LinphoneManager.getLc().setNativePreviewWindowId(null);
+				//LinphoneManager.getLc().setNativePreviewWindowId(null);
 			}
 		}
 		enableQrcodeReader(false);
-		setBackCamera(false);
+		//setBackCamera(false);
 		super.onPause();
 	}
 
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 1e53888bb..89e89db48 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1e53888bb49135c528a0bb32494bfb5ceaddb5f8
+Subproject commit 89e89db483137c1bb65d30c2ecd9c1667a43dae1

From bac824a08913252f8f8ab43184de9e5e620b8b50 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 16 Aug 2018 10:12:57 +0200
Subject: [PATCH 13/16] Update bcmatroska2 and cmake-builder submodules.

---
 submodules/bcmatroska2   | 2 +-
 submodules/cmake-builder | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2
index ca4a89930..e8a69bdc3 160000
--- a/submodules/bcmatroska2
+++ b/submodules/bcmatroska2
@@ -1 +1 @@
-Subproject commit ca4a89930dd8db94a60ae4a1dbf44a3710497429
+Subproject commit e8a69bdc3f8828cfd83b0938955132918364b175
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index f58510c8c..25e2442d5 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit f58510c8ce6cd89dadff2b29574d03b05c6efcc9
+Subproject commit 25e2442d536dee89222dbeaa04ceac8f9cc41bfc

From 51eb4db7bdc5c81f1e562f80aa7a1b31d3c37d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Fri, 30 Nov 2018 13:55:04 +0100
Subject: [PATCH 14/16] Replaced surfaceview with textureview

---
 .../linphone/assistant/QrcodeFragment.java    | 44 +++----------------
 app/src/main/res/layout/qrcode.xml            | 11 +++--
 2 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java b/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
index eb6f00731..bde210261 100644
--- a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
+++ b/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
@@ -22,27 +22,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import android.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.SurfaceView;
+import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
 import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
-import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
 public class QrcodeFragment extends Fragment {
-    private SurfaceView mQrcodeView;
+    private TextureView mQrcodeView;
     private CoreListenerStub mListener;
-    private AndroidVideoWindowImpl androidVideoWindowImpl;
 
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.qrcode, container, false);
 
-        mQrcodeView = (SurfaceView) view.findViewById(R.id.qrcodeCaptureSurface);
+        mQrcodeView = view.findViewById(R.id.qrcodeCaptureSurface);
+
+        LinphoneManager.getLc().setNativePreviewWindowId(mQrcodeView);
 
         mListener =
                 new CoreListenerStub() {
@@ -81,26 +81,6 @@ public class QrcodeFragment extends Fragment {
     private void launchQrcodeReader() {
         setBackCamera(true);
 
-        androidVideoWindowImpl =
-                new AndroidVideoWindowImpl(
-                        null,
-                        mQrcodeView,
-                        new AndroidVideoWindowImpl.VideoWindowListener() {
-                            public void onVideoRenderingSurfaceReady(
-                                    AndroidVideoWindowImpl vw, SurfaceView surface) {}
-
-                            public void onVideoRenderingSurfaceDestroyed(
-                                    AndroidVideoWindowImpl vw) {}
-
-                            public void onVideoPreviewSurfaceReady(
-                                    AndroidVideoWindowImpl vw, SurfaceView surface) {
-                                LinphoneManager.getLc()
-                                        .setNativePreviewWindowId(androidVideoWindowImpl);
-                            }
-
-                            public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {}
-                        });
-
         enableQrcodeReader(true);
     }
 
@@ -112,21 +92,11 @@ public class QrcodeFragment extends Fragment {
     @Override
     public void onResume() {
         launchQrcodeReader();
-        if (androidVideoWindowImpl != null) {
-            synchronized (androidVideoWindowImpl) {
-                // LinphoneManager.getLc().setNativePreviewWindowId(androidVideoWindowImpl);
-            }
-        }
         super.onResume();
     }
 
     @Override
     public void onPause() {
-        if (androidVideoWindowImpl != null) {
-            synchronized (androidVideoWindowImpl) {
-                // LinphoneManager.getLc().setNativePreviewWindowId(null);
-            }
-        }
         enableQrcodeReader(false);
         // setBackCamera(false);
         super.onPause();
@@ -134,10 +104,6 @@ public class QrcodeFragment extends Fragment {
 
     @Override
     public void onDestroy() {
-        if (androidVideoWindowImpl != null) {
-            androidVideoWindowImpl.release();
-            androidVideoWindowImpl = null;
-        }
         super.onDestroy();
     }
 }
diff --git a/app/src/main/res/layout/qrcode.xml b/app/src/main/res/layout/qrcode.xml
index f92359c03..77e677f49 100644
--- a/app/src/main/res/layout/qrcode.xml
+++ b/app/src/main/res/layout/qrcode.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/qrcode_frame"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:screenOrientation="portrait" >
+    android:id="@+id/qrcode_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:screenOrientation="portrait" >
 
-
-    <SurfaceView
+    <TextureView
         android:id="@+id/qrcodeCaptureSurface"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

From 0d80852531f8ada82dec74ced4c1a2e57d5dbfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Fri, 30 Nov 2018 16:02:22 +0100
Subject: [PATCH 15/16] Clean code

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../linphone/assistant/AssistantActivity.java | 19 +++++---------
 ...rcodeFragment.java => QrCodeFragment.java} | 14 ++--------
 .../assistant/RemoteProvisioningFragment.java | 26 +++++++++----------
 4 files changed, 21 insertions(+), 39 deletions(-)
 rename app/src/main/java/org/linphone/assistant/{QrcodeFragment.java => QrCodeFragment.java} (93%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06de6c2a3..93c982f89 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,6 @@
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <uses-feature android:name="android.hardware.camera.autofocus" />
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 136ef1346..3a5abd26b 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -87,7 +87,6 @@ public class AssistantActivity extends Activity
                 AccountCreatorListener {
     private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
     private static final int PERMISSIONS_REQUEST_CAMERA = 202;
-    private static final int PERMISSIONS_ENABLED_CAMERA = 203;
     private static AssistantActivity instance;
     public DialPlan country;
     public String phone_number;
@@ -399,17 +398,11 @@ public class AssistantActivity extends Activity
                 }
                 break;
             case PERMISSIONS_REQUEST_RECORD_AUDIO:
-                LinphoneUtils.dispatchOnUIThread(
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                                    launchEchoCancellerCalibration(true);
-                                } else {
-                                    isEchoCalibrationFinished();
-                                }
-                            }
-                        });
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    launchEchoCancellerCalibration(true);
+                } else {
+                    isEchoCalibrationFinished();
+                }
                 break;
         }
     }
@@ -581,7 +574,7 @@ public class AssistantActivity extends Activity
                 != PackageManager.PERMISSION_GRANTED) {
             checkAndRequestVideoPermission();
         } else {
-            fragment = new QrcodeFragment();
+            fragment = new QrCodeFragment();
             changeFragment(fragment);
             currentFragment = AssistantFragmentsEnum.QRCODE_READER;
             back.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java b/app/src/main/java/org/linphone/assistant/QrCodeFragment.java
similarity index 93%
rename from app/src/main/java/org/linphone/assistant/QrcodeFragment.java
rename to app/src/main/java/org/linphone/assistant/QrCodeFragment.java
index bde210261..0862d5e6a 100644
--- a/app/src/main/java/org/linphone/assistant/QrcodeFragment.java
+++ b/app/src/main/java/org/linphone/assistant/QrCodeFragment.java
@@ -1,7 +1,7 @@
 package org.linphone.assistant;
 
 /*
-QrcodeFragment.java
+QrCodeFragment.java
 Copyright (C) 2018  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@ import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
-public class QrcodeFragment extends Fragment {
+public class QrCodeFragment extends Fragment {
     private TextureView mQrcodeView;
     private CoreListenerStub mListener;
 
@@ -84,11 +84,6 @@ public class QrcodeFragment extends Fragment {
         enableQrcodeReader(true);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
     @Override
     public void onResume() {
         launchQrcodeReader();
@@ -101,9 +96,4 @@ public class QrcodeFragment extends Fragment {
         // setBackCamera(false);
         super.onPause();
     }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
 }
diff --git a/app/src/main/java/org/linphone/assistant/RemoteProvisioningFragment.java b/app/src/main/java/org/linphone/assistant/RemoteProvisioningFragment.java
index b7f45fac8..e710ac213 100644
--- a/app/src/main/java/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/app/src/main/java/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -33,24 +33,24 @@ import org.linphone.R;
 import org.linphone.settings.LinphonePreferences;
 
 public class RemoteProvisioningFragment extends Fragment implements OnClickListener, TextWatcher {
-    private EditText remoteProvisioningUrl;
-    private Button apply, qrcode;
+    private EditText mRemoteProvisioningUrl;
+    private Button mApply, mQrcode;
 
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.assistant_remote_provisioning, container, false);
 
-        remoteProvisioningUrl = view.findViewById(R.id.assistant_remote_provisioning_url);
-        remoteProvisioningUrl.addTextChangedListener(this);
-        qrcode = view.findViewById(R.id.assistant_qrcode);
-        qrcode.setOnClickListener(this);
-        apply = view.findViewById(R.id.assistant_apply);
-        apply.setEnabled(false);
-        apply.setOnClickListener(this);
+        mRemoteProvisioningUrl = view.findViewById(R.id.assistant_remote_provisioning_url);
+        mRemoteProvisioningUrl.addTextChangedListener(this);
+        mQrcode = view.findViewById(R.id.assistant_qrcode);
+        mQrcode.setOnClickListener(this);
+        mApply = view.findViewById(R.id.assistant_apply);
+        mApply.setEnabled(false);
+        mApply.setOnClickListener(this);
 
-        if (!getArguments().getString("RemoteUrl").isEmpty()) {
-            remoteProvisioningUrl.setText(getArguments().getString("RemoteUrl"));
+        if (getArguments() != null && !getArguments().getString("RemoteUrl").isEmpty()) {
+            mRemoteProvisioningUrl.setText(getArguments().getString("RemoteUrl"));
         }
 
         return view;
@@ -61,7 +61,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
         int id = v.getId();
 
         if (id == R.id.assistant_apply) {
-            String url = remoteProvisioningUrl.getText().toString();
+            String url = mRemoteProvisioningUrl.getText().toString();
             AssistantActivity.instance().displayRemoteProvisioningInProgressDialog();
             LinphonePreferences.instance().setRemoteProvisioningUrl(url);
             LinphoneManager.getLc().getConfig().sync();
@@ -77,7 +77,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        apply.setEnabled(!remoteProvisioningUrl.getText().toString().isEmpty());
+        mApply.setEnabled(!mRemoteProvisioningUrl.getText().toString().isEmpty());
     }
 
     @Override

From 8c1ea421c4a84f71559b6750aad0cf32d19fb4af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Turnel?=
 <mickael.turnel@belledonne-communications.com>
Date: Fri, 30 Nov 2018 16:07:19 +0100
Subject: [PATCH 16/16] Removed useless files

---
 liblinphone_tester/res/raw/cpim_grammar  | Bin 5239 -> 0 bytes
 liblinphone_tester/res/raw/vcard_grammar | Bin 18454 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 liblinphone_tester/res/raw/cpim_grammar
 delete mode 100644 liblinphone_tester/res/raw/vcard_grammar

diff --git a/liblinphone_tester/res/raw/cpim_grammar b/liblinphone_tester/res/raw/cpim_grammar
deleted file mode 100644
index 6f8b36d954a126b6509342fa2bd3096c72aa2c24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5239
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
R=j7>vx^ZUVA2s+<^grM`!EgWo

diff --git a/liblinphone_tester/res/raw/vcard_grammar b/liblinphone_tester/res/raw/vcard_grammar
deleted file mode 100644
index 48ceb8e37075aff072b445bf6973ec1f3eb78fec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18454
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
CB^qh~