Skip to content

Commit cc9e132

Browse files
committed
Merge branch 'release/5.52.2'
2 parents 89c2db4 + 169677d commit cc9e132

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
88
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
99
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
10+
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
1011

1112
<application
1213
android:name="com.duckduckgo.app.global.DuckDuckGoApplication"

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import com.duckduckgo.app.global.exception.UncaughtExceptionRepository
2020
import com.duckduckgo.app.global.exception.UncaughtExceptionSource
2121
import com.duckduckgo.app.statistics.store.OfflinePixelCountDataStore
2222
import kotlinx.coroutines.Dispatchers
23-
import kotlinx.coroutines.runBlocking
24-
import kotlinx.coroutines.withContext
23+
import kotlinx.coroutines.GlobalScope
24+
import kotlinx.coroutines.NonCancellable
25+
import kotlinx.coroutines.launch
2526

2627
class AlertingUncaughtExceptionHandler(
2728
private val originalHandler: Thread.UncaughtExceptionHandler,
@@ -31,14 +32,12 @@ class AlertingUncaughtExceptionHandler(
3132

3233
override fun uncaughtException(t: Thread?, originalException: Throwable?) {
3334

34-
// block until the exception has been fully processed
35-
runBlocking {
36-
withContext(Dispatchers.IO) {
37-
uncaughtExceptionRepository.recordUncaughtException(originalException, UncaughtExceptionSource.GLOBAL)
38-
offlinePixelCountDataStore.applicationCrashCount += 1
39-
}
35+
GlobalScope.launch(Dispatchers.IO + NonCancellable) {
36+
uncaughtExceptionRepository.recordUncaughtException(originalException, UncaughtExceptionSource.GLOBAL)
37+
offlinePixelCountDataStore.applicationCrashCount += 1
38+
39+
// wait until the exception has been fully processed before propagating exception
40+
originalHandler.uncaughtException(t, originalException)
4041
}
41-
originalHandler.uncaughtException(t, originalException)
4242
}
43-
4443
}

app/version/version.properties

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

0 commit comments

Comments
 (0)