Skip to content

Commit bd8b005

Browse files
authored
Fix rx network error crash
• Use mergeDelayError to keep completable alive until all requests are done • Remove ott stack traces from ordinary event logging e.g network request failing • Set job property that was never set
1 parent c453f89 commit bd8b005

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, Applicati
116116
.doAfterTerminate({
117117
appConfigurationSyncer.scheduleRegularSync(this)
118118
})
119-
.subscribe({}, { Timber.w(it, "Failed to download initial app configuration") })
119+
.subscribe({}, { Timber.w("Failed to download initial app configuration ${it.localizedMessage}") })
120120
}
121121

122122
override fun activityInjector(): AndroidInjector<Activity> = activityInjector

app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class AppConfigurationDownloader @Inject constructor(
3838
val disconnectDownload = trackerDataDownloader.downloadList(Client.ClientName.DISCONNECT)
3939
val httpsUpgradeDownload = httpsUpgradeListDownloader.downloadList()
4040

41-
return Completable.merge(listOf(
41+
return Completable.mergeDelayError(listOf(
4242
easyListDownload.subscribeOn(Schedulers.io()),
4343
easyPrivacyDownload.subscribeOn(Schedulers.io()),
4444
trackersWhitelist.subscribeOn(Schedulers.io()),

app/src/main/java/com/duckduckgo/app/job/AppConfigurationJobService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ class AppConfigurationJobService : JobService() {
4040
override fun onStartJob(params: JobParameters?): Boolean {
4141
Timber.i("onStartJob")
4242

43-
appConfigurationDownloader.downloadTask()
43+
downloadTask= appConfigurationDownloader.downloadTask()
4444
.subscribeOn(Schedulers.io())
4545
.subscribe({
4646
Timber.i("Successfully downloaded all data")
4747
jobFinishedSuccessfully(params)
4848
}, {
49-
Timber.w(it, "Failed to download app configuration")
49+
Timber.w("Failed to download app configuration ${it.localizedMessage}")
5050
jobFinishedFailed(params)
5151
})
5252

0 commit comments

Comments
 (0)