From bd46def98bac54d3692892655b29957de2e25fa6 Mon Sep 17 00:00:00 2001 From: Josh Kasten Date: Mon, 26 Jan 2026 20:17:55 -0500 Subject: [PATCH] chore: Lower severity of log where it makes sense Severity lower to match what is sever to OneSignal, not necessary the app developer. The main motivation is to better classify errors, warning, ect we send in the otel format to OneSignal, which will lower volume as well. --- .../main/java/com/onesignal/common/JSONUtils.kt | 2 +- .../background/impl/BackgroundManager.kt | 2 +- .../core/internal/http/impl/HttpClient.kt | 2 +- .../internal/operations/impl/OperationRepo.kt | 6 +++--- .../outcomes/impl/OutcomeEventsController.kt | 8 ++++---- .../internal/session/impl/SessionListener.kt | 2 +- .../com/onesignal/user/internal/LoginHelper.kt | 2 +- .../backend/impl/InAppBackendService.kt | 2 +- .../internal/display/impl/InAppDisplayer.kt | 2 +- .../internal/display/impl/InAppMessageView.kt | 2 +- .../internal/hydrators/InAppHydrator.kt | 2 +- .../location/internal/LocationManager.kt | 2 +- .../controller/impl/HmsLocationController.kt | 6 +++--- .../bridges/OneSignalHmsEventBridge.kt | 2 +- .../channels/impl/NotificationChannelManager.kt | 4 ++-- .../internal/common/OSWorkManagerHelper.kt | 4 ++-- .../data/impl/NotificationRepository.kt | 2 +- .../impl/NotificationGenerationProcessor.kt | 6 +++--- .../impl/NotificationLifecycleService.kt | 17 +++++++---------- .../internal/pushtoken/PushTokenManager.kt | 4 ++-- .../impl/ReceiveReceiptProcessor.kt | 2 +- .../registration/impl/PushRegistratorADM.kt | 4 ++-- .../impl/PushRegistratorAbstractGoogle.kt | 14 +++++++------- .../registration/impl/PushRegistratorHMS.kt | 4 ++-- .../impl/NotificationRestoreProcessor.kt | 2 +- .../notifications/services/ADMMessageHandler.kt | 4 ++-- .../services/ADMMessageHandlerJob.kt | 4 ++-- 27 files changed, 55 insertions(+), 58 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt index 75ba75db7c..a2266ff79c 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/common/JSONUtils.kt @@ -61,7 +61,7 @@ object JSONUtils { try { val value = jsonObject.opt(key) if (value is JSONArray || value is JSONObject) { - Logging.error("Omitting key '$key'! sendTags DO NOT supported nested values!") + Logging.warn("Omitting key '$key'! sendTags DO NOT supported nested values!") } else if (jsonObject.isNull(key) || "" == value) { result[key] = "" } else { diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt index eddb183784..01c6c81934 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/background/impl/BackgroundManager.kt @@ -186,7 +186,7 @@ internal class BackgroundManager( } catch (e: NullPointerException) { // Catch for buggy Oppo devices // https://github.com/OneSignal/OneSignal-Android-SDK/issues/487 - Logging.error( + Logging.info( "scheduleSyncServiceAsJob called JobScheduler.jobScheduler which " + "triggered an internal null Android error. Skipping job.", e, diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt index 29b5578aec..5d3d75e30f 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt @@ -93,7 +93,7 @@ internal class HttpClient( return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, headers) } } catch (e: TimeoutCancellationException) { - Logging.error("HttpClient: Request timed out: $url", e) + Logging.info("HttpClient: Request timed out: $url", e) return HttpResponse(0, null, e) } catch (e: Throwable) { return HttpResponse(0, null, e) diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt index 4439b688e3..9b39566d17 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt @@ -272,7 +272,7 @@ internal class OperationRepo( ExecutionResult.FAIL_NORETRY, ExecutionResult.FAIL_CONFLICT, -> { - Logging.error("Operation execution failed without retry: $operations") + Logging.warn("Operation execution failed without retry: $operations") // on failure we remove the operation from the store and wake any waiters ops.forEach { _operationModelStore.remove(it.operation.id) } ops.forEach { it.waiter?.wake(false) } @@ -287,7 +287,7 @@ internal class OperationRepo( } } ExecutionResult.FAIL_RETRY -> { - Logging.error("Operation execution failed, retrying: $operations") + Logging.info("Operation execution failed, retrying: $operations") // add back all operations to the front of the queue to be re-executed. synchronized(queue) { ops.reversed().forEach { @@ -349,7 +349,7 @@ internal class OperationRepo( val delayForOnRetries = retries * _configModelStore.model.opRepoDefaultFailRetryBackoff val delayFor = max(delayForOnRetries, retryAfterSecondsNonNull * 1_000) if (delayFor < 1) return - Logging.error("Operations being delay for: $delayFor ms") + Logging.debug("Operations being delay for: $delayFor ms") withTimeoutOrNull(delayFor) { retryWaiter.waitForWake() } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt index 8c230f352a..781a9f0fe4 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/outcomes/impl/OutcomeEventsController.kt @@ -79,9 +79,9 @@ internal class OutcomeEventsController( val err = "OutcomeEventsController.sendSavedOutcomeEvent: Sending outcome with name: ${event.outcomeId} failed with status code: ${ex.statusCode} and response: ${ex.response}" if (responseType == NetworkUtils.ResponseStatusType.RETRYABLE) { - Logging.warn("$err Outcome event was cached and will be reattempted on app cold start") + Logging.info("$err Outcome event was cached and will be reattempted on app cold start") } else { - Logging.error("$err Outcome event will be omitted!") + Logging.warn("$err Outcome event will be omitted!") _outcomeEventsCache.deleteOldOutcomeEvent(event) } } @@ -229,13 +229,13 @@ internal class OutcomeEventsController( val err = "OutcomeEventsController.sendAndCreateOutcomeEvent: Sending outcome with name: $name failed with status code: ${ex.statusCode} and response: ${ex.response}" if (responseType == NetworkUtils.ResponseStatusType.RETRYABLE) { - Logging.warn("$err Outcome event was cached and will be reattempted on app cold start") + Logging.info("$err Outcome event was cached and will be reattempted on app cold start") // Only if we need to save and retry the outcome, then we will save the timestamp for future sending eventParams.timestamp = timestampSeconds _outcomeEventsCache.saveOutcomeEvent(eventParams) } else { - Logging.error("$err Outcome event will be omitted!") + Logging.warn("$err Outcome event will be omitted!") _outcomeEventsCache.deleteOldOutcomeEvent(eventParams) } diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt index 9279d2bf55..1fcdcd8641 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/session/internal/session/impl/SessionListener.kt @@ -56,7 +56,7 @@ internal class SessionListener( // Time is erroneous if below 1 second or over a day if (durationInSeconds < 1L || durationInSeconds > SECONDS_IN_A_DAY) { - Logging.error("SessionListener.onSessionEnded sending duration of $durationInSeconds seconds") + Logging.info("SessionListener.onSessionEnded sending duration of $durationInSeconds seconds") } _operationRepo.enqueue( diff --git a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/LoginHelper.kt b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/LoginHelper.kt index ae45985dfc..15939441ba 100644 --- a/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/LoginHelper.kt +++ b/OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/LoginHelper.kt @@ -48,7 +48,7 @@ class LoginHelper( ) if (!result) { - Logging.error("Could not login user") + Logging.warn("Could not login user") } } } diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt index 79d9a76099..9bbd738d55 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt @@ -202,7 +202,7 @@ internal class InAppBackendService( statusCode: Int, response: String?, ) { - Logging.error("Encountered a $statusCode error while attempting in-app message $requestType request: $response") + Logging.info("Encountered a $statusCode error while attempting in-app message $requestType request: $response") } private suspend fun attemptFetchWithRetries( diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt index 9c7115cad3..7bf7c14fb2 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppDisplayer.kt @@ -149,7 +149,7 @@ internal class InAppDisplayer( } catch (e: Exception) { // Need to check error message to only catch MissingWebViewPackageException as it isn't public if (e.message != null && e.message!!.contains("No WebView installed")) { - Logging.error("Error setting up WebView: ", e) + Logging.info("Error setting up WebView: ", e) } else { throw e } diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt index 11098714f8..76b71f4c2b 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/display/impl/InAppMessageView.kt @@ -460,7 +460,7 @@ internal class InAppMessageView( */ suspend fun dismissAndAwaitNextMessage() { if (draggableRelativeLayout == null) { - Logging.error("No host presenter to trigger dismiss animation, counting as dismissed already") + Logging.info("No host presenter to trigger dismiss animation, counting as dismissed already") dereferenceViews() return } diff --git a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt index 0518dc5c72..a860357bb6 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/main/java/com/onesignal/inAppMessages/internal/hydrators/InAppHydrator.kt @@ -30,7 +30,7 @@ internal class InAppHydrator( try { val content = InAppMessageContent(jsonObject) if (content.contentHtml == null) { - Logging.debug("displayMessage:OnSuccess: No HTML retrieved from loadMessageContent") + Logging.info("displayMessage:OnSuccess: No HTML retrieved from loadMessageContent") return null } diff --git a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt index d6bff44e70..7239361f01 100644 --- a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt +++ b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt @@ -103,7 +103,7 @@ internal class LocationManager( if (androidSDKInt < Build.VERSION_CODES.M) { if (!hasFinePermissionGranted && !hasCoarsePermissionGranted) { // Permission missing on manifest - Logging.error("Location permissions not added on AndroidManifest file < M") + Logging.info("Location permissions not added on AndroidManifest file < M") return@withContext false } diff --git a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/HmsLocationController.kt b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/HmsLocationController.kt index 04bf9bc258..20dbe09799 100644 --- a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/HmsLocationController.kt +++ b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/controller/impl/HmsLocationController.kt @@ -50,7 +50,7 @@ internal class HmsLocationController( hmsFusedLocationClient = com.huawei.hms.location.LocationServices.getFusedLocationProviderClient(_applicationService.appContext) } catch (e: Exception) { - Logging.error("Huawei LocationServices getFusedLocationProviderClient failed! $e") + Logging.warn("Huawei LocationServices getFusedLocationProviderClient failed! $e") wasSuccessful = false return@withLock } @@ -75,7 +75,7 @@ internal class HmsLocationController( }, ) .addOnFailureListener { e -> - Logging.error("Huawei LocationServices getLastLocation failed!", e) + Logging.warn("Huawei LocationServices getLastLocation failed!", e) waiter.wake(false) } wasSuccessful = waiter.waitForWake() @@ -133,7 +133,7 @@ internal class HmsLocationController( }, ) .addOnFailureListener { e -> - Logging.error("Huawei LocationServices getLastLocation failed!", e) + Logging.warn("Huawei LocationServices getLastLocation failed!", e) waiter.wake() } waiter.waitForWake() diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/bridges/OneSignalHmsEventBridge.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/bridges/OneSignalHmsEventBridge.kt index 8fd06d90a6..45f3a36d5e 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/bridges/OneSignalHmsEventBridge.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/bridges/OneSignalHmsEventBridge.kt @@ -89,7 +89,7 @@ object OneSignalHmsEventBridge { data = messageDataJSON.toString() } catch (e: JSONException) { - Logging.error("OneSignalHmsEventBridge error when trying to create RemoteMessage data JSON") + Logging.warn("OneSignalHmsEventBridge error when trying to create RemoteMessage data JSON") } // HMS notification with Message Type being Message won't trigger Activity reverse trampolining logic diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt index f5e9fe6e74..45577fc7c9 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/channels/impl/NotificationChannelManager.kt @@ -116,7 +116,7 @@ internal class NotificationChannelManager( ledColor = BigInteger(ledc, 16) channel.lightColor = ledColor.toInt() } catch (t: Throwable) { - Logging.error("Couldn't convert ARGB Hex value to BigInteger:", t) + Logging.warn("Couldn't convert ARGB Hex value to BigInteger:", t) } } channel.enableLights(payload.optInt("led", 1) == 1) @@ -211,7 +211,7 @@ internal class NotificationChannelManager( } catch (e: NullPointerException) { // Catch issue caused by "Attempt to invoke virtual method 'boolean android.app.NotificationChannel.isDeleted()' on a null object reference" // https://github.com/OneSignal/OneSignal-Android-SDK/issues/1291 - Logging.error("Error when trying to delete notification channel: " + e.message) + Logging.warn("Error when trying to delete notification channel: " + e.message) } // Delete old channels - Payload will include all changes for the app. Any extra OS_ ones must diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/OSWorkManagerHelper.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/OSWorkManagerHelper.kt index a0c9397984..9dfab0e6d7 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/OSWorkManagerHelper.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/common/OSWorkManagerHelper.kt @@ -26,7 +26,7 @@ object OSWorkManagerHelper { This aims to catch the IllegalStateException "WorkManager is not initialized properly..." - https://androidx.tech/artifacts/work/work-runtime/2.8.1-source/androidx/work/impl/WorkManagerImpl.java.html */ - Logging.error("OSWorkManagerHelper.getInstance failed, attempting to initialize: ", e) + Logging.warn("OSWorkManagerHelper.getInstance failed, attempting to initialize: ", e) initializeWorkManager(context) WorkManager.getInstance(context) } @@ -51,7 +51,7 @@ object OSWorkManagerHelper { 1. We lost the race with another call to WorkManager.initialize outside of OneSignal. 2. It is possible for some other unexpected error is thrown from WorkManager. */ - Logging.error("OSWorkManagerHelper initializing WorkManager failed: ", e) + Logging.warn("OSWorkManagerHelper initializing WorkManager failed: ", e) } } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt index 66c750e3c0..056540cac9 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/data/impl/NotificationRepository.kt @@ -429,7 +429,7 @@ internal class NotificationRepository( } } } catch (t: Throwable) { - Logging.error("Error clearing oldest notifications over limit! ", t) + Logging.warn("Error clearing oldest notifications over limit! ", t) } } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt index d05e907f24..17e907637e 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/generation/impl/NotificationGenerationProcessor.kt @@ -86,9 +86,9 @@ internal class NotificationGenerationProcessor( }.join() } } catch (to: TimeoutCancellationException) { - Logging.error("remoteNotificationReceived timed out, continuing with wantsToDisplay=$wantsToDisplay.", to) + Logging.info("remoteNotificationReceived timed out, continuing with wantsToDisplay=$wantsToDisplay.", to) } catch (t: Throwable) { - Logging.error("remoteNotificationReceived threw an exception. Displaying normal OneSignal notification.", t) + Logging.info("remoteNotificationReceived threw an exception. Displaying normal OneSignal notification.", t) } var shouldDisplay = @@ -121,7 +121,7 @@ internal class NotificationGenerationProcessor( } catch (to: TimeoutCancellationException) { Logging.info("notificationWillShowInForegroundHandler timed out, continuing with wantsToDisplay=$wantsToDisplay.", to) } catch (t: Throwable) { - Logging.error( + Logging.info( "notificationWillShowInForegroundHandler threw an exception. Displaying normal OneSignal notification.", t, ) diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt index 5163f13c7c..480671000b 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt @@ -155,9 +155,9 @@ internal class NotificationLifecycleService( }, onError = { ex -> if (ex is BackendException) { - Logging.error("Notification opened confirmation failed with statusCode: ${ex.statusCode} response: ${ex.response}") + Logging.info("Notification opened confirmation failed with statusCode: ${ex.statusCode} response: ${ex.response}") } else { - Logging.error("Unexpected error in notification opened confirmation", ex) + Logging.info("Unexpected error in notification opened confirmation", ex) } }, ) @@ -275,22 +275,19 @@ internal class NotificationLifecycleService( val intent = intentGenerator.getIntentVisible() if (intent != null) { - Logging.info("SDK running startActivity with Intent: $intent") + Logging.debug("SDK running startActivity with Intent: $intent") withContext(Dispatchers.Main) { activity.startActivity(intent) } } else { - Logging.info("SDK not showing an Activity automatically due to it's settings.") + Logging.debug("SDK not showing an Activity automatically due to it's settings.") } } catch (e: JSONException) { - Logging.error("Could not parse JSON to open notification activity.") - e.printStackTrace() + Logging.error("Could not parse JSON to open notification activity.", e) } catch (e: ActivityNotFoundException) { - Logging.error("No activity found to handle notification open intent.") - e.printStackTrace() + Logging.warn("No activity found to handle notification open intent.", e) } catch (e: Exception) { - Logging.error("Could not open notification activity.") - e.printStackTrace() + Logging.error("Could not open notification activity.", e) } } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/pushtoken/PushTokenManager.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/pushtoken/PushTokenManager.kt index 4dffeec5c5..5813d156bb 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/pushtoken/PushTokenManager.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/pushtoken/PushTokenManager.kt @@ -18,11 +18,11 @@ internal class PushTokenManager( override suspend fun retrievePushToken(): PushTokenResponse { when (_deviceService.jetpackLibraryStatus) { IDeviceService.JetpackLibraryStatus.MISSING -> { - Logging.fatal("Could not find the Jetpack/AndroidX. Please make sure it has been correctly added to your project.") + Logging.info("Could not find the Jetpack/AndroidX. Please make sure it has been correctly added to your project.") pushTokenStatus = SubscriptionStatus.MISSING_JETPACK_LIBRARY } IDeviceService.JetpackLibraryStatus.OUTDATED -> { - Logging.fatal( + Logging.info( "The included Jetpack/AndroidX Library is too old or incomplete.", ) pushTokenStatus = SubscriptionStatus.OUTDATED_JETPACK_LIBRARY diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptProcessor.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptProcessor.kt index ad7827d11a..e15937d1d3 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptProcessor.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/receivereceipt/impl/ReceiveReceiptProcessor.kt @@ -20,7 +20,7 @@ internal class ReceiveReceiptProcessor( try { _backend.updateNotificationAsReceived(appId, notificationId, subscriptionId, deviceType) } catch (ex: BackendException) { - Logging.error("Receive receipt failed with statusCode: ${ex.statusCode} response: ${ex.response}") + Logging.info("Receive receipt failed with statusCode: ${ex.statusCode} response: ${ex.response}") } } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt index 98d1611302..6970196777 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorADM.kt @@ -38,13 +38,13 @@ internal class PushRegistratorADM( result = if (registrationId != null) { - Logging.error("ADM registered with ID:$registrationId") + Logging.debug("ADM registered with ID:$registrationId") IPushRegistrator.RegisterResult( registrationId, SubscriptionStatus.SUBSCRIBED, ) } else { - Logging.error("com.onesignal.ADMMessageHandler timed out, please check that your have the receiver, service, and your package name matches(NOTE: Case Sensitive) per the OneSignal instructions.") + Logging.info("com.onesignal.ADMMessageHandler timed out, please check that your have the receiver, service, and your package name matches(NOTE: Case Sensitive) per the OneSignal instructions.") IPushRegistrator.RegisterResult( null, SubscriptionStatus.ERROR, diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt index d1d53fcdc6..ac24ca3558 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorAbstractGoogle.kt @@ -57,12 +57,12 @@ internal abstract class PushRegistratorAbstractGoogle( } if (!_deviceService.hasFCMLibrary) { - Logging.fatal("The Firebase FCM library is missing! Please make sure to include it in your project.") + Logging.warn("The Firebase FCM library is missing! Please make sure to include it in your project.") return IPushRegistrator.RegisterResult(null, SubscriptionStatus.MISSING_FIREBASE_FCM_LIBRARY) } return if (!isValidProjectNumber(_configModelStore.model.googleProjectNumber)) { - Logging.error( + Logging.warn( "Missing Google Project number!\nPlease enter a Google Project number / Sender ID on under App Settings > Android > Configuration on the OneSignal dashboard.", ) IPushRegistrator.RegisterResult( @@ -84,14 +84,14 @@ internal abstract class PushRegistratorAbstractGoogle( registerInBackground(senderId) } else { _upgradePrompt.showUpdateGPSDialog() - Logging.error("'Google Play services' app not installed or disabled on the device.") + Logging.warn("'Google Play services' app not installed or disabled on the device.") IPushRegistrator.RegisterResult( null, SubscriptionStatus.OUTDATED_GOOGLE_PLAY_SERVICES_APP, ) } } catch (t: Throwable) { - Logging.error( + Logging.warn( "Could not register with $providerName due to an issue with your AndroidManifest.xml or with 'Google Play services'.", t, ) @@ -140,7 +140,7 @@ internal abstract class PushRegistratorAbstractGoogle( // Wrapping with new Exception so the current line is included in the stack trace. val exception = Exception(e) if (currentRetry >= REGISTRATION_RETRY_COUNT - 1) { - Logging.error("Retry count of $REGISTRATION_RETRY_COUNT exceed! Could not get a $providerName Token.", exception) + Logging.info("Retry count of $REGISTRATION_RETRY_COUNT exceed! Could not get a $providerName Token.", exception) } else { Logging.info("'Google Play services' returned $exceptionMessage error. Current retry count: $currentRetry", exception) @@ -152,12 +152,12 @@ internal abstract class PushRegistratorAbstractGoogle( } else { // Wrapping with new Exception so the current line is included in the stack trace. val exception = Exception(e) - Logging.error("Error Getting $providerName Token", exception) + Logging.warn("Error Getting $providerName Token", exception) return IPushRegistrator.RegisterResult(null, pushStatus) } } catch (t: Throwable) { - Logging.error("Unknown error getting $providerName Token", t) + Logging.warn("Unknown error getting $providerName Token", t) return IPushRegistrator.RegisterResult( null, SubscriptionStatus.FIREBASE_FCM_ERROR_MISC_EXCEPTION, diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorHMS.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorHMS.kt index b568c34e9d..d637242cdc 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorHMS.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/registration/impl/PushRegistratorHMS.kt @@ -78,13 +78,13 @@ internal class PushRegistratorHMS( } return if (pushToken != null) { - Logging.error("HMS registered with ID:$pushToken") + Logging.debug("HMS registered with ID:$pushToken") IPushRegistrator.RegisterResult( pushToken, SubscriptionStatus.SUBSCRIBED, ) } else { - Logging.error("HmsMessageServiceOneSignal.onNewToken timed out.") + Logging.warn("HmsMessageServiceOneSignal.onNewToken timed out.") IPushRegistrator.RegisterResult( null, SubscriptionStatus.HMS_TOKEN_TIMEOUT, diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreProcessor.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreProcessor.kt index d00de6ce8d..bc2ba38c7d 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreProcessor.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/restoration/impl/NotificationRestoreProcessor.kt @@ -30,7 +30,7 @@ internal class NotificationRestoreProcessor( _badgeCountUpdater.update() } catch (t: Throwable) { - Logging.error("Error restoring notification records! ", t) + Logging.warn("Error restoring notification records! ", t) } } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt index cbf9a00141..7bfbf8e4c6 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandler.kt @@ -36,10 +36,10 @@ class ADMMessageHandler : ADMMessageHandlerBase("ADMMessageHandler") { } override fun onRegistrationError(error: String) { - Logging.error("ADM:onRegistrationError: $error") + Logging.info("ADM:onRegistrationError: $error") if ("INVALID_SENDER" == error) { - Logging.error( + Logging.info( "Please double check that you have a matching package name (NOTE: Case Sensitive), api_key.txt, and the apk was signed with the same Keystore and Alias.", ) } diff --git a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt index 0eb1a06ca1..919007749f 100644 --- a/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt +++ b/OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/services/ADMMessageHandlerJob.kt @@ -56,9 +56,9 @@ class ADMMessageHandlerJob : ADMMessageHandlerJobBase() { context: Context?, error: String?, ) { - Logging.error("ADM:onRegistrationError: $error") + Logging.info("ADM:onRegistrationError: $error") if ("INVALID_SENDER" == error) { - Logging.error( + Logging.info( "Please double check that you have a matching package name (NOTE: Case Sensitive), api_key.txt, and the apk was signed with the same Keystore and Alias.", ) }