Skip to content

Commit ca61725

Browse files
committed
Fix APK workflow build failures
1 parent 28b8b6c commit ca61725

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: Build APK
22

3+
permissions:
4+
contents: write
5+
6+
env:
7+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
8+
39
on:
410
push:
511
branches:
6-
- '*'
12+
- '**'
713
tags:
814
- 'v*'
915
paths-ignore:
@@ -13,7 +19,7 @@ on:
1319
- 'FUNDING.yml'
1420
pull_request:
1521
branches:
16-
- '*'
22+
- '**'
1723
paths-ignore:
1824
- '**.md'
1925
- '.idea/*'

shared/src/commonMain/moko-resources/base/strings_settings.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,17 @@
8888
<!-- Accounts -->
8989
<string name="settings_accounts">Accounts</string>
9090
<string name="settings_accounts_description">Add or switch accounts</string>
91+
<string name="settings_downloads">Downloads</string>
92+
<string name="settings_downloads_description">Choose how files are downloaded</string>
9193

9294
<string name="action_add_account">Add account</string>
9395
<string name="action_sign_out_all">Sign out of all accounts</string>
9496

9597
<string name="cd_enterprise_domain">Enterprise domain: %1$s</string>
98+
<string name="downloads_handler">Downloader</string>
99+
<string name="downloads_handler_description">Pick the app used for downloads</string>
100+
<string name="downloads_handler_system">Built-in downloader</string>
101+
<string name="downloads_handler_external">External downloader</string>
96102
<!-- -->
97103

98104
<!-- Development -->
@@ -121,4 +127,4 @@
121127
<string name="label_open_source">Open Source</string>
122128
<string name="label_closed_source">Closed Source</string>
123129
<!-- -->
124-
</resources>
130+
</resources>

ui/src/commonMain/kotlin/dev/materii/gloom/ui/screen/notifications/viewmodel/NotificationsViewModel.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ class NotificationsViewModel(
4242
notifications.clear()
4343
notifications.addAll(response.data)
4444
}
45+
is ApiResponse.Empty -> {
46+
notifications.clear()
47+
}
4548
is ApiResponse.Error -> {
4649
error = "Couldn't load notifications"
4750
}

0 commit comments

Comments
 (0)