Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fast change for new release without bug

Browse source
This commit is contained in:
Erwan Croze 2017-01-04 17:25:06 +01:00
parent 9f17874676
commit 9db4ba7fc2
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -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

2
src/org/linphone/LinphoneManager.java
View file

@ -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;
}

4
src/org/linphone/SettingsFragment.java
View file

@ -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());

2
src/org/linphone/StatusFragment.java
View file

@ -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";

2
src/org/linphone/assistant/AssistantActivity.java
View file

@ -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();