From 9db4ba7fc2400346d73658a632744495b4661bcb Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 4 Jan 2017 17:25:06 +0100
Subject: [PATCH] Fast change for new release without bug

---
 AndroidManifest.xml                               | 2 +-
 src/org/linphone/LinphoneManager.java             | 2 +-
 src/org/linphone/SettingsFragment.java            | 4 ++--
 src/org/linphone/StatusFragment.java              | 2 +-
 src/org/linphone/assistant/AssistantActivity.java | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c652f6d2b..5236b2fa0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.linphone"
           android:installLocation="auto"
-          android:versionCode="3220"
+          android:versionCode="3221"
           android:versionName="3.2.2">
 
     <uses-sdk
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index dc1e068e1..03f0ca0e3 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -227,7 +227,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void initOpenH264DownloadHelper() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
 			Log.i("Android >= 5.1 we disable the download of OpenH264");
-			getLc().enableDownloadOpenH264(false);
+			getLc().enableOpenH264(false);
 			return;
 		}
 
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 5ef7abf75..2e217eff7 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -691,7 +691,7 @@ public class SettingsFragment extends PreferencesListFragment {
 					}
 				}
 			}
-			if (lc.downloadOpenH264Enabled()) {
+			if (lc.openH264Enabled()) {
 				if (pt.getMime().equals("H264") && mCodecDownloader.isCodecFound()) {
 					codec.setSummary(mCodecDownloader.getLicenseMessage());
 					codec.setTitle("OpenH264");
@@ -704,7 +704,7 @@ public class SettingsFragment extends PreferencesListFragment {
 				public boolean onPreferenceChange(Preference preference, Object newValue) {
 					boolean enable = (Boolean) newValue;
 					try {
-						if (lc.downloadOpenH264Enabled()) {
+						if (lc.openH264Enabled()) {
 							if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
 									&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
 								mCodecDownloader.setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 820571485..f25d2c837 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -457,7 +457,7 @@ public class StatusFragment extends Fragment {
 			title.setVisibility(TextView.VISIBLE);
 			if (media != null) {
 				String mime = media.getMime();
-				if (LinphoneManager.getLc().downloadOpenH264Enabled() &&
+				if (LinphoneManager.getLc().openH264Enabled() &&
 						media.getMime().equals("H264") &&
 						LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) {
 					mime = "OpenH264";
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index ac05faf5a..a77489fcc 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -438,7 +438,7 @@ private static AssistantActivity instance;
 	}
 
 	private void launchDownloadCodec() {
-		if (LinphoneManager.getLc().downloadOpenH264Enabled()) {
+		if (LinphoneManager.getLc().openH264Enabled()) {
 			OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
 			if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
 				CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();