From ff0ad63b01bcdd80b606adcf81700535906d642d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 21 Jun 2016 14:32:12 +0200
Subject: [PATCH] Update linphone

---
 src/org/linphone/LinphoneManager.java           | 1 -
 src/org/linphone/SettingsFragment.java          | 4 ++--
 src/org/linphone/assistant/WelcomeFragment.java | 3 ++-
 submodules/linphone                             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index c9db5b3d7..7b4c93429 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -291,7 +291,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			public void startDownload(Context context, Object obj) {
 				box = (CheckBoxPreference)obj;
 				ctxt = context;
-				this.setFileDirection(ctxt.getFilesDir().toString());
 				askPopUp();
 			}
 
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 1a7313764..aa05344c6 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -572,7 +572,7 @@ public class SettingsFragment extends PreferencesListFragment {
 					}
 				}
 			}
-			if (pt.getMime().equals("H264") && CodecDownloader.codecExist(ctxt))
+			if (pt.getMime().equals("H264") && CodecDownloader.codecExist())
 				codec.setSummary(CodecDownloader.getLicenseMessage());
 			codec.setChecked(lc.isPayloadTypeEnabled(pt));
 
@@ -582,7 +582,7 @@ public class SettingsFragment extends PreferencesListFragment {
 					boolean enable = (Boolean) newValue;
 					try {
 						if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
-								&& pt.getMime().equals("H264") && !CodecDownloader.codecExist(ctxt)) {
+								&& pt.getMime().equals("H264") && !CodecDownloader.codecExist()) {
 							LinphoneManager.getInstance().getCodecDownloader().startDownload(ctxt, codec);
 						}
 						LinphoneManager.getLcIfManagerNotDestroyedOrNull().enablePayloadType(pt, enable);
diff --git a/src/org/linphone/assistant/WelcomeFragment.java b/src/org/linphone/assistant/WelcomeFragment.java
index 113df104d..680f7b424 100644
--- a/src/org/linphone/assistant/WelcomeFragment.java
+++ b/src/org/linphone/assistant/WelcomeFragment.java
@@ -42,8 +42,9 @@ public class WelcomeFragment extends Fragment implements OnClickListener {
 			Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.assistant_welcome, container, false);
 
+		LinphoneManager.getInstance().getCodecDownloader().setFileDirection(getContext().getFilesDir().toString());
 		if (LinphonePreferences.instance().isFirstLaunch() && Version.getCpuAbis().contains("armeabi-v7a")
-				&& !Version.getCpuAbis().contains("x86") && !CodecDownloader.codecExist(getContext())) {
+				&& !Version.getCpuAbis().contains("x86") && !CodecDownloader.codecExist()) {
 			LinphoneManager.getInstance().getCodecDownloader().startDownload(getContext(), null);
 		}
 
diff --git a/submodules/linphone b/submodules/linphone
index 031a83953..c4d988bba 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 031a83953bfa302e3035b5b8d99491578ad0e258
+Subproject commit c4d988bba2eeac1cb5253d3210a831cbe10120c0