Merge pull request #857 from grote/davx-webdav-improvements

Several assorted improvements
seedvault-app · Feb 13, 2025 · 6945a10 · 6945a10
2 parents 4fd962a + 61043ee
commit 6945a10
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   SPDX-FileCopyrightText: 2017-2019 Steve Soltys
   SPDX-FileCopyrightText: 2020 The Calyx Institute
   SPDX-License-Identifier: Apache-2.0
@@ -73,7 +72,8 @@
         tools:ignore="ProtectedPermissions" />
 
     <!-- Used to get the name of the current profile -->
-    <uses-permission android:name="android.permission.QUERY_USERS"
+    <uses-permission
+        android:name="android.permission.QUERY_USERS"
         tools:ignore="ProtectedPermissions" />
 
     <!-- Used for periodic storage backups -->
@@ -94,6 +94,7 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
@@ -134,11 +135,11 @@
         <activity
             android:name=".ui.check.AppCheckResultActivity"
             android:label="@string/notification_checking_finished_title"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
 
         <activity
             android:name=".ui.check.FileCheckResultActivity"
-            android:launchMode="singleTask"/>
+            android:launchMode="singleTask" />
 
         <service
             android:name=".transport.ConfigurableBackupTransportService"

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
@@ -113,9 +113,14 @@ internal class RestoreViewModel(
 
     internal fun loadRestoreSets() = viewModelScope.launch(ioDispatcher) {
         val result = when (val backups = restoreCoordinator.getAvailableBackups()) {
-            is ErrorResult -> RestoreSetResult(
-                app.getString(R.string.restore_set_error) + "\n\n${backups.e}"
-            )
+            is ErrorResult -> {
+                val msg = if (backups.e == null) {
+                    app.getString(R.string.restore_set_empty_result)
+                } else {
+                    app.getString(R.string.restore_set_error) + "\n\n${backups.e}"
+                }
+                RestoreSetResult(msg)
+            }
             is SuccessResult -> RestoreSetResult(backups.backups)
         }
         mRestoreSetResults.postValue(result)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt
@@ -244,7 +244,7 @@ class SettingsManager(private val context: Context) {
         prefs.edit().putStringSet(PREF_KEY_BACKUP_APP_BLACKLIST, blacklistedApps).apply()
     }
 
-    val quota: Long = 1024 * 1024 * 1024 // 1 GiB for now
+    val quota: Long = 3L * 1024 * 1024 * 1024 // 3 GiB for now
 
     /**
      * This assumes that if there's no storage plugin set, it is the first start.

diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt
@@ -224,6 +224,7 @@ internal class BackupNotificationManager(private val context: Context) {
             setProgress(0, 0, false)
             priority = PRIORITY_LOW
         }.build()
+        Log.i(TAG, "Canceling NOTIFICATION_ID_OBSERVER")
         nm.cancel(NOTIFICATION_ID_OBSERVER)
         nm.notify(NOTIFICATION_ID_SUCCESS, notification)
     }
@@ -243,6 +244,7 @@ internal class BackupNotificationManager(private val context: Context) {
             setProgress(0, 0, false)
             priority = PRIORITY_LOW
         }.build()
+        Log.i(TAG, "Canceling NOTIFICATION_ID_OBSERVER")
         nm.cancel(NOTIFICATION_ID_OBSERVER)
         nm.notify(NOTIFICATION_ID_ERROR, notification)
     }

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  SPDX-FileCopyrightText: 2025 The Calyx Institute
+  SPDX-License-Identifier: Apache-2.0
+  -->
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <!-- Trust preinstalled CAs -->
+            <certificates src="system" />
+            <!-- Additionally trust user added CAs -->
+            <certificates
+                src="user"
+                tools:ignore="AcceptsUserCertificates" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
diff --git a/core/src/main/java/org/calyxos/seedvault/core/backends/RetryBackend.kt b/core/src/main/java/org/calyxos/seedvault/core/backends/RetryBackend.kt
@@ -78,6 +78,7 @@ internal class RetryBackend(private val delegate: Backend) : Backend {
                 delay(newDelayMs)
                 return retry(newRetries, newDelayMs, block)
             } else {
+                log.warn { "Last retry reached, throwing exception..." }
                 throw e
             }
         }

diff --git a/core/src/main/java/org/calyxos/seedvault/core/backends/webdav/WebDavHelper.kt b/core/src/main/java/org/calyxos/seedvault/core/backends/webdav/WebDavHelper.kt
@@ -89,8 +89,11 @@ internal fun DavCollection.ensureFoldersExist(log: KLogger, folders: MutableSet<
     if (parent in folders) return
     val parentCollection = DavCollection(httpClient, parent)
     try {
-        parentCollection.head { response ->
-            log.debugLog { "head($parent) = $response" }
+        parentCollection.propfind(
+            depth = 0,
+            reqProp = arrayOf(DisplayName.NAME, ResourceType.NAME),
+        ) { response, relation ->
+            log.debugLog { "propfind(0, $parent) = $response $relation" }
             folders.add(parent)
         }
     } catch (e: NotFoundException) {