Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several assorted improvements #857

Merged
merged 6 commits into from
Feb 13, 2025
+39 −11
Merged

Several assorted improvements #857

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
abc12cb
Show proper error message when we couldn't find backups to restore
grote Jan 20, 2025
5f6576a
Also trust certificates the user added (self signed)
grote Jan 20, 2025
92bb11a
Log when RetryBackend will stop retrying and throw exception
grote Jan 20, 2025
1a0a94a
Replace head request with PROPFIND as not all WebDAV servers implemen…
grote Jan 20, 2025
53af9a9
Log when we cancel backup notification so there can be no doubt we di…
grote Jan 20, 2025
61043ee
Bump quota to 3 GiB per app
grote Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Also trust certificates the user added (self signed)
@grote
grote committed Jan 22, 2025
commit 5f6576a16386703c590bd3aa80f14891a297cf0d
11 changes: 6 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -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"
16 changes: 16 additions & 0 deletions app/src/main/res/xml/network_security_config.xml
View file
Original file line number Diff line number Diff line change
@@ -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>