From 938f43b70a0e443783ca5be620257593b069adc4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 16 May 2012 14:16:15 +0200 Subject: [PATCH] Fix two incall activities instances when receiving a call --- src/org/linphone/IncallActivity.java | 2 +- src/org/linphone/LinphoneActivity.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java index 5043818c5..04c40e0fd 100644 --- a/src/org/linphone/IncallActivity.java +++ b/src/org/linphone/IncallActivity.java @@ -152,7 +152,7 @@ public class IncallActivity extends AbstractCalleesActivity implements @Override protected void onPause() { - IncallActivity.active = false; + setActive(false); super.onPause(); } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 397eb8270..391b24e0f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -422,9 +422,10 @@ public class LinphoneActivity extends TabActivity implements ContactPicked } mHandler.post(new Runnable() { public void run() { - if (IncallActivity.instance() != null && IncallActivity.instance().isActive()) return; + if (IncallActivity.active) return; Intent intent = new Intent().setClass(LinphoneActivity.this, IncallActivity.class); startActivityForResult(intent, incall_activity); + IncallActivity.active = true; } }); }