From c9a6353a2ea63817308f7e17cf05ee71c11a6507 Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Fri, 15 May 2020 14:31:08 +0300 Subject: [PATCH] -fixed incoming calls when the app is killed for android < 10; NY-10385: [AN]: Nynja application is opened unexpectedly in front of screen when user is using other application. --- .../data/sdk/calls/ConferenceSDKModule.java | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java index 4e6041437f..f88f25458e 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java +++ b/app/src/main/java/com/nynja/mobile/communicator/data/sdk/calls/ConferenceSDKModule.java @@ -469,40 +469,19 @@ public class ConferenceSDKModule extends BaseSDKModule { boolean isLoggedIn, boolean startActivity) { Timber.i("ConferenceSDKModule::handlePushNotification(): " + payload); if (isLoggedIn) { - boolean handled = false; - if (!startActivity) { - boolean result = (!hasCreatedActiveCall()); - NYNCall iConference = mCallManager.handleCallNotification(payload); - if (iConference != null) { - if (iConference.isRinging()) { - if (result) { - Timber.i("ConferenceSDKModule::handlePushNotification(): check 1 "); - createIncomingConference(iConference, false); - mActiveConference.isRinging = true; - } - return true; + boolean result = (!hasCreatedActiveCall()); + NYNCall iConference = mCallManager.handleCallNotification(payload); + if (iConference != null) { + if (iConference.isRinging()) { + if (result) { + Timber.i("ConferenceSDKModule::handlePushNotification(): check 1 "); + createIncomingConference(iConference, startActivity); + mActiveConference.isRinging = true; } - } - return false; - } - if (!isMainActivityIsActive || !hasCreatedActiveCall()) { - handled = mCallManager.handleNotification(payload); - } - if (handled) { - Timber.i("ConferenceSDKModule::handlePushNotification(): will try to catch it - core handling: " + payload); - if (!isMainActivityIsActive) { - Timber.i("ConferenceSDKModule::handlePushNotification(): push isMainActivityIsActive=" - + isMainActivityIsActive + ", start Application"); - Timber.i("ConferenceSDKModule::handlePushNotification(): push mStateDevice.isDeviceActive()=" - + mStateDevice.isDeviceActive() + ", start Application"); - startApplicationActivityForced(); - return true; - } else if (!hasCreatedActiveCall()) { - Timber.i("ConferenceSDKModule::handlePushNotification(): push mActiveConference=null"); - startApplicationActivity(); return true; } } + return false; } return false; } -- GitLab