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

fix nullpointer exceptions at startup

Browse source
This commit is contained in:
Simon Morlat 2015-11-03 14:14:29 +01:00 committed by Margaux Clerc
parent 1115eb442e
commit 8c257d5253
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -606,7 +606,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} }
} }
private synchronized void initLiblinphone() throws LinphoneCoreException { private synchronized void initLiblinphone(LinphoneCore lc) throws LinphoneCoreException {
mLc = lc;
boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) && mPrefs.isDebugEnabled(); boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) && mPrefs.isDebugEnabled();
LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name)); LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
LinphoneCoreFactory.instance().enableLogCollection(isDebugLogEnabled); LinphoneCoreFactory.instance().enableLogCollection(isDebugLogEnabled);
@ -880,7 +881,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
Log.i("New global state [",state,"]"); Log.i("New global state [",state,"]");
if (state == GlobalState.GlobalOn){ if (state == GlobalState.GlobalOn){
try { try {
initLiblinphone(); initLiblinphone(lc);
} catch (LinphoneCoreException e) { } catch (LinphoneCoreException e) {
Log.e(e); Log.e(e);
} }