浏览代码

Merge pull request #10545 from nextcloud/bumpSDK31

Bump targetSdkVersion to 31
Álvaro Brey 2 年之前
父节点
当前提交
fbfec4a0d7
共有 3 个文件被更改,包括 37 次插入1 次删除
  1. 1 1
      app/build.gradle
  2. 1 0
      app/src/main/AndroidManifest.xml
  3. 35 0
      app/src/main/res/xml/backup_rules.xml

+ 1 - 1
app/build.gradle

@@ -75,7 +75,7 @@ android {
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 23
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
 
 
         buildConfigField 'boolean', 'CI', ciBuild.toString()
         buildConfigField 'boolean', 'CI', ciBuild.toString()
 
 

+ 1 - 0
app/src/main/AndroidManifest.xml

@@ -76,6 +76,7 @@
     <application
     <application
         android:name=".MainApp"
         android:name=".MainApp"
         android:fullBackupContent="@xml/backup_config"
         android:fullBackupContent="@xml/backup_config"
+        android:dataExtractionRules="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:icon="@mipmap/ic_launcher"
         android:installLocation="internalOnly"
         android:installLocation="internalOnly"
         android:label="@string/app_name"
         android:label="@string/app_name"

+ 35 - 0
app/src/main/res/xml/backup_rules.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~
+  ~ Nextcloud Android client application
+  ~
+  ~ @author Tobias Kaminsky
+  ~ Copyright (C) 2022 Tobias Kaminsky
+  ~ Copyright (C) 2022 Nextcloud GmbH
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program. If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<data-extraction-rules>
+    <cloud-backup disableIfNoEncryptionCapabilities="true">
+        <exclude
+            domain="sharedpref"
+            path="evernote_jobs.xml" />
+        <exclude
+            domain="database"
+            path="evernote_jobs.db" />
+        <exclude
+            domain="file"
+            path="." />
+    </cloud-backup>
+</data-extraction-rules>