Skip to content

Commit b4e42b0

Browse files
committed
Merge branch 'release/5.52.3'
2 parents 1e42d68 + 31f02bd commit b4e42b0

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616

1717
package com.duckduckgo.app.global
1818

19-
import android.app.Activity
2019
import android.app.Application
21-
import android.app.Service
2220
import android.os.Build
23-
import androidx.fragment.app.Fragment
2421
import androidx.lifecycle.Lifecycle
2522
import androidx.lifecycle.LifecycleObserver
2623
import androidx.lifecycle.OnLifecycleEvent
@@ -40,8 +37,8 @@ import com.duckduckgo.app.global.rating.AppEnjoymentLifecycleObserver
4037
import com.duckduckgo.app.global.shortcut.AppShortcutCreator
4138
import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
4239
import com.duckduckgo.app.job.AppConfigurationSyncer
43-
import com.duckduckgo.app.notification.NotificationRegistrar
4440
import com.duckduckgo.app.notification.AndroidNotificationScheduler
41+
import com.duckduckgo.app.notification.NotificationRegistrar
4542
import com.duckduckgo.app.referral.AppInstallationReferrerStateListener
4643
import com.duckduckgo.app.settings.db.SettingsDataStore
4744
import com.duckduckgo.app.statistics.AtbInitializer
@@ -59,6 +56,8 @@ import com.duckduckgo.app.usage.app.AppDaysUsedRecorder
5956
import dagger.android.AndroidInjector
6057
import dagger.android.DispatchingAndroidInjector
6158
import dagger.android.HasAndroidInjector
59+
import io.reactivex.exceptions.UndeliverableException
60+
import io.reactivex.plugins.RxJavaPlugins
6261
import io.reactivex.schedulers.Schedulers
6362
import kotlinx.coroutines.GlobalScope
6463
import kotlinx.coroutines.launch
@@ -196,6 +195,13 @@ open class DuckDuckGoApplication : HasAndroidInjector, Application(), LifecycleO
196195

197196
private fun configureUncaughtExceptionHandler() {
198197
Thread.setDefaultUncaughtExceptionHandler(alertingUncaughtExceptionHandler)
198+
RxJavaPlugins.setErrorHandler { throwable ->
199+
if (throwable is UndeliverableException) {
200+
Timber.w(throwable, "An exception happened inside RxJava code but no subscriber was still around to handle it")
201+
} else {
202+
alertingUncaughtExceptionHandler.uncaughtException(Thread.currentThread(), throwable)
203+
}
204+
}
199205
}
200206

201207
private fun recordInstallationTimestamp() {

app/version/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION=5.52.2
1+
VERSION=5.52.3

0 commit comments

Comments
 (0)