Add opentasks content provider

4 years ago · ddd66c0ec8
parent 0726eed135
commit ddd66c0ec8
6 changed files with 140 additions and 3 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -143,6 +143,9 @@ dependencies {
    implementation("com.gitlab.bitfireAT:dav4jvm:2.1.1")
    implementation("com.gitlab.bitfireAT:ical4android:a675c7194b")
    implementation("com.gitlab.bitfireAT:cert4android:1488e39a66")
+    implementation("com.github.dmfs.opentasks:opentasks-provider:1.2.4") {
+        exclude("com.github.dmfs.opentasks", "opentasks-contract")
+    }

    implementation("com.google.dagger:hilt-android:${Versions.hilt}")
    kapt("com.google.dagger:hilt-android-compiler:${Versions.hilt}")
--- a/app/licenses.yml
+++ b/app/licenses.yml
@ -762,3 +762,33 @@
  license: The Apache Software License, Version 2.0
  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
  url: https://developer.android.com/topic/libraries/architecture/index.html
+- artifact: com.github.dmfs.opentasks:opentasks-provider:+
+  name: opentasks-provider
+  copyrightHolder: dmfs GmbH
+  license: The Apache Software License, Version 2.0
+  licenseUrl: https://api.github.com/licenses/apache-2.0
+  url: https://github.com/dmfs/opentasks
+- artifact: com.github.dmfs.opentasks:opentasks-contract:+
+  name: opentasks-contract
+  copyrightHolder: dmfs GmbH
+  license: The Apache Software License, Version 2.0
+  licenseUrl: https://api.github.com/licenses/apache-2.0
+  url: https://github.com/dmfs/opentasks
+- artifact: org.dmfs:lib-recur:+
+  name: lib-recur
+  copyrightHolder: Marten Gajda
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/license/LICENSE-2.0.txt
+  url: https://github.com/dmfs/lib-recur
+- artifact: org.dmfs:rfc5545-datetime:+
+  name: rfc5545-datetime
+  copyrightHolder: Marten Gajda
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/dmfs/rfc5545-datetime
+- artifact: org.dmfs:jems:+
+  name: jems
+  copyrightHolder: dmfs GmbH
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/license/LICENSE-2.0.txt
+  url: https://github.com/dmfs/jems
--- a/app/src/debug/res/values/keys.xml
+++ b/app/src/debug/res/values/keys.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="opentasks_authority" tools:node="replace">org.tasks.debug.opentasks</string>
  <string name="app_name" tools:ignore="PrivateResource">Tasks Debug</string>
  <string name="app_package">org.tasks.debug</string>
  <string name="backup_api_key">AEdPqrEAAAAImTf5DbfspggWrU9h06685ONycpUVwJj1JwawQQ</string>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -79,20 +79,35 @@
  <!-- ***************************** -->
  <uses-permission android:name="org.dmfs.permission.READ_TASKS" tools:node="remove"/>
  <uses-permission android:name="org.dmfs.permission.WRITE_TASKS" tools:node="remove"/>
+  <permission-group android:name="org.dmfs.tasks.permissiongroup.Tasks" tools:node="remove"/>
+  <permission android:name="org.dmfs.permission.READ_TASKS" tools:node="remove"/>
+  <permission android:name="org.dmfs.permission.WRITE_TASKS" tools:node="remove"/>

  <!-- ============================================== Exported Permissions = -->

+  <permission-tree
+    android:icon="@drawable/ic_check_white_24dp"
+    android:label="@string/app_name"
+    android:name="${applicationId}.permission" />
+
  <permission-group
    android:description="@string/read_permission_label"
    android:icon="@drawable/ic_check_white_24dp"
    android:label="@string/app_name"
-    android:name="org.tasks.permission-group" />
+    android:name="${applicationId}.permission-group" />

  <permission
    android:description="@string/permission_read_tasks"
    android:label="@string/read_permission_label"
    android:name="${applicationId}.permission.READ_TASKS"
-    android:permissionGroup="org.tasks.permission-group"
+    android:permissionGroup="${applicationId}.permission-group"
+    android:protectionLevel="dangerous"/>
+
+  <permission
+    android:description="@string/permission_read_tasks"
+    android:label="@string/read_permission_label"
+    android:name="${applicationId}.permission.WRITE_TASKS"
+    android:permissionGroup="${applicationId}.permission-group"
    android:protectionLevel="dangerous"/>

  <!-- ========================================================== Metadata = -->
@ -280,6 +295,23 @@
        android:resource="@xml/file_provider_paths"/>
    </provider>

+    <receiver
+      android:name="org.dmfs.provider.tasks.TaskProviderBroadcastReceiver"
+      tools:node="remove"/>
+
+    <provider
+      android:name="org.dmfs.provider.tasks.TaskProvider"
+      android:authorities="org.dmfs.tasks"
+      tools:node="remove" />
+
+    <provider
+      android:name="org.dmfs.provider.tasks.TaskProvider"
+      android:authorities="${applicationId}.opentasks"
+      android:exported="true"
+      android:multiprocess="false"
+      android:readPermission="${applicationId}.permission.READ_TASKS"
+      android:writePermission="${applicationId}.permission.WRITE_TASKS"/>
+
    <!-- ========================================================= Plugins = -->

    <activity
--- a/app/src/main/assets/licenses.json
+++ b/app/src/main/assets/licenses.json
@ -1814,6 +1814,76 @@
      "normalizedLicense": "apache2",
      "url": "https://developer.android.com/topic/libraries/architecture/index.html",
      "libraryName": "work-runtime-ktx"
+    },
+    {
+      "artifactId": {
+        "name": "opentasks-provider",
+        "group": "com.github.dmfs.opentasks",
+        "version": "+"
+      },
+      "copyrightHolder": "dmfs GmbH",
+      "copyrightStatement": "Copyright &copy; dmfs GmbH. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "https://api.github.com/licenses/apache-2.0",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/dmfs/opentasks",
+      "libraryName": "opentasks-provider"
+    },
+    {
+      "artifactId": {
+        "name": "opentasks-contract",
+        "group": "com.github.dmfs.opentasks",
+        "version": "+"
+      },
+      "copyrightHolder": "dmfs GmbH",
+      "copyrightStatement": "Copyright &copy; dmfs GmbH. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "https://api.github.com/licenses/apache-2.0",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/dmfs/opentasks",
+      "libraryName": "opentasks-contract"
+    },
+    {
+      "artifactId": {
+        "name": "lib-recur",
+        "group": "org.dmfs",
+        "version": "+"
+      },
+      "copyrightHolder": "Marten Gajda",
+      "copyrightStatement": "Copyright &copy; Marten Gajda. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/license/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/dmfs/lib-recur",
+      "libraryName": "lib-recur"
+    },
+    {
+      "artifactId": {
+        "name": "rfc5545-datetime",
+        "group": "org.dmfs",
+        "version": "+"
+      },
+      "copyrightHolder": "Marten Gajda",
+      "copyrightStatement": "Copyright &copy; Marten Gajda. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/dmfs/rfc5545-datetime",
+      "libraryName": "rfc5545-datetime"
+    },
+    {
+      "artifactId": {
+        "name": "jems",
+        "group": "org.dmfs",
+        "version": "+"
+      },
+      "copyrightHolder": "dmfs GmbH",
+      "copyrightStatement": "Copyright &copy; dmfs GmbH. All rights reserved.",
+      "license": "The Apache Software License, Version 2.0",
+      "licenseUrl": "http://www.apache.org/license/LICENSE-2.0.txt",
+      "normalizedLicense": "apache2",
+      "url": "https://github.com/dmfs/jems",
+      "libraryName": "jems"
    }
  ]
 }
--- a/app/src/release/res/values/keys.xml
+++ b/app/src/release/res/values/keys.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="opentasks_authority" tools:node="replace">org.tasks.opentasks</string>
  <string name="app_name">Tasks</string>
  <string name="app_package">org.tasks</string>
  <string name="backup_api_key">AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw</string>