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

Update linphone

Browse source
This commit is contained in:
Erwan Croze 2016-06-21 14:32:12 +02:00
parent 3f6e93a37d
commit ff0ad63b01
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -291,7 +291,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void startDownload(Context context, Object obj) { public void startDownload(Context context, Object obj) {
box = (CheckBoxPreference)obj; box = (CheckBoxPreference)obj;
ctxt = context; ctxt = context;
this.setFileDirection(ctxt.getFilesDir().toString());
askPopUp(); askPopUp();
} }

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

@ -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.setSummary(CodecDownloader.getLicenseMessage());
codec.setChecked(lc.isPayloadTypeEnabled(pt)); codec.setChecked(lc.isPayloadTypeEnabled(pt));
@ -582,7 +582,7 @@ public class SettingsFragment extends PreferencesListFragment {
boolean enable = (Boolean) newValue; boolean enable = (Boolean) newValue;
try { try {
if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") 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.getInstance().getCodecDownloader().startDownload(ctxt, codec);
} }
LinphoneManager.getLcIfManagerNotDestroyedOrNull().enablePayloadType(pt, enable); LinphoneManager.getLcIfManagerNotDestroyedOrNull().enablePayloadType(pt, enable);

3
src/org/linphone/assistant/WelcomeFragment.java
View file

@ -42,8 +42,9 @@ public class WelcomeFragment extends Fragment implements OnClickListener {
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.assistant_welcome, container, false); 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") 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); LinphoneManager.getInstance().getCodecDownloader().startDownload(getContext(), null);
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 031a83953bfa302e3035b5b8d99491578ad0e258 Subproject commit c4d988bba2eeac1cb5253d3210a831cbe10120c0