Skip to content

Commit 0799c25

Browse files
committed
Merge branch 'main-ose' into 1346-ui-elements-partially-obscured-in-landscape-mode
2 parents d04e003 + fff332f commit 0799c25

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
# Enable version updates for GitHub Actions
4+
- package-ecosystem: "github-actions"
5+
# Workflow files stored in the default location of `.github/workflows`
6+
# You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
7+
directory: "/"
8+
schedule:
9+
interval: "weekly"
10+
commit-message:
11+
prefix: "[CI] "

app/src/main/kotlin/at/bitfire/davdroid/ui/DebugInfoActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class DebugInfoActivity : AppCompatActivity() {
6565
DebugInfoScreen(
6666
account = IntentCompat.getParcelableExtra(intent, EXTRA_ACCOUNT, Account::class.java),
6767
authority = extras?.getString(EXTRA_AUTHORITY),
68-
cause = IntentCompat.getParcelableExtra(intent, EXTRA_ACCOUNT, Throwable::class.java),
68+
cause = IntentCompat.getParcelableExtra(intent, EXTRA_CAUSE, Throwable::class.java),
6969
localResource = extras?.getString(EXTRA_LOCAL_RESOURCE),
7070
remoteResource = extras?.getString(EXTRA_REMOTE_RESOURCE),
7171
logs = extras?.getString(EXTRA_LOGS),

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Comments apply to next line
22

33
[versions]
4-
android-agp = "8.9.0"
4+
android-agp = "8.9.1"
55
android-desugaring = "2.1.5"
66
androidx-activityCompose = "1.10.1"
77
androidx-appcompat = "1.7.0"
@@ -23,11 +23,11 @@ bitfire-dav4jvm = "a4f4068d25"
2323
bitfire-ical4android = "883954c7ca"
2424
bitfire-vcard4android = "ae5d609f92"
2525
compose-accompanist = "0.37.2"
26-
compose-bom = "2025.02.00"
26+
compose-bom = "2025.03.01"
2727
dnsjava = "3.6.2"
2828
glance = "1.1.1"
29-
guava = "33.4.0-android"
30-
hilt = "2.55"
29+
guava = "33.4.6-android"
30+
hilt = "2.56.1"
3131
# keep in sync with ksp version
3232
kotlin = "2.1.10"
3333
kotlinx-coroutines = "1.10.1"

0 commit comments

Comments
 (0)