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

Remove setContext of initLiblinphone, it's already did in LinphoneFactory

Browse source
This commit is contained in:
Erwan Croze 2016-11-24 11:43:36 +01:00
parent 0f0441294f
commit a82f9e9218
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/linphone/LinphoneActivity.java
View file

@ -1227,6 +1227,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
@Override @Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
if (permissions.length <= 0)
return;
int readContactsI = -1; int readContactsI = -1;
for (int i = 0; i < permissions.length; i++) { for (int i = 0; i < permissions.length; i++) {
Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied")); Log.i("[Permission] " + permissions[i] + " is " + (grantResults[i] == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));

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

@ -758,7 +758,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mPrefs.echoConfigurationUpdated(); mPrefs.echoConfigurationUpdated();
} }
mLc.setContext(mServiceContext);
mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets"); mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets");
try { try {

2
submodules/linphone

@ -1 +1 @@
Subproject commit c0b32a738f238c0d87e83ec6eda3d6e0de6bbe51 Subproject commit ef792ae0ab9acf2ccc224f06f46e22368b9d7848