From d443ac5c2c3c6ef497c1187899c614aa58fe64fa Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 24 Sep 2012 16:42:37 +0200 Subject: [PATCH] Fix FC when incoming call --- src/org/linphone/DialerFragment.java | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index e6cdb1f01..858f7c816 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -181,19 +181,21 @@ public class DialerFragment extends Fragment { } public void newOutgoingCall(Intent intent) { - String scheme = intent.getData().getScheme(); - if (scheme.startsWith("imto")) { - mAddress.setText("sip:" + intent.getData().getLastPathSegment()); - } else if (scheme.startsWith("call") || scheme.startsWith("sip")) { - mAddress.setText(intent.getData().getSchemeSpecificPart()); - } else { - Log.e("Unknown scheme: ",scheme); - mAddress.setText(intent.getData().getSchemeSpecificPart()); + if (intent != null && intent.getData() != null) { + String scheme = intent.getData().getScheme(); + if (scheme.startsWith("imto")) { + mAddress.setText("sip:" + intent.getData().getLastPathSegment()); + } else if (scheme.startsWith("call") || scheme.startsWith("sip")) { + mAddress.setText(intent.getData().getSchemeSpecificPart()); + } else { + Log.e("Unknown scheme: ",scheme); + mAddress.setText(intent.getData().getSchemeSpecificPart()); + } + + mAddress.clearDisplayedName(); + intent.setData(null); + + LinphoneManager.getInstance().newOutgoingCall(mAddress); } - - mAddress.clearDisplayedName(); - intent.setData(null); - - LinphoneManager.getInstance().newOutgoingCall(mAddress); } }