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 4e6041437f8c888b60fe6bd75b4b9b257400da86..f88f25458ed954d4ea555ff58e2a23a9a6b6b35d 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; }