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

Prevent some crashes

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-28 10:58:58 +01:00
parent 83635ffc45
commit b212ad4ce1
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/org/linphone/IncomingCallActivity.java
View file

@ -88,12 +88,15 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
super.onResume(); super.onResume();
instance = this; instance = this;
LinphoneManager.addListener(this); LinphoneManager.addListener(this);
// Only one call ringing at a time is allowed // Only one call ringing at a time is allowed
List<LinphoneCall> calls = LinphoneUtils.getLinphoneCalls(LinphoneManager.getLc()); if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
for (LinphoneCall call : calls) { List<LinphoneCall> calls = LinphoneUtils.getLinphoneCalls(LinphoneManager.getLc());
if (State.IncomingReceived == call.getState()) { for (LinphoneCall call : calls) {
mCall = call; if (State.IncomingReceived == call.getState()) {
break; mCall = call;
break;
}
} }
} }
if (mCall == null) { if (mCall == null) {

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

@ -1032,12 +1032,14 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
public Context getActivity() { public Context getActivity() {
if (LinphoneActivity.isInstanciated()) try {
return LinphoneActivity.instance(); if (LinphoneActivity.isInstanciated())
else if (InCallActivity.isInstanciated()) return LinphoneActivity.instance();
return InCallActivity.instance(); else if (InCallActivity.isInstanciated())
else if (IncomingCallActivity.isInstanciated()) return InCallActivity.instance();
return IncomingCallActivity.instance(); else if (IncomingCallActivity.isInstanciated())
return IncomingCallActivity.instance();
} catch (Exception e) {}
return null; return null;
} }