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-30 16:48:48 +02:00
parent 6a6cd2c519
commit df49bc736f
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,8 +249,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
progress.dismiss(); progress.dismiss();
progress = null; progress = null;
LinphoneManager.getLc().reloadMsPlugins(null); LinphoneManager.getLc().reloadMsPlugins(null);
if (ohcodec.getUserDataSize() > box if (ohcodec.getUserDataSize() > box && ohcodec.getUserData(box) != null)
&& ohcodec.getUserData(box) != null)
((CheckBoxPreference)ohcodec.getUserData(box)).setSummary(mCodecDownloader.getLicenseMessage()); ((CheckBoxPreference)ohcodec.getUserData(box)).setSummary(mCodecDownloader.getLicenseMessage());
} }
} }
@ -259,7 +258,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
@Override @Override
public void OnError (final String error){ public void OnError (final String error){
if (progress == null) return;
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {

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

@ -242,7 +242,11 @@ private static AssistantActivity instance;
if (requestCode == PERMISSIONS_REQUEST_RECORD_AUDIO) { if (requestCode == PERMISSIONS_REQUEST_RECORD_AUDIO) {
if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) == PackageManager.PERMISSION_GRANTED) { if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) == PackageManager.PERMISSION_GRANTED) {
launchEchoCancellerCalibration(true); launchEchoCancellerCalibration(true);
} else {
isEchoCalibrationFinished();
} }
} else {
isEchoCalibrationFinished();
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 171ada8a3215767b94f419a5445e02a6144d079a Subproject commit 9c5174e0bbce4afb955589d4a0bb63bbacf3d873