compose-bom 2025.12.01

Bumps [rexml](https://github.com/ruby/rexml) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.4.1...v3.4.2)

---
updated-dependencies:
- dependency-name: rexml
  dependency-version: 3.4.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+github: abaker
+liberapay: tasks
+patreon: tasks
+custom: tasks.org/donate

.github/workflows/bundle.yml

@@ -0,0 +1,52 @@
+name: Assemble bundle
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    uses: ./.github/workflows/check.yml
+  bundle:
+    runs-on: ubuntu-latest
+    needs: [ check ]
+    steps:
+      - name: Decode Keystore
+        run: |
+          echo ${{ secrets.KEY_STORE }} | base64 -di > "${RUNNER_TEMP}"/keystore.jks
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Bundle
+        env:
+          KEY_PATH: ${{ runner.temp }}/keystore.jks
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+          MAPBOX_KEY: ${{ secrets.MAPBOX_KEY }}
+          GOOGLE_KEY: ${{ secrets.GOOGLE_KEY }}
+        run: bundle exec fastlane bundle
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: release
+          path: |
+            app/build/outputs/**
+            wear/build/outputs/**

.github/workflows/check.yml

@@ -0,0 +1,96 @@
+name: Run automated checks
+
+on:
+  pull_request:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Lint checks
+        run: bundle exec fastlane lint
+
+      - name: Archive lint reports
+        uses: actions/upload-artifact@v6
+        if: ${{ always() }}
+        with:
+          name: lint-reports
+          path: app/build/reports/*.html
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        flavor: [Googleplay, Generic]
+        api-level: [29]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+#      - name: AVD cache
+#        uses: actions/cache@v4
+#        id: avd-cache
+#        with:
+#          path: |
+#            ~/.android/avd/*
+#            ~/.android/adb*
+#          key: avd-${{ matrix.api-level }}
+#
+#      - name: create AVD and generate snapshot for caching
+#        if: steps.avd-cache.outputs.cache-hit != 'true'
+#        uses: reactivecircus/android-emulator-runner@v2
+#        with:
+#          api-level: ${{ matrix.api-level }}
+#          force-avd-creation: false
+#          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+#          disable-animations: false
+#          script: echo "Generated AVD snapshot for caching."
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew -Pcoverage app:test${{ matrix.flavor }}DebugUnitTest app:connected${{ matrix.flavor }}DebugAndroidTest
+
+      - name: Upload test reports
+        uses: actions/upload-artifact@v6
+        if: ${{ always() }}
+        with:
+          name: test-reports-${{ matrix.flavor }}
+          path: app/build/reports/**

.github/workflows/dependency_diff.yml

@@ -0,0 +1,47 @@
+name: Update Dependency Diff
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'gradle/libs.versions.toml'
+  pull_request:
+    paths:
+      - 'gradle/libs.versions.toml'
+  workflow_dispatch:
+
+jobs:
+  update-deps:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v6
+        with:
+            ref: ${{ github.head_ref }}
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Update dependency diffs
+        run: ./update_dependency_diff
+
+      - name: Commit changes
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add deps_*.txt
+          git diff --staged --quiet || git commit -m "Update dependency diffs"
+          git push

.github/workflows/deploy.yml

@@ -0,0 +1,32 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  FASTLANE: ${{ secrets.FASTLANE }}
+
+jobs:
+  bundle:
+    uses: ./.github/workflows/bundle.yml
+    secrets: inherit
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [ bundle ]
+    steps:
+      - uses: actions/checkout@v6
+      - name: Fastlane key
+        run: |
+          echo "$FASTLANE" > ./fastlane.json
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - uses: actions/download-artifact@v7
+        with:
+          name: release
+          path: .
+      - name: Deploy
+        run: bundle exec fastlane deploy

.gitignore

@@ -1,3 +1,4 @@
+.kotlin
 .idea
 *.iml
 .gradle
@@ -9,3 +10,5 @@ local.properties
 Thumbs.db
 /captures/
 /fastlane/report.xml
+/compose-metrics/
+.DS_Store

.idea/misc.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

.ruby-version

@@ -0,0 +1 @@
+3.4.8

.run/wear.run.xml

@@ -0,0 +1,70 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="wear" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false" singleton="true">
+    <module name="tasks.Tasks.wear.main" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="CLEAR_LOGCAT" value="true" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Hybrid>
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.travis.yml

@@ -1,99 +0,0 @@
-# https://github.com/andstatus/todoagenda/blob/aa2bc56effa379e145eecb104cc5bac33975b7aa/.travis.yml
-# Based on https://travis-ci.org/ankidroid/Anki-Android/builds/624268367
-# See also https://travis-ci.community/t/is-android-28-emulator-supported/1718/6
-sudo: true
-language: bash
-# ignored on non-linux platforms, but bionic is required for nested virtualization
-dist: bionic
-
-stages:
-  - install
-  - test
-  - cache
-
-env:
-  global:
-    - COMPILE_API=29
-    - ANDROID_BUILD_TOOLS=29.0.2
-    - ABI=x86_64
-    - ADB_INSTALL_TIMEOUT=8
-    - ANDROID_HOME=${HOME}/android-sdk
-    - ANDROID_TOOLS_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"
-    - EMU_FLAVOR=default # use google_apis flavor if no default flavor emulator
-    - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
-    - JDK="1.8"
-    - TOOLS=${ANDROID_HOME}/tools
-    # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
-    - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
-  matrix:
-    - API=29
-
-before_install:
-  # This section may run on all platforms, and may run for unit tests or for coverage finalization
-  # It should not make assumptions about os platform or desired tool installation
-
-  # Set up JDK 8 for Android SDK - Java is universally needed: codacy, unit tests, emulators
-  - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
-  - export TARGET_JDK="${JDK}"
-  - JDK="1.8"
-  - source ~/.install-jdk-travis.sh
-
-  # Set up Android SDK - this is needed everywhere but coverage finalization, so toggle on that
-  - wget -q "${ANDROID_TOOLS_URL}" -O android-sdk-tools.zip
-  - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
-  - rm android-sdk-tools.zip
-  - mkdir ~/.android # avoid harmless sdkmanager warning
-  - echo 'count=0' > ~/.android/repositories.cfg # avoid harmless sdkmanager warning
-  - yes | sdkmanager --licenses >/dev/null # accept all sdkmanager warnings
-  - echo y | sdkmanager --no_https "platform-tools" >/dev/null
-  - echo y | sdkmanager --no_https "tools" >/dev/null # A second time per Travis docs, gets latest versions
-  - echo y | sdkmanager --no_https "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null # Implicit gradle dependency - gradle drives changes
-  - echo y | sdkmanager --no_https "platforms;android-${COMPILE_API}" >/dev/null # We need the API of the current compileSdkVersion from gradle.properties
-
-install:
-  # In our setup, install only runs on matrix entries we want full emulator tests on
-  # That only happens currently on linux, so this section can assume linux + emulator is desired
-  # Download required emulator tools
-  - echo y | sdkmanager --no_https "platforms;android-$API" >/dev/null # We need the API of the emulator we will run
-  - echo y | sdkmanager --no_https "emulator" >/dev/null
-  - echo y | sdkmanager --no_https "system-images;android-$API;$EMU_FLAVOR;$ABI" >/dev/null # install our emulator
-
-  # Set up KVM on linux for hardware acceleration. Manually here so it only happens for emulator tests, takes ~30s
-  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install bridge-utils libpulse0 libvirt-bin qemu-kvm virtinst ubuntu-vm-builder
-  - sudo adduser $USER libvirt
-  - sudo adduser $USER kvm
-
-  # Create an Android emulator
-  - echo no | avdmanager create avd --force -n test -k "system-images;android-$API;$EMU_FLAVOR;$ABI" -c 10M
-  - |
-    EMU_PARAMS="-verbose -no-snapshot -no-window -camera-back none -camera-front none -selinux permissive -qemu -m 2048"
-    EMU_COMMAND="emulator"
-    # This double "sudo" monstrosity is used to have Travis execute the
-    # emulator with its new group permissions and help preserve the rule
-    # of least privilege.
-    sudo -E sudo -u $USER -E bash -c "${ANDROID_HOME}/emulator/${EMU_COMMAND} -avd test ${AUDIO} ${EMU_PARAMS} &"
-
-  # Wait for emulator to be ready
-  - ./.wait_for_emulator.sh
-  - adb shell input keyevent 82 &
-
-  # Switch back to our target JDK version to build and run tests
-  - JDK="${TARGET_JDK}"
-  - source ~/.install-jdk-travis.sh
-
-script:
-  - ./gradlew :app:lintGoogleplayRelease
-  - ./gradlew :app:jacocoTestReportGoogleplayDebug
-  - ./gradlew -Pcoverage :app:createGoogleplayDebugAndroidTestCoverageReport
-
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-  - curl "${GRAVIS}.clean_gradle_cache.sh" --output ~/.clean_gradle_cache.sh
-  - bash ~/.clean_gradle_cache.sh > /dev/null
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-after_success:
-  - bash <(curl -s https://codecov.io/bash)

.wait_for_emulator.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set +e
-
-bootanim=""
-failcounter=0
-timeout_in_sec=600 # 10 minutes
-
-until [[ "$bootanim" =~ "stopped" ]]; do
-  bootanim=`adb -e shell getprop init.svc.bootanim 2>&1 &`
-  if [[ "$bootanim" =~ "device not found" || "$bootanim" =~ "device offline"
-    || "$bootanim" =~ "running" || "$bootanim" =~  "error: no emulators found" ]]; then
-    let "failcounter += 1"
-    echo "Waiting for emulator to start"
-    if [[ $failcounter -gt timeout_in_sec ]]; then
-      echo "Timeout ($timeout_in_sec seconds) reached; failed to start emulator"
-      exit 1
-    fi
-  fi
-  sleep 1
-done
-
-echo "Emulator is ready"
-

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at github@tasks.org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -0,0 +1,34 @@
+### Translation
+
+You can translate Tasks using [Weblate](https://hosted.weblate.org/projects/tasks/android). To get started, register a new account or login with your GitHub account if you have one.
+
+### Opening issues
+
+Before opening an issue, please make sure that your issue:
+- is not a duplicate (i.e. it has not been reported before, closed or open)
+- has not been fixed
+- is in English (issues in a language other than English will be closed unless someone translates them)
+- does not contain multiple feature requests/bug reports. Please open a separate issue for each one.
+
+### Code contribution
+
+#### To get started with development:
+1. [Fork](https://help.github.com/articles/fork-a-repo/) and [clone](https://help.github.com/articles/cloning-a-repository/) the repository
+2. Install and launch [Android Studio's canary build](https://developer.android.com/studio/preview) (Tasks depends on some bleeding-edge features of the canary build, but in the future when those features are stabilized, you will be able to use the stable release of Android Studio)
+3. Select `File > Open`, select the Tasks directory, and accept prompts to install missing SDK components
+
+#### Set up Mapbox
+1. Register at [mapbox.com](https://www.mapbox.com)
+2. Add `tasks_mapbox_key_debug="<your_api_key>"` to your [`gradle.properties`](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) file. You can create an access token or use your [default public token](https://docs.mapbox.com/help/glossary/access-token/#default-public-token)
+
+#### Set up Google Tasks and Google Drive
+1. Register at [cloud.google.com](https://cloud.google.com)
+2. Enable [Google Tasks API](https://console.cloud.google.com/apis/library/tasks.googleapis.com) and [Google Drive API](https://console.cloud.google.com/apis/library/drive.googleapis.com)
+3. [Create android authorization credentials](https://developers.google.com/identity/protocols/OAuth2InstalledApp#creatingcred)
+
+#### Set up Google Maps and Google Places
+1. Register at [cloud.google.com](https://cloud.google.com)
+2. Enable [Google Maps SDK](https://console.cloud.google.com/apis/library/maps-android-backend.googleapis.com) and [Google Places API](https://console.cloud.google.com/apis/library/places-backend.googleapis.com)
+3. [Set up an API key](https://cloud.google.com/video-intelligence/docs/common/auth#set_up_an_api_key)
+4. Add `tasks_google_key_debug="<your_api_key>"` to your [`gradle.properties`](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) file
+5. Select `Build > Select Build Variant` and choose the `googleplay` variant

Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+gem "abbrev"

Gemfile.lock

@@ -1,161 +1,230 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    abbrev (0.1.2)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    babosa (1.0.3)
-    claide (1.0.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1196.0)
+    aws-sdk-core (3.240.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.208.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
-    digest-crc (0.4.1)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.5)
-    emoji_regex (1.0.1)
-    excon (0.72.0)
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-cookie_jar (0.0.6)
-      faraday (>= 0.7.4)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.112.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.7)
-    fastlane (2.141.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.4.0)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      babosa (>= 1.0.2, < 2.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
+      emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 0.17)
+      faraday (~> 1.0)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 0.13.1)
+      faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.29.2, < 0.37.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
-      jwt (~> 2.1.0)
+      jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multi_xml (~> 0.5)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.3.0, < 2.0.0)
-      security (= 0.1.3)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
-    google-api-client (0.36.4)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
-      google-cloud-env (~> 1.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.0)
-      faraday (~> 0.11)
-    google-cloud-errors (1.0.0)
-    google-cloud-storage (1.25.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.12)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
-    json (2.3.0)
-    jwt (2.1.0)
-    memoist (0.16.2)
-    mini_magick (4.10.1)
-    mini_mime (1.0.2)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nanaimo (0.2.6)
-    naturally (2.2.0)
-    os (1.0.1)
-    plist (3.5.0)
-    public_suffix (2.0.5)
-    representable (3.0.4)
+    httpclient (2.9.0)
+      mutex_m
+    jmespath (1.6.2)
+    json (2.12.2)
+    jwt (2.10.2)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.2.0)
+    optparse (0.6.0)
+    os (1.1.4)
+    plist (3.7.2)
+    public_suffix (6.0.2)
+    rake (13.3.0)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rouge (2.0.7)
-    rubyzip (1.3.0)
-    security (0.1.3)
-    signet (0.12.0)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
+    rexml (3.4.2)
+    rouge (3.28.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.20.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.7.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.15.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  abbrev
   fastlane
 
 BUNDLED WITH
-   2.1.2
+   2.6.9

README.md

@@ -11,29 +11,18 @@ Please visit [tasks.org](https://tasks.org) for end user documentation and suppo
 
 ---
 
-[![Donate with Bitcoin](https://img.shields.io/badge/bitcoin-donate-yellow.svg?logo=bitcoin)](https://en.cryptobadges.io/donate/136mW34jW3cmZKhxuTDn3tHXMRwbbaRU8s)
+[![Donate with Bitcoin](https://img.shields.io/badge/bitcoin-donate-yellow.svg?logo=bitcoin)](https://tasks.org/docs/donate)
 [![PayPal donate button](https://img.shields.io/badge/paypal-donate-yellow.svg?logo=paypal)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=alex@tasks.org)
 [![Liberapay donate button](https://img.shields.io/liberapay/receives/tasks.svg?logo=liberapay)](https://liberapay.com/tasks/donate)
 
-[![Build Status](https://travis-ci.org/tasks/tasks.svg?branch=master)](https://travis-ci.org/tasks/tasks) [![weblate](https://hosted.weblate.org/widgets/tasks/-/android/svg-badge.svg)](https://hosted.weblate.org/engage/tasks/?utm_source=widget) [![codecov](https://codecov.io/gh/tasks/tasks/branch/master/graph/badge.svg)](https://codecov.io/gh/tasks/tasks) [![codebeat badge](https://codebeat.co/badges/6f2274f0-1bd3-4d6b-9151-d336c5545d05)](https://codebeat.co/projects/github-com-tasks-tasks-master)
+[![build](https://github.com/tasks/tasks/actions/workflows/bundle.yml/badge.svg)](https://github.com/tasks/tasks/actions/workflows/bundle.yml) [![weblate](https://hosted.weblate.org/widgets/tasks/-/android/svg-badge.svg)](https://hosted.weblate.org/engage/tasks/?utm_source=widget) 
 
-#### To get started with development:
-1. [Fork](https://help.github.com/articles/fork-a-repo/) and [clone](https://help.github.com/articles/cloning-a-repository/) the repository
-2. Install and launch [Android Studio](https://developer.android.com/studio/index.html)
-3. Select `File > Open`, select the Tasks directory, and accept prompts to install missing SDK components
+### Contributing
 
-#### Set up Mapbox
-1. Register at [mapbox.com](https://www.mapbox.com)
-2. Add `tasks_mapbox_key_debug="<your_api_key>"` to your [`gradle.properties`](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) file. You can create an access token or use your [default public token](https://docs.mapbox.com/help/glossary/access-token/#default-public-token)
+Contributions are always welcome! Whether translations, code changes, bug reports, feature requests, or otherwise, your help is appreciated. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md).
 
-#### Set up Google Tasks and Google Drive
-1. Register at [cloud.google.com](https://cloud.google.com)
-2. Enable [Google Tasks API](https://console.cloud.google.com/apis/library/tasks.googleapis.com) and [Google Drive API](https://console.cloud.google.com/apis/library/drive.googleapis.com)
-3. [Create android authorization credentials](https://developers.google.com/identity/protocols/OAuth2InstalledApp#creatingcred)
+### Communication
 
-#### Set up Google Maps and Google Places
-1. Register at [cloud.google.com](https://cloud.google.com)
-2. Enable [Google Maps SDK](https://console.cloud.google.com/apis/library/maps-android-backend.googleapis.com) and [Google Places API](https://console.cloud.google.com/apis/library/places-backend.googleapis.com)
-3. [Set up an API key](https://cloud.google.com/video-intelligence/docs/common/auth#set_up_an_api_key)
-4. Add `tasks_google_key_debug="<your_api_key>"` to your [`gradle.properties`](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) file
-5. Select `Build > Select Build Variant` and choose the `googleplay` variant
+You can submit questions to [GitHub Discussions](https://github.com/tasks/tasks/discussions).
+
+If you have a suggestion or want to report a bug, please see [CONTRIBUTING.md](CONTRIBUTING.md).

V06_09_CHANGELOG.md

@@ -0,0 +1,579 @@
+[Newer releases](https://github.com/tasks/tasks/blob/main/CHANGELOG.md)
+
+### 9.7.3 (2020-07-07)
+
+* Fix Google Task bugs
+
+### 9.7.2 (2020-06-22)
+
+* Downgrade Mapbox SDK to remove non-free library (F-Droid only)
+
+### 9.7.1 (2020-06-19)
+
+* Fix crash on backup import
+* Fix CalDAV/EteSync subtask move bug
+
+### 9.7 (2020-06-12)
+
+* Added '☰ > Manage lists'
+  * Drag and drop to rearrange the drawer
+  * Tap to edit or delete a list
+* Display 2 additional snooze options - @rangzen
+
+### 9.6 (2020-06-06)
+
+* Add support for offline lists. Offline lists support manual ordering and infinite-depth subtasks
+* Rename 'My order' to 'Astrid manual sorting' for 'My Tasks', 'Today', and tags
+* Add '⚙ > Look and feel > Disable sort groups'
+* Add '⚙ > Look and feel > Open last viewed list'
+* Add '⚙ > Look and feel > Chips' toggles for subtasks, places, lists, and tags
+* Add '⚙ > Navigation drawer > Lists'
+* Add '⚙ > Task defaults > Default list'
+* Add '⚙ > Task defaults > New tasks on top'
+* Add '⚙ > Advanced > Astrid manual sorting'
+* Fix preference reset button
+
+### 9.5 (2020-06-03)
+
+* Drag and drop to change subtasks in all list types
+* Drag and drop to reprioritize or reschedule tasks while sorting by due date
+  or priority
+* Bug fixes
+
+### 9.4.1 (2020-06-01)
+
+* Add 'Tasks settings > Advanced > Improve performance' toggle
+* Bug fixes
+
+### 9.4 (2020-05-27)
+
+* Add collapsible group headers when sorting by due date, priority, created, or modified
+
+### 9.3.1 (2020-05-26)
+
+* Fix offline subtasks
+
+### 9.3 (2020-05-22)
+
+* Add manual sorting support for CalDAV and EteSync
+
+### 9.2 (2020-05-13)
+
+* 'New task' quick settings tile (Android 7+)
+* Search results match place names and addresses, caldav list names, google task list names, and comments
+* Fix duplicated search results
+* Began migrating codebase to Kotlin
+
+### 9.1 (2020-05-04)
+
+* 'New task' launcher shortcut (Android 7.1+)
+* Add option to disable subtask chip on widget
+
+### 9.0 (2020-05-03)
+
+* Show What's New after update
+* Collapsible subtasks enabled by default
+* 20 new icons
+* Show subtask chip even if list chips are disabled
+* Indent subtasks in 'Share' output
+* Don't trigger location reminders for snoozed or hidden tasks
+* Minimum supported version is now Android 6.0
+
+### 8.11 (2020-04-27)
+
+* Edit existing custom filters
+* Drag and drop to rearrange filter criteria
+* Swipe to delete filter criteria
+* Tap on filter criteria to choose filter operator
+* Offer additional built-in filters
+* Add sort by creation time
+* Choose any day as start of week
+
+### 8.10 (2020-04-20)
+
+* New widget features
+  * Menu button to quickly change list
+  * Expand and collapse subtasks
+  * Click on due date to reschedule
+  * Access widget settings from main app preferences
+  * Show description
+  * Show hidden task indicators
+* New widget settings
+  * Row spacing: default, compact, none
+  * Due date: after title, below title, or hidden
+  * Configure header, row, and footer opacity
+  * Configure footer click behavior
+  * Show full task title
+  * Show full description
+  * Hide dividers
+* Improve widget touch targets
+* Expand/collapse Google Task subtasks in 'My order' mode
+* Fix bug when changing sort order to/from 'My order'
+* Fix crash when switching to 'My order' list with subtasks disabled
+
+### 8.9.2 (2020-04-10)
+
+* Fix 'Add reminder' layout issues
+* Fix move between EteSync lists
+* Accept date time changes when dismissing dialog
+* Improve date time picker behavior in landscape mode
+
+### 8.9.1 (2020-04-08)
+
+* Add option to always hide check button
+* Hide check button for new tasks
+* Rearrange multi-select buttons
+* Allow more space for time buttons in date time picker
+* Fix priority button layout on smaller devices
+* Fix clicking on hidden task titles
+* Fix tag picker checkbox tint on Android 4.4
+* Fix EteSync crash on malformed iCalendar data
+
+### 8.9 (2020-04-06)
+
+* Add 'Select all' option to multi-select menu
+* Add 'Share' to menu and multi-select menu
+* Display 'Calendar event created' snackbar after creating a calendar event
+
+### 8.8 (2020-04-01)
+
+* New bottom sheet due date picker
+  * Shortcuts and calendar displayed together (Android 6+)
+* Click on due date in task list to reschedule
+* Option to autoclose due date picker after selecting a date or time
+* Redesigned title in edit screen
+* 'Discard' in overflow menu when 'Back button saves task' enabled
+* Add preference for linkifying edit screen
+* Updated date and time formatting
+* Minimum supported version is now Android 4.4
+* Custom backup/attachment directory requires Android 5+
+
+### 8.7.1 (2020-03-31)
+
+* Fix multi-account Google Task synchronization
+
+### 8.7 (2020-03-19)
+
+* Places are now lists
+  * Rename a place
+  * Assign an icon and color to a place
+* Add new navigation drawer settings
+  * Option to remove filters, tags, and places from drawer
+  * Option to hide unused tags and places in drawer
+
+### 8.6.1 (2020-03-19)
+
+* Fix crash on startup
+
+### 8.6 (2020-03-17)
+
+* Expand and collapse navigation drawer groups
+
+### 8.5 (2020-03-13)
+
+* Synchronize locations with CalDAV and EteSync
+* Fix crash when clearing completed from recently modified filter
+
+### 8.4 (2020-03-11)
+
+* New chip configuration options
+  * Outlined or filled
+  * Text and icon, text only, or icon only
+* Add option to disable color desaturation
+* Fix EteSync shared lists
+* Google Task sync requires Android 4.4+
+
+### 8.3 (2020-03-08)
+
+* Synchronize CalDAV and EteSync colors
+* Rename CalDAV and EteSync lists
+* Update Turkish translations - @emintufan
+
+### 8.2.1 (2020-03-07)
+
+* Increase default chip text contrast
+* New purchase activity
+* Fix dividers on Android 4.x
+
+### 8.2 (2020-03-04)
+
+* Choose your own app and widget colors with a color wheel
+* Dark theme now free for all
+* New 'System default' theme
+* New outlined chip style
+* Dark theme is now darker
+* Light theme is now lighter
+* Desaturate theme colors in dark mode
+* Improve dialog theming consistency
+* Bug fixes
+
+### 8.1 (2020-02-21)
+
+* Updated app settings screen
+
+### 8.0.1 (2020-02-16)
+
+* Fix missing sync settings on fdroid
+
+### 8.0 (2020-02-12)
+
+* EteSync support
+
+### 7.8 (2020-01-24)
+
+* Android AutoBackup integration
+
+### 7.7 (2020-01-21)
+
+* Add support for offline multi-level subtasks
+* Update Simplified Chinese translations - @sr093906
+
+### 7.6.1 (2020-01-17)
+
+* Fix long press in Google Task and CalDAV lists
+* Fix bug when moving multi-level CalDAV subtasks
+* Preserve remote VTODO when moving CalDAV tasks
+* Add Interlingua translations - @softinterlingua
+
+### 7.6 (2020-01-10)
+
+* Change tags with multi-select
+* Fix custom filter crash on deleted tag
+
+### 7.5 (2020-01-07)
+
+* New tag picker
+* Support self-signed SSL certificates
+
+### 7.4.2 (2019-12-30)
+
+* Fix Tasker plugin settings
+
+### 7.4.1 (2019-12-27)
+
+* Add option to enable subtasks in task list
+* Performance improvements
+* Ask Play Services to update security provider
+* Display custom icons in tag picker
+* Fix case comparison when sorting navigation drawer
+
+### 7.4 (2019-12-16)
+
+* Add Google Task and CalDAV subtasks from the edit screen
+* 'Recently modified' shows all modifications in past 24 hours
+* Fix duplicated multi-level subtask count
+* Increase checkbox touch target
+* Naturally order lists and filters
+
+### 7.3.2 (2019-12-12)
+
+* Fix slow query for subtasks
+* Fix setting icon on new CalDAV list
+* Fix clear completed for subtasks
+* Fix crash when clearing 1000+ tasks
+
+### 7.3.1 (2019-12-05)
+
+* Fix crash on missing filter
+
+### 7.3 (2019-12-03)
+
+* Expand and collapse subtasks
+
+### 7.2.2 (2019-12-03)
+
+* Fix Google Task sorting
+* Fix crash when deleting 500+ tasks
+
+### 7.2.1 (2019-11-27)
+
+* Bug fixes and minor improvements
+
+### 7.2 (2019-11-25)
+
+* Display Google Task and CalDAV subtasks in all lists (Android 5+)
+* Remove completed tasks immediately - @creywood
+
+### 7.1.2 (2019-11-22)
+
+* Add CalDAV account setting for repeating tasks
+* Fix CalDAV repeating tasks
+* Fix Google Tasks HTTP 400 response
+
+### 7.1.1 (2019-11-18)
+
+* Improve subtask query performance
+* Fix crash when deleting 1000+ CalDAV tasks
+
+### 7.1 (2019-11-14)
+
+* Display subtasks on Google Task and CalDAV widgets (Android 5+)
+* Fix subtasks after backup import
+* Fix chained subtask completion
+
+### 7.0 (2019-11-12)
+
+* Add support for CalDAV subtasks (Android 5+) - @creywood
+* Display Google subtasks in all sort modes (Android 5+)
+
+### 6.9.3 (2019-10-31)
+
+* Fix disappearance of remotely completed recurring Google Tasks
+* Fix '0 tasks' notification
+* Limit to 20 active notifications due to change in Android 10
+
+### 6.9.2 (2019-10-25)
+
+* Fix bug forcing new Google Tasks to top
+* Fix bug preventing deleted tasks from being synchronized - @creywood
+
+### 6.9.1 (2019-10-09)
+
+* Fix location reminders on Android 10
+* Fix CalDAV time zone issue
+
+### 6.9 (2019-09-23)
+
+* Synchronize tags with CalDAV
+* Target Android 10
+* Bug fixes
+
+### 6.8.1 (2019-08-05)
+
+* Fix CalDAV filter migration
+* Fix native date picker crash
+
+### 6.8 (2019-07-30)
+
+* Name your own subscription price! Upgrade, downgrade, or cancel at any time
+* Choose icons for lists (requires [subscription](https://tasks.org/subscribe))
+* Choose color for custom filters
+* Performance improvements
+* Allow duplicate CalDAV list names
+* Fix duplicate tag name bug
+
+### 6.7.3 (2019-07-16)
+
+* Workaround for [list updated time bug](https://issuetracker.google.com/issues/136123247) in Google Tasks API
+* Fix crash in CalDAV sync
+
+### 6.7.2 (2019-07-08)
+
+* Handle 404 errors when creating new Google Tasks
+* Ignore 404 errors when deleting Google Drive files
+* Don't report connection errors
+
+### 6.7.1 (2019-07-05)
+
+* Add location chip to task list
+* Reduce chip sizes
+* Accept 'send to' for more attachment types
+* Synchronize multiple accounts in parallel
+* Fix Google Task migration from older versions
+* Fix corrupted checkbox issue
+* Fix some RTL issues
+
+### 6.7 (2019-06-13)
+
+* Use drag and drop to indent tasks
+* Add new Google Tasks to top or bottom
+* Toggle hidden and completed in manually sorted Google Task lists
+* Rearrange Google Tasks without a network connection
+* Optional workaround for [custom order bug](https://issuetracker.google.com/issues/132432317) in Google Tasks API
+* Include subtasks when moving or deleting Google Tasks
+* Ignore 404 errors when fetching Google Drive folders
+* Match tags in search results
+* Fix stuck 'Generating notifications' notification
+* Don't display sync indicator when there is no network connection
+* Don't synchronize immediately after every change
+* Added Estonian translations - Eraser
+
+### 6.6.4 (2019-05-21)
+
+* Handle [breaking change](https://issuetracker.google.com/issues/133254108) in Google Tasks API
+
+### 6.6.3 (2019-05-08)
+
+* Fix backup import crash
+* Fix crash when refreshing purchases
+* Google Tasks synchronization bug fix
+
+### 6.6.2 (2019-04-22)
+
+* Backup and restore preferences
+* Google Task performance improvements
+* Google Task and Drive support added to F-Droid and Amazon
+* Add third-party licenses, changelog, and version info
+* Fix backup import crash
+* Fix widget bugs
+
+### 6.6.1 (2019-04-15)
+
+* Fix crash on devices running Android 5.1 and below
+* Fix analytics opt-out
+
+### 6.6 (2019-04-10)
+
+* New location picker
+  * Choose Mapbox or Google Maps tiles
+  * Choose Mapbox or Google Places search
+  * Google Places search restricted to subscribers due to new Google Maps pricing
+  * Use Mapbox for reverse geocoding
+  * Select from previously used locations
+  * Dark maps
+* Enable location picker in F-Droid build
+* Resume support for Amazon App Store
+* Fix Android Q background warning
+
+### 6.5.6 (2019-03-27)
+
+* Fix crash when clearing completed on a manually sorted Google Task list
+* Update Ukrainian translations - nathalier
+
+### 6.5.5 (2019-03-14)
+
+* Bug fixes
+
+### 6.5.4 (2019-03-11)
+
+* Fix black screen issue
+* Fix crash when task not found
+
+### 6.5.3 (2019-02-19)
+
+* Fix crash when upgrading from Android 7 to 8+
+* Improve OneTask interoperability
+* Performance improvement
+
+### 6.5.2 (2019-02-11)
+
+* Bug fixes
+
+### 6.5.1 (2019-02-10)
+
+* Bug fixes
+
+### 6.5 (2019-02-08)
+
+* Improve notification accuracy
+* Performance improvements
+* Bug fixes
+* Add Tagalog translations - Topol
+
+### 6.4.1 (2019-01-16)
+
+* Limit number of active notifications
+* Limit rate of notifications
+* Fix Synology Calendar sync issue
+* Fix exception when external storage is unavailable
+
+### 6.4 (2019-01-10)
+
+* Copy backups to Google Drive
+* Improved search
+* Use system file picker (Android 4.4+)
+* Use system directory picker (Android 5.0+)
+* Accept 'send' and 'send_multiple' actions with images
+* File attachment bug fixes
+
+### 6.3.1 (2018-11-07)
+
+* New location row in task edit screen
+* Add location departure notifications
+* Set CalDAV completion percentage and status
+* Bug fixes
+
+### 6.2 (2018-10-29)
+
+* New white theme color
+* New icons
+* New list and tag chips
+* Linkify text when editing tasks
+* Option to linkify text on task list
+* Show description on task list
+* Move due date next to title
+* Updated hidden task visualization
+* No longer require contacts permission (Oreo+)
+* Dropped support for Android 4.0
+
+### 6.1.3 (2018-10-22)
+
+* Fix translation error
+
+### 6.1.2 (2018-10-18)
+
+* Remove missed call functionality due to Google Play Developer policy change
+* Fix manual sort issue affecting Samsung Oreo devices
+* Fix refresh issue affecting Pure Calendar Widget
+* Fix memory leak
+* Schedule jobs with WorkManager instead of android-job
+
+### 6.1.1 (2018-07-20)
+
+* Fix notification badge issues
+* Allow non-SSL connections
+* Allow user-defined certificate authorities
+
+### 6.1 (2018-06-30)
+
+* Customize launcher icon
+* Customize shortcut widget icon and label
+* Add custom text selection action (Android 6+)
+* Target Android P
+* Remove 'Tasks' from notification body
+* Fix localization issues - @marmo
+* Fix crash when calendar permissions are revoked
+* Fix crash when opening task from widget
+* Fix crash when recording audio note
+* Fix crash when dismissing dialogs
+* Fix crash in backup import
+* Fix crash on invalid URL during CalDAV setup
+* Fix crash when editing task
+
+### 6.0.6 (2018-04-28)
+
+* Fix crash when creating shortcuts on pre-Oreo devices
+* Fix crash when Google Task or CalDAV list is missing
+* Downgrade Play Services for compatibility with MicroG
+
+### 6.0.5 (2018-04-26)
+
+* Fix crash when deleting 1000+ tasks at once
+* Fix hidden dates in date picker
+* Fix crash on bad response from billing client
+* Report crash when database fails to open
+
+### 6.0.4 (2018-04-25)
+
+* Fix crash caused by leftover Google Analytics campaign tracker
+
+### 6.0.3 (2018-04-25)
+
+* Fix crash when manually sorting Google Task lists
+* Fix multi account Google Task sync issue
+
+### 6.0.2 (2018-04-25)
+
+* Fix crash caused by missing tag metadata
+* Fix crash caused by missing Android System WebView
+* Replace Google Analytics with Firebase Analytics
+* Add Crashlytics exception reporting
+
+### 6.0.1 (2018-04-23)
+
+* Fix crash caused by missing Google Task metadata
+
+### 6.0 (2018-04-23)
+
+* Change to [annual subscription](https://tasks.org/subscribe) pricing
+* [CalDAV synchronization](https://tasks.org/caldav)
+* Sync with [multiple Google Task accounts](https://tasks.org/docs/google_tasks_intro.html)
+* Default theme changed to blue
+* Display Google Task and CalDAV chips on task list
+* Display sync error icon in navigation drawer
+* Move tasks between Google Task and CalDAV lists using multi-select
+* Add "Don't Sync" option when choosing a Google Task or CalDAV list
+* Add option to restrict background synchronization to unmetered connections
+* Custom filters with due date criteria no longer set a due time of 23:59/11:59PM
+* Internal improvements to notification scheduling should reduce notification delays
+* Fix list animation bug

V10_12_CHANGELOG.md

@@ -0,0 +1,767 @@
+### 12.7 (2022-06-18)
+
+* Android 13 themed icon - Thanks @hanthor!
+* Fix self-signed SSL certificates on Android 12+
+* Don't hide empty tags and places in pickers
+* Update translations
+  * Basque - @Txopi, Sergio Varela, @osoitz
+  * Belarusian - @Prominence, Андрей
+  * Bulgarian - @StoyanDimitrov
+  * Czech - Shimon
+  * Danish - Tntdruid
+  * Dutch - @mm4c
+  * German - @3ole
+  * Hungarian - kaciokos
+  * Indonesian - Cyua Pyua
+  * Italian - @ppasserini
+  * Polish - @wiktor-k
+  * Portuguese (Brazilian) - @LevyMarCiS, @sunflowerskater
+  * Portuguese - @laralem, @alvar0liveira
+  * Swedish - @reportxx
+  * Turkish - @emintufan
+  * Vietnamese - @unbiaseduser
+
+### 12.6.1 (2022-03-27)
+
+* Move task list and edit screen options to top level settings
+* Prompt users to customize edit screen
+* Fix cancel button for recurring reminder dialog
+* Update translations
+  * Bulgarian - @StoyanDimitrov
+  * Chinese (Simplified) - Eric, @Geeyun-JY3
+  * Croatian - @milotype
+  * Dutch - @mm4c, @fvbommel
+  * Finnish - J. Lavoie
+  * French - @FlorianLeChat
+  * Galician - @mglbranco, J. Lavoie
+  * German - @qwerty287
+  * Hungarian - kaciokos
+  * Italian - @Fs00
+  * Norwegian Bokmål - @comradekingu
+  * Polish - @wiktor-k
+  * Portuguese (Brazilian) - @tsunamistonefly
+  * Romanian - @simonaiacob
+  * Russian - Nikita Epifanov
+  * Spanish - @FlorianLeChat
+  * Swedish - @reportxx
+  * Turkish - @ersen0, @emintufan
+  * Ukrainian - @IhorHordiichuk
+  * Vietnamese - @unbiaseduser, J. Lavoie
+
+### 12.6 (2022-03-12)
+
+* Configure notifications to repeat at custom intervals
+  ([#3](https://github.com/tasks/tasks/issues/3))
+  * Notifications can repeat by minute, hour, day, or weekly intervals
+* Add 'Snoozed' filter ([#1633](https://github.com/tasks/tasks/issues/1633))
+* Add 'Notifications' filter
+* CalDAV/DAVx5 server selection setting
+  * This replaces 'Let server schedule recurring tasks'
+  * Synology Calendar users must set this to fix sync
+    ([#1802](https://github.com/tasks/tasks/issues/1802))
+  * Mailbox.org and Open-Xchange users must set this to prevent duplicate
+    repeating tasks
+* Set geofence radius in place settings
+* Remove DAVx5/EteSync app accounts when native CalDAV/EteSync enabled
+* Clear reminders when they are dismissed in Thunderbird
+* Fix reminder synchronization
+* Fix crash in task edit screen
+* Fix prompt to discard changes
+* Fix crash during 12.4 upgrade
+* Update translations
+  * Bulgarian - @StoyanDimitrov
+  * Chinese (Simplified) - @Crystal-RainSlide, @Geeyun-JY3, Eric
+  * Croatian - @milotype
+  * Dutch - @mm4c, @fvbommel
+  * French - J. Lavoie, @FlorianLeChat
+  * German - @eldiep, J. Lavoie, @qwerty287
+  * Hungarian - kaciokos
+  * Italian - @ppasserini, J. Lavoie
+  * Portuguese (Brazilian) - @hugomg
+  * Romanian - @simonaiacob
+  * Russian - @Allineer
+  * Spanish - @toni-em, @FlorianLeChat, @Romerolweb
+  * Swedish - @reportxx
+  * Turkish - @ersen0
+  * Ukrainian - @IhorHordiichuk
+  * Urdue - @Crystal-RainSlide
+  * Vietnamese - @unbaseduser
+
+### 12.5 (2022-02-27)
+
+* Choose custom random reminder period
+* Add multiple random reminders
+* Fix sync crash for Tasks.org, CalDAV, and native EteSync
+* Add Kurdish (Central) translations - @roj1512
+* Update translations
+  * Bulgarian - @StoyanDimitrov
+  * Chinese (Simplified) - Eric
+  * Croatian - @milotype
+  * Dutch - @mm4c
+  * French - @FlorianLeChat
+  * Portuguese - @laralem
+  * Spanish - @Romerolweb, Jeffree Romero
+  * Turkish - @ersen0
+  * Ukrainian - @IhorHordiichuk
+
+### 12.4 (2022-02-19)
+
+* Relative reminder support
+  * Quickly add reminders minutes, hours, days, or weeks before due
+* Sync reminders with Tasks.org, DAVx5, CalDAV, EteSync, and DecSync CC
+  * Synchronize relative and absolute reminders
+* Tasks.org, CalDAV, and native EteSync sync improvements
+  * Merge remote changes before pushing local changes
+  * Not applicable to DAVx5, EteSync app, or DecSync CC
+* View and cancel snoozed reminders in task edit screen
+* Add 'Has reminder' custom filter criteria
+* Fix updating calendar entries after editing task
+* Fix search when using top app bar
+* Fix task deletion when adding from two devices simultaneously
+* Update translations
+  * Arabic - @mhmdanas
+  * Basque - Sergio Varela
+  * Brazilian Portuguese - @Luiz-bro
+  * Bulgarian - @StoyanDimitrov
+  * Chinese (Simplified) - Eric
+  * Croatian - @milotype
+  * Dutch - @mm4c
+  * French - @FlorianLeChat, J. Lavoie
+  * German - J. Lavoie, @qwerty287
+  * Hungarian - kaciokos
+  * Italian - @ppasserini, J. Lavoie, @andrearosso
+  * Portuguese - @laralem
+  * Romanian - @simonaiacob
+  * Russian - @NikGreens
+  * Spanish - @FlorianLeChat, Sergio Varela
+  * Turkish - @ersen0, @emintufan
+  * Ukrainian - @IhorHordiichuk
+  * Vietnamese - bruh, @unbaseduser
+
+### 12.3 (2022-02-04)
+
+* Add option to disable moving completed tasks to bottom
+* Add option to disable sorting completed by completion date
+* Add undo snackbar for task completion
+* Fix crash when location lookup fails
+* Fix voice reminders on Android 12
+* Fix widget due dates in overdue sort group
+* Add Karelian translations - Olexii Ondrei
+* Update translations
+  * Basque - Sergio Varela
+  * Catalan - @ivangjxyz
+  * Chinese (Simplified) - Eric
+  * Croatian - @milotype
+  * Dutch - @mm4c
+  * French - @FlorianLeChat
+  * German - @qwerty287
+  * Hungarian - kaciokos
+  * Romanian - @simonaiacob
+  * Russian - @NikGreens
+  * Spanish - @FlorianLeChat
+  * Swedish - @reportxx
+  * Turkish - @emintufan, @ersen0
+  * Vietnamese - @unbaseduser
+
+### 12.2 (2022-01-16)
+
+* Move completed tasks to bottom
+* Add option to disable collapsing app bars
+* Uncheck parent tasks when subtask is unchecked
+* Fix crash on completion sound
+* Update translations
+  * Chinese (Simplified) - Eric
+  * Danish - @Tntdruid
+  * Dutch - @fvbommel, @mm4c
+  * French - @FlorianLeChat
+  * German - @qwerty287
+  * Russian - @NikGreens
+  * Spanish - @FlorianLeChat
+  * Turkish - @ersen0
+  * Ukrainian - @IhorHordiichuk
+  * Vietnamese - @unbaseduser
+
+### 12.1 (2022-01-09)
+
+* Group overdue tasks when sorting by due date
+* Update translations
+  * Basque - Sergio Varela
+  * Chinese (Simplified) - Eric
+  * French - @FlorianLeChat
+  * Norwegian Bokmål - @comradekingu
+  * Spanish - @FlorianLeChat
+  * Vietnamese - @unbaseduser
+
+### 12.0 (2022-01-08)
+
+* New bottom app bar
+  * Choose top or bottom app bar in settings
+* Miscellaneous design updates
+* Improve privacy and security by removing RECORD_AUDIO and
+  WRITE_EXTERNAL_STORAGE permissions
+  * Attaching an audio note will launch your device's audio recorder
+* Translation updates
+  * Catalan - @Solatec
+  * Dutch - @mm4c
+  * German - @qwerty287
+  * Italian - @ppasserini, @Fs00
+  * Portuguese - @SantosSi
+  * Romanian - @simonaiacob
+  * Russian - Nikita Epifanov
+  * Ukrainian - @IhorHordiichuk
+
+### 11.13 (2021-12-31)
+
+* Add option to play a sound when a task is completed
+* Accept audio attachments shared from other apps
+* Removed native EteSync v1 support
+  * EteSync v1 accounts can still be synchronized with the EteSync app
+* Bug fixes
+* Translation updates
+  * Bulgarian - @StoyanDimitrov
+  * Chinese (Simplified) - @sr093906
+  * Chinese (Traditional) - @dixon777
+  * Finnish - @CSharpest, Rami Lehtinen
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Italian - J. Lavoie, @Fs00
+  * Norwegian Bokmål - @comradekingu
+  * Persian - @Ahmadhosseinbor
+  * Spanish - @aplopez, @FlorianLeChat
+  * Ukrainian - @IhorHordiichuk
+
+### 11.12.3 (2021-11-22)
+
+* Fix reminders
+* Update translations
+  * Indonesian - when we were sober
+  * Kurdish (Northern) - Pêşeroja paşerojê
+  * Romanian - @Steinhagen
+
+### 11.12.2 (2021-11-13)
+
+* Fix reminders
+* Fix reminder preference backup
+* Update translations
+  * Interlingua - @softinterlingua
+  * Tamil - @balogic
+
+### 11.12.1 (2021-11-05)
+
+* Fix reminders
+* Update translations
+  * Bulgarian - @StoyanDimitrov
+  * Croatian - @milotype
+  * Norwegian Bokmål - @HumanNr4584093104
+  * Romanian - Simona Iacob
+  * Russian - @NikGreens
+  * Tamil - @balogic
+  * Turkish - @ersen0
+
+### 11.12 (2021-10-26)
+
+* Add option to notify at start date
+* Widget tweaks for Android 12
+* Fix crash when deleting tasks (Thanks @fschrempf!)
+* Fix truncated calendar picker
+* Update translations
+  * Basque - Sergio Varela
+  * Brazilian Portuguese - @laralem
+  * Bulgarian - @StoyanDimitrov
+  * Catalan - @Solatec
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - @qwerty287
+  * Hungarian - kaciokos
+  * Lithuanian - @70h
+  * Polish - @dominik-korsa
+  * Simplified Chinese - @sr093906, @Geeyun-JY3
+  * Ukrainian - @IhorHordiichuk
+  * Vietnamese - bruh
+
+### 11.11 (2021-09-21)
+
+* Add 'Due now' filter criteria - Thanks @tkterris!
+* Fix crash on Android 12 - Thanks @tkterris!
+* Fix preference display issue - Thanks @Groctel!
+* Target Android 12
+* Ignore link clicks during multi-select
+* Update translations
+  * Arabic - @mhmdanas, @machiav3lli
+  * Basque - @Thadah
+  * Brazilian Portuguese - @laralem
+  * Bulgarian - @StoyanDimitrov
+  * Croatian - @milotype
+  * Czech - @vitSkalicky
+  * Danish - @Tntdruid
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - @machiav3lli, J. Lavoie
+  * Greek - @giorgio93p
+  * Indonesian - @erigmac
+  * Italian - J. Lavoie, @Fs00
+  * Japanese - さとうまこと
+  * Lithuanian - @70h
+  * Norwegian Bokmål - @comradekingu
+  * Portuguese - @laralem
+  * Romanian - Simona Iacob
+  * Russian - @tolstovka, @zhelemysh, @ToxesFoxes
+  * Simplified Chinese - @sr093906, @Geeyun-JY3
+  * Sinhala - @Dilshan-H
+  * Spanish - @FlorianLeChat, @Groctel, @berman00
+  * Swedish - @bittin
+  * Turkish - @ersen0
+  * Ukrainian - @IhorHordiichuk
+  * Vietnamese - bruh
+
+### 11.10.2 (2021-07-15)
+
+* Fix location-based reminders
+* Fix preference backup
+* Update translations
+  * Arabic - git ty, @mhmdanas
+  * Basque - Sergio Varela
+  * Croatian - @milotype
+  * Czech - @vitSkalicky, @p-bo
+  * Dutch - Beardhatcode, @fvbommel
+  * French - @FlorianLeChat
+  * German - K. Herbert, @franconian, @ecxod, @bluedeepimpact
+  * Indonesian - when we were sober
+  * Interlingua - @softinterlingua
+  * Italian - J. Lavoie
+  * Lithuanian - @70h
+  * Norwegian Bokmål - @Jerome2103
+  * Portuguese - @laralem
+  * Russian - @KovalevArtem, @Blueberryy
+  * Simplified Chinese - @sr093906, @Geeyun-JY3
+  * Sinhala - HelaBasa
+  * Spanish - @FlorianLeChat, @fitojb
+  * Turkish - Oğuz Ersen, @emintufan
+  * Ukrainian - @IhorHordiichuk
+  * Urdu - Maaz
+  * Vietnamese - bruh
+
+### 11.10.1 (2021-05-26)
+
+* Improve Android 12 compatibility
+* Update status bar styles
+* Update translations
+  * Arabic - @mhmdanas
+  * Basque - Sergio Varela
+  * Catalan - @toram
+  * Chinese (Traditional) - @kisaragi-hiu
+  * Croatian - @ggdorman
+  * Czech - @vitSkalicky
+  * Esperanto - @J053Fabi0, @jakubfabijan
+  * French - K. Herbert, J. Lavoie
+  * German - K. Herbert
+  * Greek - Eugenia Russell
+  * Hungarian - @gthrepwood
+  * Indonesian - @andhikapangestu29
+  * Korean - Sunjae Choi
+  * Portuguese (Brazil) - @laralem
+  * Portuguese - @SantosSi, @laralem
+  * Russian - Nikita Epifanov
+  * Sinhala - @Dilshan-H
+  * Spanish - @fitojb
+  * Ukrainian - @IhorHordiichuk
+  * Urdu - Maaz
+  * Vietnamese - bruh
+
+### 11.10 (2021-04-19)
+
+* Markdown support ([Documentation](https://tasks.org/docs/markdown))
+* Samsung DeX support - Thanks @mhmdanas!
+* Update to Google Play Billing v3
+* Remove background sync for legacy EteSync v1 accounts
+* Update translations
+  * Arabic - @mhmdanas
+  * Brazilian Portuguese - @daylightdev
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat, J. Lavoie
+  * German - J. Lavoie
+  * Greek - Michalis, Eugenia Russell
+  * Indonesian - @liimee
+  * Italian - J. Lavoie, @Fs00
+  * Japanese - @kisaragi-hiu
+  * Kannada - @shashank-p
+  * Russian - @zhelemysh, Nikita Epifanov
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Turkish - Oğuz Ersen
+  * Ukrainian - @IhorHordiichuk
+  * Urdu - Maaz
+
+### 11.9.2 (2021-03-29)
+
+* Fix date translation issue - Thanks @mhmdanas!
+* Fix misc translation strings - Thanks J. Lavoie!
+* Update translations
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - @franconian, Achim Schumacher, J. Lavoie
+  * Hungarian - kaciokos
+  * Indonesian - when we were sober
+  * Italian - @Fs00
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Turkish - @emintufan
+  * Ukrainian - @IhorHordiichuk
+
+### 11.9.1 (2021-03-25)
+
+* Open documentation links in custom tabs
+* Fix crash in Mapbox reverse geocoder
+* Increase 'Add subtask' touch target
+* Update translations
+  * Arabic - @mhmdanas
+  * German - Achim Schumacher
+  * Hungarian - kaciokos
+  * Italian - @Fs00
+  * Turkish - @emintufan
+
+### 11.9 (2021-03-20)
+
+* New calendar and clock pickers
+  * New preference to default to text input for date and time
+* Fix issue causing Tasks to use wrong search provider
+* Fix crash when Nextcloud/ownCloud don't send list owner
+* Update translations
+  * Basque - Sergio Varela
+  * Croatian - @milotype
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - Achim Schumacher
+  * Hungarian - kaciokos
+  * Indonesian - when we were sober
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Ukrainian - @IhorHordiichuk
+
+### 11.8 (2021-03-15)
+
+* CalDAV: Send shared list invites
+  * Compatible with Tasks.org, Nextcloud, ownCloud, and sabre/dav
+* Show shared list invite status in list settings
+* Fix drawer count when list is shared with 2+ users
+* Removed legacy EteSync v1 list management features
+* Dropped support for Android 6.0
+* Update translations
+  * Arabic - @mhmdanas
+  * Dutch - @fvbommel
+  * Esperanto - @jakubfabijan
+  * French - @FlorianLeChat
+  * German - @Jerome2103
+  * Hungarian - kaciokos
+  * Indonesian - when we were sober, @andhikapangestu29
+  * Norwegian Bokmål - @comradekingu
+  * Polish - @doegedomita
+  * Portuguese - @Jerome2103
+  * Spanish - @FlorianLeChat
+  * Turkish - Oğuz Ersen
+  * Ukrainian - @IhorHordiichuk
+
+### 11.7 (2021-03-08)
+
+* CalDAV: Display shared list members in list settings
+  * Compatible with Tasks.org, Nextcloud, ownCloud, OpenXchange, and sabre/dav
+* CalDAV: List owners can remove shared list members from list
+  * Compatible with Tasks.org, Nextcloud, ownCloud, and sabre/dav
+* Fix time zone issue in recurrence picker
+* Update translations
+  * Arabic - @mhmdanas
+  * Basque - Sergio Varela
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Indonesian - @putulopi
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Turkish - @emintufan, Oğuz Ersen
+  * Ukrainian - @IhorHordiichuk
+
+### 11.6.1 (2021-03-11)
+
+* F-Droid: Fix OpenStreetMap crash
+
+### 11.6 (2021-03-04)
+
+* CalDAV: Display indicator in drawer when a list is shared with other users
+  * Compatible with Tasks.org, Nextcloud, ownCloud, OpenXchange, and sabre/dav
+* CalDAV: Don't upload changes to read-only lists
+  ([#931](https://github.com/tasks/tasks/issues/931))
+* Remove unnecessary icon-mirroring for RTL users
+  ([#1385](https://github.com/tasks/tasks/issues/1385) and
+  [#1391](https://github.com/tasks/tasks/pull/1391)) - Thanks to @mhmdanas
+* Update translations
+  * Arabic - @mhmdanas
+  * Basque - Sergio Varela
+  * Bulgarian - @StoyanDimitrov
+  * Czech - @vitSkalicky
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Indonesian - @putulopi
+  * Russian - Nikita Epifanov
+  * Simplified Chinese - @sr093906
+  * Sinhala - HelaBasa
+  * Spanish - @FlorianLeChat
+  * Ukrainian - @IhorHordiichuk
+
+### 11.5.2 (2021-02-25)
+
+* Fix CalDAV sync error
+* Report errors when generating recurrence dates
+
+### 11.5.1 (2021-02-24)
+
+* Fix 'repeat until' date
+* Fix repeat dates for UTC+13
+  ([#1374](https://github.com/tasks/tasks/issues/1374))
+* F-Droid: Handle null name in Nominatim reverse geocoder
+  ([#1380](https://github.com/tasks/tasks/issues/1380))
+* Update translations
+  * Basque - Sergio Varela
+  * Croatian - @ggdorman
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Norwegian Bokmål - @comradekingu
+  * Polish - @alex-ter
+  * Russian - Nikita Epifanov
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Turkish - Oğuz Ersen
+  * Ukrainian - @IhorHordiichuk
+  * Urdu - Maaz
+
+### 11.5 (2021-02-17)
+
+* Sync snooze time with Tasks.org, DAVx⁵, CalDAV, EteSync, and DecSync
+  * Compatible with Thunderbird
+* New map theme preference
+* 10 new icons
+* F-Droid: Use Nominatim for reverse geocoding
+* Google Play: Use OpenStreetMap tiles when Play Services not available
+* Google Play: Use Android location services when Play Services not available
+* Tasks.org accounts: Use Google Places for map search
+* Update translations
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * Hungarian - kaciokos
+  * Indonesian - when we were sober
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Ukrainian - @IhorHordiichuk
+
+### 11.4 (2021-02-09)
+
+* Sync collapsed subtask state with Tasks.org, DAVx⁵, CalDAV, EteSync, and
+  DecSync ([#1339](https://github.com/tasks/tasks/issues/1339))
+  * Compatible with Nextcloud and ownCloud
+* F-Droid: Add location based reminders ([#770](https://github.com/tasks/tasks/issues/770))
+* F-Droid: Replace Mapbox tiles with OpenStreetMap tiles ([#922](https://github.com/tasks/tasks/issues/922))
+* Fix default start date ([#1350](https://github.com/tasks/tasks/issues/1350))
+
+### 11.3.4 (2021-02-03)
+
+* Adjust start times by one second during sync
+  ([#1326](https://github.com/tasks/tasks/issues/1326))
+  * Can now sync start time = due time with DAVx⁵, EteSync app, and DecSync CC
+  * All day start date must come before all day due date with DAVx⁵, EteSync
+    app, and DecSync CC
+* 'Show unstarted' toggled on by default
+
+### 11.3.3 (2021-01-30)
+
+* Fix all-day due date synchronization
+  ([#1325](https://github.com/tasks/tasks/issues/1325))
+
+### 11.3.2 (2021-01-28)
+
+* Fix recurrence sync issue
+  ([#1323](https://github.com/tasks/tasks/issues/1323))
+
+### 11.3.1 (2021-01-27)
+
+* Improve support for recurring tasks with subtasks
+  * Subtasks will be unchecked after completing a recurring task
+  * Clear completed will not delete subtasks of recurring tasks
+* Improve widget sort header when space is limited
+* Add option to hide widget title
+* Fix timezone conversions during synchronization
+* Add Esperanto translations - @jakubfabijan
+
+### 11.3 (2021-01-20)
+
+* 'Hide until' is now 'Start date'
+  * Synchronize start dates with Tasks.org, DAVx⁵, CalDAV, EteSync, and DecSync
+  * New start date picker
+  * New start date custom filter criteria
+  * Add sort 'By start date'
+  * Display start dates as chips
+* Don't perform background sync when data saver enabled
+* Preference changes
+  * Add app and widget preferences to disable start date chips
+  * Synchronization accounts displayed on main preference screen
+  * Removed background sync and metered connection options (now respecting data
+    saver mode)
+  * Removed Google Tasks 'Custom order synchronization fix' (automatically
+    performing full sync if 'My order' enabled)
+* Remove support for legacy XML backup format ([more info](https://github.com/tasks/tasks/issues/1565))
+* Bug fixes
+
+### 11.2.2 (2021-01-07)
+
+* Rename 'Lists' to 'Local lists' to clarify that they are not synchronized
+* Tasks.org sign in improvements
+* Miscellaneous improvements - Thanks @mhmdanas!
+
+### 11.2.1 (2021-01-05)
+
+* Fix Portuguese translation issue
+* Report OpenTask sync errors
+* Report Tasks.org sign in errors
+* Don't crash on widget configuration error
+* Purchase dialog changes
+
+### 11.2 (2020-12-30)
+
+* [Synchronize your Tasks.org account with third-party task and calendar apps, like Outlook,
+  Thunderbird, or Apple Reminders](https://tasks.org/passwords)
+* Miscellaneous improvements - Thanks @mhmdanas!
+
+### 11.1.1 (2020-12-24)
+
+* Fix compatibility issues with third-party clients
+  * Completed tasks without completion dates
+    ([222a34f](https://github.com/tasks/tasks/commit/222a34fc263816bb23f633bc9c79de78aeb3968d))
+  * Tasks with start date but no due date
+    ([7a1d566](https://github.com/tasks/tasks/commit/7a1d566bfb613b95d3fe1df46d8fa67200c91021))
+* Miscellaneous improvements - Thanks @mhmdanas!
+
+### 11.1 (2020-12-21)
+
+* Add [DecSync CC synchronization](https://tasks.org/decsync)
+* Fix rescheduling remotely completed recurring task
+  ([5eb9370](https://github.com/tasks/tasks/commit/5eb9370294ef707b3e667c4a42851030419920d8))
+* Miscellaneous code improvements - Thanks @mhmdanas!
+
+### 11.0.1 (2020-12-17)
+
+* Fix EteSync client issue with v2 accounts
+  ([b761309](https://github.com/tasks/tasks/commit/b76130902ae0be6e1d580d588798a9ed0d7ff385))
+* Fix multi-select 'Pick time' crash
+* Fix default hide until due time
+  ([#842](https://github.com/tasks/tasks/issues/842#issuecomment-746358382))
+* Add Croatian translations - Garden Hose
+* Add Urdu translations - Maaz
+
+### 11.0 (2020-12-10)
+
+* New Tasks.org synchronization service
+* Multi-select rescheduling
+* New task default settings
+  * Default tags
+  * Default recurrence
+  * Default location
+  * Hide until due time
+* New custom filter criteria
+  * Hidden tasks
+  * Completed tasks
+  * Subtasks
+  * Parent tasks
+  * Recurring tasks
+* Added EteSync v2 support
+* Deprecated EteSync v1 support
+  * v1 accounts cannot be added to Tasks.org
+  * v1 accounts can be added to the EteSync Android client
+* Add ability to delete comments (Thanks to @romedius!)
+* Add option to always display date (Thanks to @T0M0F!)
+* Copy subtasks when copying tasks (Thanks to @supermzn!)
+* Fix ring five times cutoff (Thanks to @przemhb!)
+* Bug fixes
+* Translation updates
+  * Arabic - @mhmdanas
+  * Basque - @osoitz, @ppasserini
+  * Dutch - @fvbommel
+  * French - @FlorianLeChat
+  * German - @franconian, J. Lavoie, @myabc
+  * Hebrew - @yarons
+  * Hungarian - kaciokos
+  * Indonesian - @andikatuluspangestu
+  * Italian - @ppasserini, @Fs00, @pjammo
+  * Korean - Sunjae Choi, @Hwaro-K
+  * Norwegian Bokmål - @comradekingu
+  * Polish - @alex-ter
+  * Russian - Nikita Epifanov
+  * Simplified Chinese - @sr093906
+  * Spanish - @FlorianLeChat
+  * Traditional Chinese - @realpineapplemilk
+  * Turkish - @emintufan, Oğuz Ersen
+
+### 10.4.1 (2020-11-09)
+
+* Fix Mapbox Maps crash on Android 11 (F-Droid only)
+
+### 10.4 (2020-10-09)
+
+* New widget configuration options
+  * Sort
+  * Show hidden
+  * Show completed
+  * Header spacing
+* Bug fixes
+
+### 10.3 (2020-10-02)
+
+* Collapsible sort groups in widget
+* Add 'System default' widget theme
+* Bug fixes
+
+### 10.2 (2020-09-25)
+
+* Display list, tag, and place chips on widgets
+* Add option to disable list, tag, and place chips on widgets
+
+### 10.1 (2020-09-23)
+
+* Android 11 support
+* Backup improvements
+* Swipe-to-refresh initiates DAVx5/EteSync sync
+* Show indicator when DAVx5/EteSync are synchronizing
+* Bug fixes
+
+### 10.0.3 (2020-09-16)
+
+* Fix crash from calendar event snackbar
+* Fix crash when setting Google Maps markers
+* Fix invalid calendar entry creation
+
+### 10.0.2 (2020-09-14)
+
+* Fix crash from corrupted custom filter
+* Fix crash in 'Astrid manual sorting' mode
+* Fix missing 'Calendar event created' snackbar
+
+### 10.0.1 (2020-09-05)
+
+* Bug fixes
+* Translation updates
+  * Czech - @vitSkalicky
+  * Danish - @ChMunk
+
+### 10.0 (2020-08-31)
+
+* PRO: DAVx⁵ support (requires [DAVx⁵ beta](https://tasks.org/davx5))
+* PRO: EteSync client support
+* [ToDo Agenda](https://play.google.com/store/apps/details?id=org.andstatus.todoagenda) integration
+* Changed backstack behavior to follow Android conventions
+* Major internal changes! Please report any bugs!
+* Remove Mapbox tiles (Google Play only)
+* Added 'Astrid manual sort' information to backup file
+* Bug fixes
+* Performance improvements
+* Security improvements
+
+[Older releases](https://github.com/tasks/tasks/blob/main/V06_09_CHANGELOG.md)

app/build.gradle.kts

@@ -1,25 +1,32 @@
+@file:Suppress("UnstableApiUsage")
+
+import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
-    id("com.android.application")
-    id("checkstyle")
+    alias(libs.plugins.android.application)
+    id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     kotlin("android")
-    kotlin("kapt")
-    id("com.cookpad.android.plugin.license-tools") version "1.2.2"
-    id("com.github.ben-manes.versions") version "0.28.0"
-    id("com.vanniktech.android.junit.jacoco") version "0.16.0"
+    id("dagger.hilt.android.plugin")
+    id("com.google.android.gms.oss-licenses-plugin")
+    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.compose.compiler)
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
-repositories {
-    jcenter()
-    google()
-    maven(url = "https://jitpack.io")
+composeCompiler {
+    enableStrongSkippingMode = true
 }
 
 android {
-    val commonTest = "src/commonTest/java"
-    sourceSets["test"].java.srcDir(commonTest)
-    sourceSets["androidTest"].java.srcDirs("src/androidTest/java", commonTest)
-
     bundle {
         language {
             enableSplit = false
@@ -29,31 +36,26 @@ android {
     buildFeatures {
         viewBinding = true
         dataBinding = true
+        compose = true
+        buildConfig = true
     }
 
-    lintOptions {
-        disable("InvalidPeriodicWorkRequestInterval")
+    lint {
         lintConfig = file("lint.xml")
-        textOutput("stdout")
+        textOutput = File("stdout")
         textReport = true
     }
 
-    compileSdkVersion(Versions.targetSdk)
+    compileSdk = libs.versions.android.compileSdk.get().toInt()
 
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90703
-        versionName = "9.7.2"
-        targetSdkVersion(Versions.targetSdk)
-        minSdkVersion(Versions.minSdk)
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        kapt {
-            arguments {
-                arg("room.schemaLocation", "$projectDir/schemas")
-            }
-        }
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
+        targetSdk = libs.versions.android.targetSdk.get().toInt()
+        minSdk = libs.versions.android.minSdk.get().toInt()
+        testInstrumentationRunner = "org.tasks.TestRunner"
     }
 
     signingConfigs {
@@ -71,30 +73,32 @@ android {
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+    flavorDimensions += listOf("store")
 
     @Suppress("LocalVariableName")
     buildTypes {
-        getByName("debug") {
+        debug {
+            configure<CrashlyticsExtension> {
+                mappingFileUploadEnabled = false
+            }
             val tasks_mapbox_key_debug: String? by project
             val tasks_google_key_debug: String? by project
-
-            applicationIdSuffix = ".debug"
+            val tasks_caldav_url: String? by project
             resValue("string", "mapbox_key", tasks_mapbox_key_debug ?: "")
             resValue("string", "google_key", tasks_google_key_debug ?: "")
-            isTestCoverageEnabled = project.hasProperty("coverage")
+            resValue("string", "tasks_caldav_url", tasks_caldav_url ?: "https://caldav.tasks.org")
+            resValue("string", "tasks_nominatim_url", tasks_caldav_url ?: "https://nominatim.tasks.org")
+            resValue("string", "tasks_places_url", tasks_caldav_url ?: "https://places.tasks.org")
+            enableUnitTestCoverage = project.hasProperty("coverage")
         }
-        getByName("release") {
+        release {
             val tasks_mapbox_key: String? by project
             val tasks_google_key: String? by project
-
             resValue("string", "mapbox_key", tasks_mapbox_key ?: "")
             resValue("string", "google_key", tasks_google_key ?: "")
             isMinifyEnabled = true
@@ -103,119 +107,186 @@ android {
         }
     }
 
-    flavorDimensions("store")
-
     productFlavors {
         create("generic") {
-            setDimension("store")
+            dimension = "store"
         }
         create("googleplay") {
-            setDimension("store")
+            isDefault = true
+            dimension = "store"
+        }
+    }
+    packaging {
+        resources {
+            excludes += setOf("META-INF/*.kotlin_module", "META-INF/INDEX.LIST")
         }
     }
 
-    packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+    testOptions {
+        managedDevices {
+            localDevices {
+                create("pixel2api30") {
+                    device = "Pixel 2"
+                    apiLevel = 30
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
     }
-}
 
-configure<CheckstyleExtension> {
-    configFile = project.file("google_checks.xml")
-    toolVersion = "8.16"
+    namespace = "org.tasks"
 }
 
 configurations.all {
-    exclude(group = "com.google.guava", module = "guava-jdk5")
-    exclude(group = "org.apache.httpcomponents", module = "httpclient")
-    exclude(group = "com.google.http-client", module = "google-http-client-apache")
+    exclude(group = "org.apache.httpcomponents")
     exclude(group = "org.checkerframework")
     exclude(group = "com.google.code.findbugs")
     exclude(group = "com.google.errorprone")
     exclude(group = "com.google.j2objc")
+    exclude(group = "com.google.http-client", module = "google-http-client-apache-v2")
+    exclude(group = "com.google.http-client", module = "google-http-client-jackson2")
 }
 
 val genericImplementation by configurations
 val googleplayImplementation by configurations
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.5")
-    implementation("com.gitlab.bitfireAT:dav4jvm:2.1")
-    implementation("com.gitlab.bitfireAT:ical4android:a675c7194b")
-    implementation("com.gitlab.bitfireAT:cert4android:1488e39a66")
-
-    kapt("com.google.dagger:dagger-compiler:${Versions.dagger}")
-    implementation("com.google.dagger:dagger:${Versions.dagger}")
-
-    implementation("androidx.room:room-rxjava2:${Versions.room}")
-    kapt("androidx.room:room-compiler:${Versions.room}")
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
-    implementation("androidx.paging:paging-runtime:2.1.2")
-
-    kapt("com.jakewharton:butterknife-compiler:${Versions.butterknife}")
-    implementation("com.jakewharton:butterknife:${Versions.butterknife}")
-
-    debugImplementation("com.facebook.flipper:flipper:${Versions.flipper}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${Versions.flipper}")
-    debugImplementation("com.facebook.soloader:soloader:0.9.0")
-
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}")
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}")
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.2")
-    implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
-    implementation("com.google.code.gson:gson:2.8.6")
-    implementation("com.google.android.material:material:1.1.0")
-    implementation("androidx.annotation:annotation:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta4")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
-    implementation("androidx.preference:preference:1.1.1")
-    implementation("com.jakewharton.timber:timber:4.7.1")
-    implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0")
-    implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") {
-        isTransitive = false
+    implementation(projects.data)
+    implementation(projects.kmp)
+    implementation(projects.icons)
+    implementation(libs.androidx.navigation)
+    implementation(libs.androidx.adaptive.navigation.android)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+    implementation(libs.bitfire.dav4jvm) {
+        exclude(group = "junit")
+        exclude(group = "org.ogce", module = "xpp3")
+    }
+    implementation(libs.bitfire.ical4android) {
+        exclude(group = "commons-logging")
+        exclude(group = "org.json", module = "json")
+        exclude(group = "org.codehaus.groovy", module = "groovy")
+        exclude(group = "org.codehaus.groovy", module = "groovy-dateutil")
+    }
+    implementation(libs.bitfire.cert4android)
+    implementation(libs.dmfs.opentasks.provider) {
+        exclude("com.github.tasks.opentasks", "opentasks-contract")
     }
-    implementation("com.rubiconproject.oss:jchronic:0.2.6") {
+    implementation(libs.dmfs.rfc5545.datetime)
+    implementation(libs.dmfs.recur)
+    implementation(libs.dmfs.jems)
+
+    implementation(libs.dagger.hilt)
+    ksp(libs.dagger.hilt.compiler)
+    ksp(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.hilt.navigation)
+    implementation(libs.androidx.hilt.work)
+
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.fragment.compose)
+    implementation(libs.androidx.lifecycle.runtime)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(libs.androidx.room)
+    implementation(libs.androidx.sqlite)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.iconics)
+    implementation(libs.markwon)
+    implementation(libs.markwon.editor)
+    implementation(libs.markwon.linkify)
+    implementation(libs.markwon.strikethrough)
+    implementation(libs.markwon.tables)
+    implementation(libs.markwon.tasklist)
+
+    debugImplementation(libs.leakcanary)
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation(libs.kotlin.reflect)
+
+    implementation(libs.kotlin.jdk8)
+    implementation(libs.kotlinx.immutable)
+    implementation(libs.kotlinx.serialization)
+    implementation(libs.okhttp)
+    implementation(libs.persistent.cookiejar)
+    implementation(libs.material)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.preference)
+    implementation(libs.timber)
+    implementation(libs.dashclock.api)
+    implementation(libs.locale) {
         isTransitive = false
     }
-    implementation("org.scala-saddle:google-rfc-2445:20110304") {
+    implementation(libs.jchronic) {
         isTransitive = false
     }
-    implementation("com.wdullaer:materialdatetimepicker:4.2.3")
-    implementation("me.leolin:ShortcutBadger:1.1.22@aar")
-    implementation("com.google.apis:google-api-services-tasks:v1-rev20200129-1.30.9")
-    implementation("com.google.apis:google-api-services-drive:v3-rev20200413-1.30.9")
-    implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0")
-    implementation("androidx.work:work-runtime:${Versions.work}")
-    implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.2.1")
-    implementation("com.etesync:journalmanager:1.1.0")
-    implementation("com.github.QuadFlask:colorpicker:0.0.15")
-
-    // https://github.com/mapbox/mapbox-gl-native-android/issues/316
-    genericImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.4.1")
-
-    googleplayImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1")
-    googleplayImplementation("com.crashlytics.sdk.android:crashlytics:${Versions.crashlytics}")
-    googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}")
-    googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
-    googleplayImplementation("com.google.android.gms:play-services-location:17.0.0")
-    googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0")
-    googleplayImplementation("com.google.android.libraries.places:places:2.2.0")
-    googleplayImplementation("com.android.billingclient:billing:1.2.2")
-
-    kaptAndroidTest("com.google.dagger:dagger-compiler:${Versions.dagger}")
-    kaptAndroidTest("com.jakewharton:butterknife-compiler:${Versions.butterknife}")
-    androidTestImplementation("org.mockito:mockito-android:${Versions.mockito}")
-    androidTestImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}")
-    androidTestImplementation("androidx.test:runner:${Versions.androidx_test}")
-    androidTestImplementation("androidx.test:rules:${Versions.androidx_test}")
-    androidTestImplementation("androidx.test.ext:junit:1.1.1")
-    androidTestImplementation("androidx.annotation:annotation:1.1.0")
-
-    testImplementation("junit:junit:4.13")
-    testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}")
-    testImplementation("androidx.test:core:${Versions.androidx_test}")
-    testImplementation("org.mockito:mockito-core:${Versions.mockito}")
+    implementation(libs.shortcut.badger)
+    implementation(libs.google.api.tasks)
+    implementation(libs.google.api.drive)
+    implementation(libs.google.oauth2)
+    implementation(libs.androidx.work)
+    implementation(libs.etebase)
+    implementation(libs.colorpicker)
+    implementation(libs.appauth)
+    implementation(libs.osmdroid)
+    implementation(libs.androidx.recyclerview)
+
+    implementation(platform(libs.androidx.compose))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.compose.runtime:runtime-livedata")
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.material.icons.extended)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation(libs.coil.compose)
+    implementation(libs.coil.video)
+    implementation(libs.coil.svg)
+    implementation(libs.coil.gif)
+
+    implementation(libs.ktor)
+    implementation(libs.ktor.client.logging)
+    implementation(libs.ktor.content.negotiation)
+    implementation(libs.ktor.serialization)
+
+    implementation(libs.accompanist.permissions)
+
+    googleplayImplementation(platform(libs.firebase))
+    googleplayImplementation(libs.firebase.crashlytics)
+    googleplayImplementation(libs.firebase.analytics) {
+        exclude("com.google.android.gms", "play-services-ads-identifier")
+    }
+    googleplayImplementation(libs.firebase.config.ktx)
+    googleplayImplementation(libs.play.services.location)
+    googleplayImplementation(libs.play.services.maps)
+    googleplayImplementation(libs.play.billing.ktx)
+    googleplayImplementation(libs.play.review)
+    googleplayImplementation(libs.play.services.oss.licenses)
+    googleplayImplementation(libs.horologist.datalayer.phone)
+    googleplayImplementation(libs.horologist.datalayer.grpc)
+    googleplayImplementation(libs.horologist.datalayer.core)
+    googleplayImplementation(libs.play.services.wearable)
+    googleplayImplementation(libs.microsoft.authentication) {
+        exclude("com.microsoft.device.display", "display-mask")
+    }
+    googleplayImplementation(projects.wearDatalayer)
+
+    androidTestImplementation(libs.dagger.hilt.testing)
+    kspAndroidTest(libs.dagger.hilt.compiler)
+    kspAndroidTest(libs.androidx.hilt.compiler)
+    androidTestImplementation(libs.mockito.android)
+    androidTestImplementation(libs.make.it.easy)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.okhttp.mockwebserver)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.make.it.easy)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.mockito.core)
+    testImplementation(libs.xpp3)
 }
-
-apply(mapOf("plugin" to "com.google.gms.google-services"))

app/generic/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "org.tasks.ak",
+  "variantName": "genericRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 130804,
+      "versionName": "14.0.6",
+      "outputFile": "app-generic-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/google_checks.xml

@@ -1,263 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-    "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!-- https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-8.16/src/main/resources/google_checks.xml -->
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="warning"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-                value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-                value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="100"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens"
-                value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly"/>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-                value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-                value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapDot"/>
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapComma"/>
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
-            <property name="id" value="SeparatorWrapEllipsis"/>
-            <property name="tokens" value="ELLIPSIS"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
-            <property name="id" value="SeparatorWrapArrayDeclarator"/>
-            <property name="tokens" value="ARRAY_DECLARATOR"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapMethodRef"/>
-            <property name="tokens" value="METHOD_REF"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-                value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceBefore">
-            <property name="tokens"
-                value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="ParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens"
-                value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
-                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens"
-                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation">
-            <property name="severity" value="ignore" />
-        </module>
-        <module name="SummaryJavadoc">
-            <property name="severity" value="ignore" />
-            <property name="forbiddenSummaryFragments"
-                value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph">
-            <property name="severity" value="ignore" />
-        </module>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target"
-                value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="severity" value="ignore" />
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
-    </module>
-</module>

app/licenses.yml

@@ -1,756 +0,0 @@
-- artifact: com.gitlab.bitfireAT:dav4jvm:+
-  name: dav4jvm
-  copyrightHolder: bitfire web engineering (Ricki Hirner, Bernhard Stockmann)
-  license: Mozilla Public License, Version 2.0
-  licenseUrl: https://www.mozilla.org/en-US/MPL/2.0/
-- artifact: com.gitlab.bitfireAT:ical4android:+
-  name: ical4android
-  copyrightHolder: bitfire web engineering (Ricki Hirner, Bernhard Stockmann)
-  license: GNU General Public License, Version 3.0
-  licenseUrl: https://www.gnu.org/licenses/gpl.txt
-- artifact: com.gitlab.bitfireAT:cert4android:+
-  name: cert4android
-  copyrightHolder: bitfire web engineering (Ricki Hirner, Bernhard Stockmann)
-  licenseUrl: https://www.gnu.org/licenses/gpl.txt
-  license: GNU General Public License, Version 3.0
-- artifact: androidx.coordinatorlayout:coordinatorlayout:+
-  name: Android Support Library Coordinator Layout
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.constraintlayout:constraintlayout:+
-  name: Android ConstraintLayout
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://tools.android.com
-- artifact: androidx.sqlite:sqlite:+
-  name: Android DB
-  copyrightHolder: Android Open Source Project
-  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.google.apis:google-api-services-drive:+
-  name: Drive API v3-rev136-1.25.0
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: androidx.fragment:fragment:+
-  name: Android Support Library fragment
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.vectordrawable:vectordrawable-animated:+
-  name: Android Support AnimatedVectorDrawable
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-services:+
-  name: Mapbox services
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-java
-  forceGenerate: true
-- artifact: androidx.core:core:+
-  name: Android Support Library compat
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.arch.core:core-common:+
-  name: Android Arch-Common
-  copyrightHolder: Android Open Source Project
-  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: androidx.room:room-common:+
-  name: Android Room-Common
-  copyrightHolder: Android Open Source Project
-  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: androidx.room:room-runtime:+
-  name: Android Room-Runtime
-  copyrightHolder: Android Open Source Project
-  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.google.code.gson:gson:+
-  name: Gson
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: me.leolin:ShortcutBadger:+
-  name: ShortcutBadger
-  copyrightHolder: Leo Lin
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/leolin310148/ShortcutBadger
-- artifact: androidx.lifecycle:lifecycle-runtime:+
-  name: Android Lifecycle Runtime
-  copyrightHolder: Android Open Source Project
-  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: androidx.versionedparcelable:versionedparcelable:+
-  name: VersionedParcelable and friends
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-turf:+
-  name: Mapbox services-turf
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-java
-  forceGenerate: true
-- artifact: androidx.viewpager:viewpager:+
-  name: Android Support Library View Pager
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.mapbox.mapboxsdk:mapbox-android-core:+
-  name: Mapbox Android Core Library
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-events-android
-  forceGenerate: true
-- artifact: androidx.lifecycle:lifecycle-livedata:+
-  name: Android Lifecycle LiveData
-  copyrightHolder: Android Open Source Project
-  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: commons-codec:commons-codec:+
-  name: Apache Commons Codec
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://commons.apache.org/proper/commons-codec/
-- artifact: com.mapbox.mapboxsdk:mapbox-android-sdk:+
-  name: Mapbox Maps SDK for Android
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-gl-native
-  forceGenerate: true
-- artifact: androidx.annotation:annotation:+
-  name: Android Support Library Annotations
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.interpolator:interpolator:+
-  name: Android Support Library Interpolators
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: javax.inject:javax.inject:+
-  name: javax.inject
-  copyrightHolder: The JSR-330 Expert Group
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://code.google.com/p/atinject/
-- artifact: com.twofortyfouram:android-plugin-api-for-locale:+
-  name: android-plugin-api-for-locale
-  copyrightHolder: two forty four a.m. LLC.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: androidx.lifecycle:lifecycle-viewmodel:+
-  name: Android Lifecycle ViewModel
-  copyrightHolder: Android Open Source Project
-  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: org.scala-saddle:google-rfc-2445:+
-  name: google-rfc-2445
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://code.google.com/p/google-rfc-2445/
-- artifact: com.google.dagger:dagger:+
-  name: Dagger
-  copyrightHolder: The Dagger Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/google/dagger
-- artifact: com.google.guava:guava:+
-  name: Guava Google Core Libraries for Java
-  copyrightHolder: The Guava Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.jetbrains:annotations:+
-  name: JetBrains Java Annotations
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JetBrains/java-annotations
-- artifact: com.wdullaer:materialdatetimepicker:+
-  name: MaterialDateTimePicker
-  copyrightHolder: Wouter Dullaert
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/wdullaer/MaterialDateTimePicker
-- artifact: org.apache.commons:commons-lang3:+
-  name: Apache Commons Lang
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://commons.apache.org/proper/commons-lang/
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-geojson:+
-  name: Mapbox services-geojson
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-java
-  forceGenerate: true
-- artifact: com.mapbox.mapboxsdk:mapbox-android-telemetry:+
-  name: Mapbox Android Telemetry Library
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-events-android
-  forceGenerate: true
-- artifact: androidx.loader:loader:+
-  name: Android Support Library loader
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.cursoradapter:cursoradapter:+
-  name: Android Support Library Cursor Adapter
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.lifecycle:lifecycle-livedata-core:+
-  name: Android Lifecycle LiveData Core
-  copyrightHolder: Android Open Source Project
-  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: androidx.customview:customview:+
-  name: Android Support Library Custom View
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: io.reactivex.rxjava2:rxandroid:+
-  name: RxAndroid
-  copyrightHolder: The RxAndroid authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/ReactiveX/RxAndroid
-- artifact: androidx.swiperefreshlayout:swiperefreshlayout:+
-  name: Android Support Library Custom View
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.documentfile:documentfile:+
-  name: Android Support Library Document File
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.lifecycle:lifecycle-extensions:+
-  name: Android Lifecycle Extensions
-  copyrightHolder: Android Open Source Project
-  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: androidx.legacy:legacy-support-core-utils:+
-  name: Android Support Library core utils
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.arch.core:core-runtime:+
-  name: Android Arch-Runtime
-  copyrightHolder: Android Open Source Project
-  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: org.apache.commons:commons-collections4:+
-  name: Apache Commons Collections
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://commons.apache.org/proper/commons-collections/
-- artifact: org.mnode.ical4j:ical4j:+
-  name: ical4j
-  copyrightHolder: Ben Fortuna
-  license: BSD 3-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-3-Clause
-  url: http://ical4j.github.io
-  forceGenerate: true
-- artifact: androidx.recyclerview:recyclerview:+
-  name: Android Support RecyclerView v7
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.collection:collection:+
-  name: Android Support Library collections
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.fasterxml.jackson.core:jackson-core:+
-  name: Jackson-core
-  copyrightHolder: FasterXML
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/FasterXML/jackson-core
-- artifact: androidx.cardview:cardview:+
-  name: Android Support CardView v7
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.print:print:+
-  name: Android Support Library Print
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.rubiconproject.oss:jchronic:+
-  name: jchronic
-  copyrightHolder: The jchronic authors
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: http://github.com/samtingleff/jchronic
-- artifact: androidx.sqlite:sqlite-framework:+
-  name: Android Support SQLite - Framework Implementation
-  copyrightHolder: Android Open Source Project
-  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.google.android.material:material:+
-  name: Material Components for Android
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.localbroadcastmanager:localbroadcastmanager:+
-  name: Android Support Library Local Broadcast Manager
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.google.android.apps.dashclock:dashclock-api:+
-  name: DashClock API
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://dashclock.com/api
-- artifact: androidx.vectordrawable:vectordrawable:+
-  name: Android Support VectorDrawable
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: org.reactivestreams:reactive-streams:+
-  name: reactive-streams
-  copyrightHolder: Public domain
-  license: CC0
-  licenseUrl: http://creativecommons.org/publicdomain/zero/1.0/
-  url: http://www.reactive-streams.org/
-- artifact: androidx.work:work-runtime:+
-  name: Android WorkManager Runtime
-  copyrightHolder: Android Open Source Project
-  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: androidx.appcompat:appcompat:+
-  name: Android AppCompat Library v7
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.lifecycle:lifecycle-common:+
-  name: Android Lifecycle-Common
-  copyrightHolder: Android Open Source Project
-  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.mapbox.mapboxsdk:mapbox-sdk-core:+
-  name: Mapbox services-core
-  copyrightHolder: Mapbox
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: https://github.com/mapbox/mapbox-java
-  forceGenerate: true
-- artifact: com.mapbox.mapboxsdk:mapbox-android-gestures:+
-  name: Mapbox Android Gestures Library
-  copyrightHolder: Mapbox
-  license: BSD 2-Clause
-  licenseUrl: https://opensource.org/licenses/BSD-2-Clause
-  url: https://github.com/mapbox/mapbox-gestures-android
-  forceGenerate: true
-- artifact: androidx.lifecycle:lifecycle-process:+
-  name: Android Lifecycle Process
-  copyrightHolder: Android Open Source Project
-  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: androidx.lifecycle:lifecycle-service:+
-  name: Android Lifecycle Service
-  copyrightHolder: Android Open Source Project
-  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: androidx.transition:transition:+
-  name: Android Transition Support Library
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: com.jakewharton.timber:timber:+
-  name: Timber
-  copyrightHolder: Jake Wharton
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JakeWharton/timber
-- artifact: com.google.oauth-client:google-oauth-client:+
-  name: Google OAuth Client Library for Java
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: androidx.room:room-rxjava2:+
-  name: Android Room RXJava2
-  copyrightHolder: Android Open Source Project
-  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: androidx.drawerlayout:drawerlayout:+
-  name: Android Support Library Drawer Layout
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: io.reactivex.rxjava2:rxjava:+
-  name: RxJava
-  copyrightHolder: RxJava Contributors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/ReactiveX/RxJava
-- artifact: com.google.apis:google-api-services-tasks:+
-  name: Tasks API v1-rev55-1.25.0
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.google.api-client:google-api-client:+
-  name: Google APIs Client Library for Java
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: androidx.constraintlayout:constraintlayout-solver:+
-  name: Android ConstraintLayout Solver
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://tools.android.com
-- artifact: org.jetbrains.kotlin:kotlin-stdlib:+
-  name: org.jetbrains.kotlin:kotlin-stdlib
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
-- artifact: com.google.http-client:google-http-client:+
-  name: Google HTTP Client Library for Java
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.slf4j:slf4j-jdk14:+
-  name: SLF4J JDK14 Binding
-  copyrightHolder: QOS.ch
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: http://www.slf4j.org
-- artifact: com.squareup.okhttp3:okhttp:+
-  name: OkHttp
-  copyrightHolder: Square, Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.squareup.retrofit2:retrofit:+
-  name: Retrofit
-  copyrightHolder: Square, Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.slf4j:slf4j-api:+
-  name: SLF4J API Module
-  copyrightHolder: QOS.ch
-  license: MIT License
-  licenseUrl: http://www.opensource.org/licenses/mit-license.php
-  url: http://www.slf4j.org
-- artifact: org.jetbrains.kotlin:kotlin-stdlib-common:+
-  name: org.jetbrains.kotlin:kotlin-stdlib-common
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
-- artifact: com.google.http-client:google-http-client-jackson2:+
-  name: Jackson 2 extensions to the Google HTTP Client Library for Java.
-  copyrightHolder: Google Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.jakewharton:butterknife:+
-  name: ButterKnife
-  copyrightHolder: Jake Wharton
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JakeWharton/butterknife/
-- artifact: com.jakewharton:butterknife-annotations:+
-  name: ButterKnife Annotations
-  copyrightHolder: Jake Wharton
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JakeWharton/butterknife/
-- artifact: com.squareup.retrofit2:converter-gson:+
-  name: "Converter: Gson"
-  copyrightHolder: Square, Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.squareup.okhttp3:logging-interceptor:+
-  name: OkHttp Logging Interceptor
-  copyrightHolder: Square, Inc.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk7:+
-  name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
-- artifact: com.jakewharton:butterknife-runtime:+
-  name: ButterKnife Runtime
-  copyrightHolder: Jake Wharton
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/JakeWharton/butterknife/
-- artifact: io.grpc:grpc-context:+
-  name: io.grpc:grpc-context
-  copyrightHolder: The gRPC Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/grpc/grpc-java
-- artifact: com.google.guava:listenablefuture:+
-  name: Guava ListenableFuture only
-  copyrightHolder: The Guava Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: io.opencensus:opencensus-api:+
-  name: OpenCensus API
-  copyrightHolder: OpenCensus Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/census-instrumentation/opencensus-java
-- artifact: com.google.guava:failureaccess:+
-  name: Guava InternalFutureFailureAccess and InternalFutures
-  copyrightHolder: The Guava Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: io.opencensus:opencensus-contrib-http-util:+
-  name: OpenCensus contrib-http-util
-  copyrightHolder: OpenCensus Authors
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/census-instrumentation/opencensus-java
-- artifact: androidx.core:core-ktx:+
-  name: Core Kotlin Extensions
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.appcompat:appcompat-resources:+
-  name: Android Resources Library
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.viewpager2:viewpager2:+
-  name: AndroidX Widget ViewPager2
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.savedstate:savedstate:+
-  name: Activity
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.activity:activity:+
-  name: Activity
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.paging:paging-runtime:+
-  name: Android Paging-Runtime
-  copyrightHolder: Android Open Source Project
-  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: androidx.paging:paging-common:+
-  name: Android Paging-Common
-  copyrightHolder: Android Open Source Project
-  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: org.jetbrains.kotlinx:kotlinx-coroutines-core-common:+
-  name: kotlinx-coroutines-core-common
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/Kotlin/kotlinx.coroutines
-- artifact: org.conscrypt:conscrypt-android:+
-  name: org.conscrypt:conscrypt-android
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: https://www.apache.org/licenses/LICENSE-2.0
-  url: https://conscrypt.org/
-- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+
-  name: org.jetbrains.kotlin:kotlin-stdlib-jdk8
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
-- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-android:+
-  name: kotlinx-coroutines-android
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/Kotlin/kotlinx.coroutines
-- artifact: androidx.databinding:databinding-adapters:+
-  name: databinding-adapters
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: androidx.lifecycle:lifecycle-viewmodel-ktx:+
-  name: Android Lifecycle ViewModel Kotlin Extensions
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.annotation:annotation-experimental:+
-  name: Experimental annotation
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx
-- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-core:+
-  name: kotlinx-coroutines-core
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/Kotlin/kotlinx.coroutines
-- artifact: androidx.databinding:databinding-common:+
-  name: Data Binding Base Library
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/studio
-- artifact: androidx.databinding:databinding-runtime:+
-  name: databinding-runtime
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: org.apache.httpcomponents:httpcore:+
-  name: Apache HttpCore
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  url: http://hc.apache.org/httpcomponents-core-ga
-- artifact: androidx.databinding:viewbinding:+
-  name: viewbinding
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.madgag.spongycastle:core:+
-  name: Spongy Castle Core
-  copyrightHolder: The Legion of the Bouncy Castle Inc.
-  license: Bouncy Castle Licence
-  licenseUrl: http://www.bouncycastle.org/licence.html
-  url: http://rtyley.github.io/spongycastle/
-- artifact: com.etesync:journalmanager:+
-  name: EteSync JVM
-  copyrightHolder: Tom Hacohen
-  license: LGPL-3.0-only
-  licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html
-  url: https://www.etesync.com
-- artifact: com.madgag.spongycastle:prov:+
-  name: Spongy Castle
-  copyrightHolder: The Legion of the Bouncy Castle Inc.
-  license: Bouncy Castle Licence
-  licenseUrl: http://www.bouncycastle.org/licence.html
-  url: http://rtyley.github.io/spongycastle/
-- artifact: androidx.preference:preference:+
-  name: AndroidX Preference
-  copyrightHolder: Android Open Source Project
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx
-- artifact: androidx.lifecycle:lifecycle-viewmodel-savedstate:+
-  name: Android Lifecycle ViewModel with SavedState
-  copyrightHolder: Android Open Source Project
-  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.QuadFlask:colorpicker:+
-  name: QuadFlask/colorpicker
-  copyrightHolder: QuadFlask
-  license: The Apache Software License, Version 2.0
-  url: https://github.com/QuadFlask/colorpicker
-- artifact: com.google.auth:google-auth-library-credentials:+
-  name: Google Auth Library for Java - Credentials
-  copyrightHolder: Google Inc.
-  license: BSD 3-Clause
-- artifact: com.google.auth:google-auth-library-oauth2-http:+
-  name: Google Auth Library for Java - OAuth2 HTTP
-  copyrightHolder: Google Inc.
-  license: BSD 3-Clause
-- artifact: com.google.auto.value:auto-value-annotations:+
-  name: AutoValue Annotations
-  copyrightHolder: Google LLC
-  license: The Apache Software License, Version 2.0
-  url: https://github.com/google/auto/tree/master/value
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:+
-  name: mapbox-sdk-directions-refresh-models
-  copyrightHolder: Mapbox
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/mapbox/mapbox-java
-- artifact: com.mapbox.mapboxsdk:mapbox-sdk-directions-models:+
-  name: mapbox-sdk-directions-models
-  copyrightHolder: Mapbox
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/mapbox/mapbox-java
-- artifact: com.mapbox.mapboxsdk:mapbox-android-accounts:+
-  name: mapbox-android-accounts
-  copyrightHolder: Mapbox
-  license: Mapbox Terms of Service
-  licenseUrl: https://www.mapbox.com/tos/
-  url: https://github.com/mapbox/mapbox-accounts-android
-- artifact: com.sun.mail:android-mail:+
-  name: android-mail
-  copyrightHolder: Oracle and/or its affiliates
-  license: Eclipse Public License, Version 2.0
-- artifact: commons-io:commons-io:+
-  name: commons-io
-  copyrightHolder: The Apache Software Foundation
-  license: The Apache Software License, Version 2.0
-  url: http://commons.apache.org/proper/commons-io/
-- artifact: com.sun.mail:android-activation:+
-  name: android-activation
-  copyrightHolder: Oracle and/or its affiliates
-  license: Eclipse Public License, Version 2.0

app/proguard.pro

@@ -2,22 +2,6 @@
 
 -keep class org.tasks.** { *; }
 
-# remove logging statements
--assumenosideeffects class timber.log.Timber* {
-    public static *** v(...);
-    public static *** d(...);
-    public static *** i(...);
-}
-
-# google-rfc-2445-20110304
--dontwarn com.google.ical.compat.jodatime.**
-
-# https://github.com/JakeWharton/butterknife/blob/581666a28022796fdd62caaf3420e621215abfda/butterknife/proguard-rules.txt
--keep public class * implements butterknife.Unbinder { public <init>(**, android.view.View); }
--keep class butterknife.*
--keepclasseswithmembernames class * { @butterknife.* <methods>; }
--keepclasseswithmembernames class * { @butterknife.* <fields>; }
-
 # guava
 -dontwarn sun.misc.Unsafe
 -dontwarn java.lang.ClassValue
@@ -25,9 +9,7 @@
 -dontwarn javax.inject.**
 -dontwarn com.google.j2objc.annotations.**
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
--dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
--dontwarn com.google.errorprone.annotations.concurrent.LazyInit
--dontwarn com.google.errorprone.annotations.ForOverride
+-dontwarn com.google.errorprone.annotations.**
 
 # https://github.com/square/okhttp/blob/0b74bba08805c28f6aede626cf06f213ef6480f2/README.md
 -dontwarn okhttp3.**
@@ -44,8 +26,9 @@
 -dontwarn net.fortuna.ical4j.model.**
 -dontwarn org.codehaus.groovy.**
 -dontwarn org.apache.log4j.**             # ignore warnings from log4j dependency
+-dontwarn com.github.erosb.jsonsKema.**   # ical4android
+-dontwarn org.jparsec.**                  # ical4android
 -keep class net.fortuna.ical4j.** { *; }  # keep all model classes (properties/factories, created at runtime)
--keep class org.threeten.bp.** { *; }     # keep ThreeTen (for time zone processing)
 -keep class at.bitfire.** { *; }       # all DAVdroid code is required
 
 # https://github.com/google/google-api-java-client-samples/blob/34c3b43cb15f4ee1b636a0e01521cc81a2451dcd/tasks-android-sample/proguard-google-api-client.txt
@@ -59,4 +42,23 @@
 -dontnote java.nio.file.Files, java.nio.file.Path
 -dontnote **.ILicensingService
 -dontnote sun.misc.Unsafe
--dontwarn sun.misc.Unsafe
+-dontwarn sun.misc.Unsafe
+
+# errors from upgrading to AGP 8
+-dontwarn java.beans.Transient
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
+-dontwarn org.json.JSONString
+
+# material icons
+-keep class androidx.compose.material.icons.outlined.** { *; }
+
+# microsoft authentication
+
+-dontwarn com.microsoft.device.display.DisplayMask
+-dontwarn com.google.android.libraries.identity.**
+-dontwarn edu.umd.cs.findbugs.annotations.**
+-dontwarn com.google.crypto.tink.subtle.**
+-dontwarn net.jcip.annotations.**
+
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { <fields>; }

app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.kt

@@ -9,7 +9,7 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.test.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.tasks.R.string
@@ -27,7 +27,7 @@ class TranslationTests {
     private fun forEachLocale(callback: (Resources) -> Unit) {
         val locales = Locale.getAvailableLocales()
         for (locale in locales) {
-            callback.invoke(getResourcesForLocale(locale))
+            callback(getResourcesForLocale(locale))
         }
     }
 
@@ -38,77 +38,6 @@ class TranslationTests {
         return Resources(resources.assets, resources.displayMetrics, configuration)
     }
 
-    /** Internal test of format string parser  */
-    @Test
-    fun testFormatStringParser() {
-        var s = "abc"
-        var data = FormatStringData(s)
-        assertEquals(s, data.string)
-        assertEquals(0, data.characters.size)
-        s = "abc %s def"
-        data = FormatStringData(s)
-        assertEquals(1, data.characters.size)
-        assertEquals('s', data.characters[0])
-        s = "abc %%s def %d"
-        data = FormatStringData(s)
-        assertEquals(2, data.characters.size)
-        assertEquals('%', data.characters[0])
-        assertEquals('d', data.characters[1])
-        assertTrue(data.toString(), data.toString().contains("[%"))
-        assertTrue(data.toString(), data.toString().contains("d]"))
-        assertTrue(data.toString(), data.toString().contains(s))
-        assertTrue(data.matches(FormatStringData("espanol %% und %d si")))
-        assertFalse(data.matches(FormatStringData("ingles %d ja %% pon")))
-        s = "% abc %"
-        data = FormatStringData(s)
-        assertEquals(2, data.characters.size)
-        assertEquals(' ', data.characters[0])
-        assertEquals('\u0000', data.characters[1])
-    }
-
-    /**
-     * Test that the format specifiers in translations match exactly the translations in the default
-     * text
-     */
-    @Test
-    fun testFormatStringsMatch() {
-        val resources = InstrumentationRegistry.getTargetContext().resources
-        val strings = getResourceIds(string::class.java)
-        val formatStrings = arrayOfNulls<FormatStringData>(strings.size)
-        val failures = StringBuilder()
-        for (i in strings.indices) {
-            try {
-                val string = resources.getString(strings[i])
-                formatStrings[i] = FormatStringData(string)
-            } catch (e: Exception) {
-                val name = resources.getResourceName(strings[i])
-                failures.append(String.format("error opening %s: %s\n", name, e.message))
-            }
-        }
-        forEachLocale { r: Resources ->
-            val locale = r.configuration.locale
-            for (i in strings.indices) {
-                try {
-                    if (strings[i] == string.abc_shareactionprovider_share_with_application) {
-                        continue
-                    }
-                    val string = r.getString(strings[i])
-                    val newFS = FormatStringData(string)
-                    if (!newFS.matches(formatStrings[i])) {
-                        val name = r.getResourceName(strings[i])
-                        failures.append(String.format(
-                                "%s (%s): %s != %s\n", name, locale.toString(), newFS, formatStrings[i]))
-                    }
-                } catch (e: Exception) {
-                    val name = r.getResourceName(strings[i])
-                    failures.append(String.format(
-                            "%s: error opening %s: %s\n", locale.toString(), name, e.message))
-                }
-            }
-        }
-        assertEquals(failures.toString(), 0, errorCount(failures))
-    }
-
     /** check if string contains contains substrings  */
     private fun contains(r: Resources, resource: Int, failures: StringBuilder, expected: String) {
         val translation = r.getString(resource)
@@ -126,105 +55,11 @@ class TranslationTests {
         forEachLocale { r: Resources ->
             contains(r, string.CFC_tag_text, failures, "?")
             contains(r, string.CFC_title_contains_text, failures, "?")
+            contains(r, string.CFC_startBefore_text, failures, "?")
             contains(r, string.CFC_dueBefore_text, failures, "?")
             contains(r, string.CFC_tag_contains_text, failures, "?")
             contains(r, string.CFC_gtasks_list_text, failures, "?")
         }
         assertEquals(failures.toString(), 0, failures.toString().replace("[^\n]".toRegex(), "").length)
     }
-
-    /** Count newlines  */
-    private fun errorCount(failures: StringBuilder): Int {
-        var count = 0
-        var pos = -1
-        while (true) {
-            pos = failures.indexOf("\n", pos + 1)
-            if (pos == -1) {
-                return count
-            }
-            count++
-        }
-    }
-
-    /** @return an array of all string resource id's
-     */
-    private fun getResourceIds(resources: Class<*>): IntArray {
-        val fields = resources.declaredFields
-        val ids: MutableList<Int> = ArrayList(fields.size)
-        for (field in fields) {
-            try {
-                ids.add(field.getInt(null))
-            } catch (e: Exception) {
-                // not a field we care about
-            }
-        }
-        val idsAsIntArray = IntArray(ids.size)
-        for (i in ids.indices) {
-            idsAsIntArray[i] = ids[i]
-        }
-        return idsAsIntArray
-    }
-
-    private class FormatStringData internal constructor(
-            /** the original string  */
-            val string: String) {
-        /** format characters  */
-        val characters: CharArray
-
-        /** test that the characters match  */
-        fun matches(other: FormatStringData?): Boolean {
-            if (characters.size != other!!.characters.size) {
-                return false
-            }
-            outer@ for (i in characters.indices) {
-                if (Character.isDigit(characters[i])) {
-                    for (j in other.characters.indices) {
-                        if (characters[i] == other.characters[j]) {
-                            break@outer
-                        }
-                    }
-                    return false
-                } else if (characters[i] != other.characters[i]) {
-                    return false
-                }
-            }
-            return true
-        }
-
-        override fun toString(): String {
-            val value = StringBuilder("[")
-            for (i in characters.indices) {
-                value.append(characters[i])
-                if (i < characters.size - 1) {
-                    value.append(',')
-                }
-            }
-            value.append("]: '").append(string).append('\'')
-            return value.toString()
-        }
-
-        companion object {
-            private val scratch = CharArray(10)
-        }
-
-        init {
-            var pos = -1
-            var count = 0
-            while (true) {
-                pos = string.indexOf('%', ++pos)
-                if (pos++ == -1) {
-                    break
-                }
-                if (pos >= string.length) {
-                    scratch[count++] = '\u0000'
-                } else {
-                    scratch[count++] = string[pos]
-                }
-            }
-            characters = CharArray(count)
-            for (i in 0 until count) {
-                characters[i] = scratch[i]
-            }
-        }
-    }
 }

app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.kt

@@ -5,399 +5,372 @@
  */
 package com.todoroo.andlib.utility
 
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.tasks.Freeze.Companion.freezeAt
+import org.tasks.SuspendFreeze
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.TestUtilities.withLocale
 import org.tasks.date.DateTimeUtils
+import org.tasks.extensions.Context.is24HourFormat
+import org.tasks.extensions.Context.is24HourOverride
+import org.tasks.kmp.formatDayOfWeek
+import org.tasks.kmp.org.tasks.time.DateStyle
+import org.tasks.kmp.org.tasks.time.TextStyle
+import org.tasks.kmp.org.tasks.time.getRelativeDateTime
+import org.tasks.kmp.org.tasks.time.getRelativeDay
+import org.tasks.kmp.org.tasks.time.getTimeString
 import org.tasks.time.DateTime
-import java.time.format.FormatStyle
-import java.util.*
+import java.util.Locale
 
 @RunWith(AndroidJUnit4::class)
 class DateUtilitiesTest {
     @After
     fun after() {
-        DateUtilities.is24HourOverride = null
+        is24HourOverride = null
     }
 
     @Test
     fun testGet24HourTime() {
-        DateUtilities.is24HourOverride = true
-        assertEquals("09:05", DateUtilities.getTimeString(null, DateTime(2014, 1, 4, 9, 5, 36)))
-        assertEquals("13:00", DateUtilities.getTimeString(null, DateTime(2014, 1, 4, 13, 0, 1)))
+        is24HourOverride = true
+        assertEquals("09:05", getTimeString(DateTime(2014, 1, 4, 9, 5, 36).millis, is24HourFormat))
+        assertEquals("13:00", getTimeString(DateTime(2014, 1, 4, 13, 0, 1).millis, is24HourFormat))
     }
 
     @Test
     fun testGetTime() {
-        DateUtilities.is24HourOverride = false
-        assertEquals("9:05 AM", DateUtilities.getTimeString(null, DateTime(2014, 1, 4, 9, 5, 36)))
-        assertEquals("1:05 PM", DateUtilities.getTimeString(null, DateTime(2014, 1, 4, 13, 5, 36)))
+        is24HourOverride = false
+        assertEquals("9:05 AM", getTimeString(DateTime(2014, 1, 4, 9, 5, 36).millis, is24HourFormat))
+        assertEquals("1:05 PM", getTimeString(DateTime(2014, 1, 4, 13, 5, 36).millis, is24HourFormat))
     }
 
     @Test
     fun testGetTimeWithNoMinutes() {
-        DateUtilities.is24HourOverride = false
-        assertEquals("1 PM", DateUtilities.getTimeString(null, DateTime(2014, 1, 4, 13, 0, 59))) // derp?
+        is24HourOverride = false
+        assertEquals("1 PM", getTimeString(DateTime(2014, 1, 4, 13, 0, 59).millis, is24HourFormat)) // derp?
     }
 
     @Test
-    fun testGetDateStringWithYear() {
-        assertEquals("Jan 4, 2014", DateUtilities.getDateString(ApplicationProvider.getApplicationContext(), DateTime(2014, 1, 4, 0, 0, 0)))
+    fun testGetDateStringWithYear() = runBlocking {
+        assertEquals("Jan 4, 2014", getRelativeDay(DateTime(2014, 1, 4, 0, 0, 0).millis))
     }
 
     @Test
-    fun testGetDateStringHidingYear() {
+    fun testGetDateStringHidingYear() = runBlocking {
         freezeAt(DateTimeUtils.newDate(2014, 2, 1)) {
-            assertEquals("Jan 1", DateUtilities.getDateString(ApplicationProvider.getApplicationContext(), DateTime(2014, 1, 1)))
+            assertEquals("Jan 1", getRelativeDay(DateTime(2014, 1, 1).millis))
         }
     }
 
     @Test
-    fun testGetDateStringWithDifferentYear() {
+    fun testGetDateStringWithDifferentYear() = runBlocking {
         freezeAt(DateTimeUtils.newDate(2013, 12, 1)) {
-            assertEquals("Jan 1, 2014", DateUtilities.getDateString(ApplicationProvider.getApplicationContext(), DateTime(2014, 1, 1, 0, 0, 0)))
+            assertEquals("Jan 1, 2014", getRelativeDay(DateTime(2014, 1, 1, 0, 0, 0).millis))
         }
     }
 
     @Test
-    fun testGetWeekdayLongString() {
-        assertEquals("Sunday", DateUtilities.getWeekday(DateTimeUtils.newDate(2013, 12, 29), Locale.US))
-        assertEquals("Monday", DateUtilities.getWeekday(DateTimeUtils.newDate(2013, 12, 30), Locale.US))
-        assertEquals("Tuesday", DateUtilities.getWeekday(DateTimeUtils.newDate(2013, 12, 31), Locale.US))
-        assertEquals("Wednesday", DateUtilities.getWeekday(DateTimeUtils.newDate(2014, 1, 1), Locale.US))
-        assertEquals("Thursday", DateUtilities.getWeekday(DateTimeUtils.newDate(2014, 1, 2), Locale.US))
-        assertEquals("Friday", DateUtilities.getWeekday(DateTimeUtils.newDate(2014, 1, 3), Locale.US))
-        assertEquals("Saturday", DateUtilities.getWeekday(DateTimeUtils.newDate(2014, 1, 4), Locale.US))
+    fun testGetWeekdayLongString() = withLocale(Locale.US) {
+        assertEquals("Sunday", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 29).millis, TextStyle.FULL))
+        assertEquals("Monday", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 30).millis, TextStyle.FULL))
+        assertEquals("Tuesday", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 31).millis, TextStyle.FULL))
+        assertEquals("Wednesday", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 1).millis, TextStyle.FULL))
+        assertEquals("Thursday", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 2).millis, TextStyle.FULL))
+        assertEquals("Friday", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 3).millis, TextStyle.FULL))
+        assertEquals("Saturday", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 4).millis, TextStyle.FULL))
     }
 
     @Test
-    fun testGetWeekdayShortString() {
-        assertEquals("Sun", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2013, 12, 29), Locale.US))
-        assertEquals("Mon", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2013, 12, 30), Locale.US))
-        assertEquals("Tue", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2013, 12, 31), Locale.US))
-        assertEquals("Wed", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2014, 1, 1), Locale.US))
-        assertEquals("Thu", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2014, 1, 2), Locale.US))
-        assertEquals("Fri", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2014, 1, 3), Locale.US))
-        assertEquals("Sat", DateUtilities.getWeekdayShort(DateTimeUtils.newDate(2014, 1, 4), Locale.US))
+    fun testGetWeekdayShortString() = withLocale(Locale.US) {
+        assertEquals("Sun", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 29).millis, TextStyle.SHORT))
+        assertEquals("Mon", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 30).millis, TextStyle.SHORT))
+        assertEquals("Tue", formatDayOfWeek(DateTimeUtils.newDate(2013, 12, 31).millis, TextStyle.SHORT))
+        assertEquals("Wed", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 1).millis, TextStyle.SHORT))
+        assertEquals("Thu", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 2).millis, TextStyle.SHORT))
+        assertEquals("Fri", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 3).millis, TextStyle.SHORT))
+        assertEquals("Sat", formatDayOfWeek(DateTimeUtils.newDate(2014, 1, 4).millis, TextStyle.SHORT))
     }
 
     @Test
-    fun getRelativeFullDate() {
+    fun getRelativeFullDate() = withLocale(Locale.US) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "Sunday, January 14",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.US,
-                            FormatStyle.FULL))
+                "Sunday, January 14",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun getRelativeFullDateWithYear() {
+    fun getRelativeFullDateWithYear() = withLocale(Locale.US) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "Sunday, January 14, 2018",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.US,
-                            FormatStyle.FULL))
+                "Sunday, January 14, 2018",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun getRelativeFullDateTime() {
+    fun getRelativeFullDateTime() = withLocale(Locale.US) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertMatches(
-                    "Sunday, January 14( at)? 1:43 PM",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 43, 1).millis,
-                            Locale.US,
-                            FormatStyle.FULL))
+                "Sunday, January 14( at)? 1:43 PM",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 43, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun getRelativeFullDateTimeWithYear() {
+    @Ignore("Fails on CI - need to investigate")
+    fun getRelativeDateTimeWithAlwaysDisplayFullDateOption() = withLocale(Locale.US) {
+        freezeAt(DateTime(2020, 1, 1)) {
+            assertMatches(
+                "Thursday, January 2 at 11:50 AM",
+                getRelativeDateTime(DateTime(2020, 1, 2, 11, 50, 1).millis, is24HourFormat, DateStyle.FULL, true, false)
+            )
+        }
+    }
+
+    @Test
+    fun getRelativeFullDateTimeWithYear() = withLocale(Locale.US) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertMatches(
-                    "Sunday, January 14, 2018( at)? 11:50 AM",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 11, 50, 1).millis,
-                            Locale.US,
-                            FormatStyle.FULL))
+                "Sunday, January 14, 2018( at)? 11:50 AM",
+                getRelativeDateTime(DateTime(2018, 1, 14, 11, 50, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
+        }
+    }
+
+    @Test
+    fun getRelativeDayWithAlwaysDisplayFullDateOption() = withLocale(Locale.US) {
+        freezeAt(DateTime(2020, 1, 1)) {
+            assertEquals(
+                    "Thursday, January 2",
+                    getRelativeDay(DateTime(2020, 1, 2, 11, 50, 1).millis, DateStyle.FULL, alwaysDisplayFullDate = true, lowercase = true)
+            )
         }
     }
 
     @Test
-    fun germanDateNoYear() {
+    fun getRelativeDayWithoutAlwaysDisplayFullDateOption() = withLocale(Locale.US) {
+        freezeAt(DateTime(2020, 1, 1)) {
+            assertEquals(
+                    "tomorrow",
+                    getRelativeDay(DateTime(2020, 1, 2, 11, 50, 1).millis, DateStyle.FULL, lowercase = true)
+            )
+        }
+    }
+
+    @Test
+    fun germanDateNoYear() = withLocale(Locale.GERMAN) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "Sonntag, 14. Januar",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.GERMAN,
-                            FormatStyle.FULL))
+                "Sonntag, 14. Januar",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun germanDateWithYear() {
+    fun germanDateWithYear() = withLocale(Locale.GERMAN) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "Sonntag, 14. Januar 2018",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.GERMAN,
-                            FormatStyle.FULL))
+                "Sonntag, 14. Januar 2018",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun koreanDateNoYear() {
+    fun koreanDateNoYear() = withLocale(Locale.KOREAN) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "1월 14일 일요일",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.KOREAN,
-                            FormatStyle.FULL))
+                "1월 14일 일요일",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun koreanDateWithYear() {
+    fun koreanDateWithYear() = withLocale(Locale.KOREAN) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "2018년 1월 14일 일요일",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.KOREAN,
-                            FormatStyle.FULL))
+                "2018년 1월 14일 일요일",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun japaneseDateNoYear() {
+    fun japaneseDateNoYear() = withLocale(Locale.JAPANESE) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "1月14日日曜日",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.JAPANESE,
-                            FormatStyle.FULL))
+                "1月14日日曜日",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun japaneseDateWithYear() {
+    fun japaneseDateWithYear() = withLocale(Locale.JAPANESE) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "2018年1月14日日曜日",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.JAPANESE,
-                            FormatStyle.FULL))
+                "2018年1月14日日曜日",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun chineseDateNoYear() {
+    fun chineseDateNoYear() = withLocale(Locale.CHINESE) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "1月14日星期日",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.CHINESE,
-                            FormatStyle.FULL))
+                "1月14日星期日",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun chineseDateWithYear() {
-        freezeAt(DateTime(2017, 12, 12)) {
+    fun chineseDateWithYear() = withLocale(Locale.CHINESE) {
+        SuspendFreeze.freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "2018年1月14日星期日",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14).millis,
-                            Locale.CHINESE,
-                            FormatStyle.FULL))
+                "2018年1月14日星期日",
+                getRelativeDateTime(DateTime(2018, 1, 14).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun chineseDateTimeNoYear() {
+    fun chineseDateTimeNoYear() = withLocale(Locale.CHINESE) {
         freezeAt(DateTime(2018, 1, 1)) {
             assertEquals(
-                    "1月14日星期日 上午11:53",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 11, 53, 1).millis,
-                            Locale.CHINESE,
-                            FormatStyle.FULL))
+                "1月14日星期日 上午11:53",
+                getRelativeDateTime(DateTime(2018, 1, 14, 11, 53, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun chineseDateTimeWithYear() {
+    fun chineseDateTimeWithYear() = withLocale(Locale.CHINESE) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "2018年1月14日星期日 下午1:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.CHINESE,
-                            FormatStyle.FULL))
+                "2018年1月14日星期日 下午1:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun frenchDateTimeWithYear() {
+    fun frenchDateTimeWithYear() = withLocale(Locale.FRENCH) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertMatches(
-                    "dimanche 14 janvier 2018( à)? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.FRENCH,
-                            FormatStyle.FULL))
+                "dimanche 14 janvier 2018( à)? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun indiaDateTimeWithYear() {
+    fun indiaDateTimeWithYear() = withLocale(Locale.forLanguageTag("hi-IN")) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertMatches(
-                    "रविवार, 14 जनवरी 2018( को)? 1:45 pm",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("hi-IN"),
-                            FormatStyle.FULL))
+                "रविवार, 14 जनवरी 2018( को)? 1:45 pm",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun russiaDateTimeNoYear() {
+    fun russiaDateTimeNoYear() = withLocale(Locale.forLanguageTag("ru")) {
         freezeAt(DateTime(2018, 12, 12)) {
             assertMatches(
-                    "воскресенье, 14 января,? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("ru"),
-                            FormatStyle.FULL))
+                "воскресенье, 14 января,? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun russiaDateTimeWithYear() {
+    fun russiaDateTimeWithYear() = withLocale(Locale.forLanguageTag("ru")) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertMatches(
-                    "воскресенье, 14 января 2018 г.,? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("ru"),
-                            FormatStyle.FULL))
+                "воскресенье, 14 января 2018 г.,? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun brazilDateTimeNoYear() {
+    fun brazilDateTimeNoYear() = withLocale(Locale.forLanguageTag("pt-br")) {
         freezeAt(DateTime(2018, 12, 12)) {
             assertEquals(
-                    "domingo, 14 de janeiro 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("pt-br"),
-                            FormatStyle.FULL))
+                "domingo, 14 de janeiro 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun brazilDateTimeWithYear() {
+    fun brazilDateTimeWithYear() = withLocale(Locale.forLanguageTag("pt-br")) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertEquals(
-                    "domingo, 14 de janeiro de 2018 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("pt-br"),
-                            FormatStyle.FULL))
+                "domingo, 14 de janeiro de 2018 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun spainDateTimeNoYear() {
+    fun spainDateTimeNoYear() = withLocale(Locale.forLanguageTag("es")) {
         freezeAt(DateTime(2018, 12, 12)) {
             assertMatches(
-                    "domingo, 14 de enero,? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("es"),
-                            FormatStyle.FULL))
+                "domingo, 14 de enero,? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun spainDateTimeWithYear() {
+    fun spainDateTimeWithYear() = withLocale(Locale.forLanguageTag("es")) {
         freezeAt(DateTime(2017, 12, 12)) {
             assertMatches(
-                    "domingo, 14 de enero de 2018,? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("es"),
-                            FormatStyle.FULL))
+                "domingo, 14 de enero de 2018,? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun hebrewDateTimeNoYear() {
+    fun hebrewDateTimeNoYear() = withLocale(Locale.forLanguageTag("he")) {
         freezeAt(DateTime(2018, 12, 12)) {
             assertMatches(
-                    "יום ראשון, 14 בינואר( בשעה)? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("iw"),
-                            FormatStyle.FULL))
+                "יום ראשון, 14 בינואר( בשעה)? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
     @Test
-    fun hebrewDateTimeWithYear() {
+    fun hebrewDateTimeWithYear() = withLocale(Locale.forLanguageTag("he")) {
         freezeAt(DateTime(2017, 12, 12)) {
-
             assertMatches(
-                    "יום ראשון, 14 בינואר 2018( בשעה)? 13:45",
-                    DateUtilities.getRelativeDateTime(
-                            ApplicationProvider.getApplicationContext(),
-                            DateTime(2018, 1, 14, 13, 45, 1).millis,
-                            Locale.forLanguageTag("iw"),
-                            FormatStyle.FULL))
+                "יום ראשון, 14 בינואר 2018( בשעה)? 13:45",
+                getRelativeDateTime(DateTime(2018, 1, 14, 13, 45, 1).millis, is24HourFormat, DateStyle.FULL)
+            )
         }
     }
 
-    private fun assertMatches(regex: String, actual: String) = assertTrue(actual.matches(Regex(regex)))
+    private fun assertMatches(regex: String, actual: String) =
+        assertTrue("expected=$regex\nactual=$actual", actual.matches(Regex(regex)))
+
+    private val is24HourFormat: Boolean
+        get() = InstrumentationRegistry.getInstrumentation().targetContext.is24HourFormat
 }

app/src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.kt

@@ -1,16 +1,17 @@
 package com.todoroo.andlib.utility
 
-import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.tasks.Freeze
+import org.tasks.kmp.org.tasks.time.DateStyle
+import org.tasks.kmp.org.tasks.time.getRelativeDay
 import org.tasks.time.DateTime
-import java.time.format.FormatStyle
-import java.util.*
+import java.util.Locale
 
 @RunWith(AndroidJUnit4::class)
 class RelativeDayTest {
@@ -67,12 +68,12 @@ class RelativeDayTest {
         checkRelativeDay(DateTime().plusDays(7), "January 7, 2014", "Jan 7, 2014")
     }
 
-    private fun checkRelativeDay(now: DateTime, full: String, abbreviated: String) {
+    private fun checkRelativeDay(now: DateTime, full: String, abbreviated: String) = runBlocking {
         assertEquals(
                 full,
-                DateUtilities.getRelativeDay(ApplicationProvider.getApplicationContext(), now.millis, Locale.US, FormatStyle.LONG))
+                getRelativeDay(now.millis, DateStyle.LONG))
         assertEquals(
                 abbreviated,
-                DateUtilities.getRelativeDay(ApplicationProvider.getApplicationContext(), now.millis, Locale.US, FormatStyle.MEDIUM))
+                getRelativeDay(now.millis))
     }
 }

app/src/androidTest/java/com/todoroo/astrid/activity/MainActivityTest.kt

@@ -0,0 +1,32 @@
+package com.todoroo.astrid.activity
+
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.tasks.extensions.isFromHistory
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityTest {
+    @Test
+    fun newTaskIsNotFromHistory() {
+        assertFalse(Intent().setFlags(FLAG_ACTIVITY_NEW_TASK).isFromHistory)
+    }
+
+    @Test
+    fun oldTaskIsNotFromHistory() {
+        assertFalse(Intent().setFlags(FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY).isFromHistory)
+    }
+
+    @Test
+    fun newTaskIsFromHistory() {
+        assertTrue(
+                Intent()
+                        .setFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)
+                        .isFromHistory)
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavManualSortTaskAdapterTest.kt

@@ -1,25 +1,27 @@
 package com.todoroo.astrid.adapter
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
-import com.todoroo.astrid.api.CaldavFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import com.todoroo.astrid.service.TaskMover
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
-import org.tasks.data.CaldavCalendar
-import org.tasks.data.CaldavDao
-import org.tasks.data.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.Task
+import org.tasks.filters.CaldavFilter
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_PARENT
 import org.tasks.makers.CaldavTaskMaker.TASK
@@ -31,17 +33,21 @@ import org.tasks.preferences.Preferences
 import org.tasks.time.DateTime
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class CaldavManualSortTaskAdapterTest : InjectingTestCase() {
     @Inject lateinit var googleTaskDao: GoogleTaskDao
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var preferences: Preferences
     @Inject lateinit var localBroadcastManager: LocalBroadcastManager
+    @Inject lateinit var taskMover: TaskMover
 
     private lateinit var adapter: CaldavManualSortTaskAdapter
     private val tasks = ArrayList<TaskContainer>()
-    private val filter = CaldavFilter(CaldavCalendar("calendar", "1234"))
+    private val filter = CaldavFilter(
+        calendar = CaldavCalendar(name = "calendar", uuid = "1234"),
+        account = CaldavAccount(accountType = TYPE_CALDAV)
+    )
     private val dataSource = object : TaskAdapterDataSource {
         override fun getItem(position: Int) = tasks[position]
 
@@ -54,7 +60,7 @@ class CaldavManualSortTaskAdapterTest : InjectingTestCase() {
         preferences.clear()
         preferences.setBoolean(R.string.p_manual_sort, true)
         tasks.clear()
-        adapter = CaldavManualSortTaskAdapter(googleTaskDao, caldavDao, taskDao, localBroadcastManager)
+        adapter = CaldavManualSortTaskAdapter(googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover)
         adapter.setDataSource(dataSource)
     }
 
@@ -213,16 +219,16 @@ class CaldavManualSortTaskAdapterTest : InjectingTestCase() {
         checkOrder(created.plusSeconds(6), 3)
     }
 
-    private fun move(from: Int, to: Int, indent: Int = 0) {
-        tasks.addAll(taskDao.fetchTasks { getQuery(preferences, filter, it) })
+    private fun move(from: Int, to: Int, indent: Int = 0) = runBlocking {
+        tasks.addAll(taskDao.fetchTasks(getQuery(preferences, filter)))
         val adjustedTo = if (from < to) to + 1 else to // match DragAndDropRecyclerAdapter behavior
         adapter.moved(from, adjustedTo, indent)
     }
 
     private fun checkOrder(dateTime: DateTime, index: Int) = checkOrder(dateTime.toAppleEpoch(), index)
 
-    private fun checkOrder(order: Long?, index: Int) {
-        val sortOrder = caldavDao.getTask(adapter.getTask(index).id)!!.order
+    private fun checkOrder(order: Long?, index: Int) = runBlocking {
+        val sortOrder = taskDao.fetch(adapter.getTask(index).id)!!.order
         if (order == null) {
             assertNull(sortOrder)
         } else {
@@ -230,7 +236,7 @@ class CaldavManualSortTaskAdapterTest : InjectingTestCase() {
         }
     }
 
-    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long {
+    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long = runBlocking {
         val task = newTask(*properties)
         taskDao.createNew(task)
         val remoteParent = if (task.parent > 0) caldavDao.getRemoteIdForTask(task.parent) else null
@@ -239,8 +245,6 @@ class CaldavManualSortTaskAdapterTest : InjectingTestCase() {
                         with(TASK, task.id),
                         with(CALENDAR, "1234"),
                         with(REMOTE_PARENT, remoteParent)))
-        return task.id
+        task.id
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/com/todoroo/astrid/adapter/CaldavTaskAdapterTest.kt

@@ -1,28 +1,31 @@
 package com.todoroo.astrid.adapter
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
 import com.todoroo.astrid.dao.TaskDao
+import com.todoroo.astrid.service.TaskMover
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.LocalBroadcastManager
 import org.tasks.data.*
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.makers.TaskContainerMaker.PARENT
 import org.tasks.makers.TaskContainerMaker.newTaskContainer
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class CaldavTaskAdapterTest : InjectingTestCase() {
-
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var googleTaskDao: GoogleTaskDao
     @Inject lateinit var localBroadcastManager: LocalBroadcastManager
+    @Inject lateinit var taskMover: TaskMover
 
     private lateinit var adapter: TaskAdapter
     private val tasks = ArrayList<TaskContainer>()
@@ -32,7 +35,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
         super.setUp()
 
         tasks.clear()
-        adapter = TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager)
+        adapter = TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover)
         adapter.setDataSource(object : TaskAdapterDataSource {
             override fun getItem(position: Int) = tasks[position]
 
@@ -135,7 +138,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
     }
 
     @Test
-    fun movingTaskToNewParentSetsId() {
+    fun movingTaskToNewParentSetsId() = runBlocking {
         addTask()
         addTask()
 
@@ -145,7 +148,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
     }
 
     @Test
-    fun movingTaskToNewParentSetsRemoteId() {
+    fun movingTaskToNewParentSetsRemoteId() = runBlocking {
         addTask()
         addTask()
 
@@ -158,7 +161,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
     }
 
     @Test
-    fun unindentingTaskRemovesParent() {
+    fun unindentingTaskRemovesParent() = runBlocking {
         addTask()
         addTask(with(PARENT, tasks[0]))
 
@@ -169,7 +172,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
     }
 
     @Test
-    fun moveSubtaskUpToParent() {
+    fun moveSubtaskUpToParent() = runBlocking {
         addTask()
         addTask(with(PARENT, tasks[0]))
         addTask(with(PARENT, tasks[1]))
@@ -180,7 +183,7 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
     }
 
     @Test
-    fun moveSubtaskUpToGrandparent() {
+    fun moveSubtaskUpToGrandparent() = runBlocking {
         addTask()
         addTask(with(PARENT, tasks[0]))
         addTask(with(PARENT, tasks[1]))
@@ -191,26 +194,20 @@ class CaldavTaskAdapterTest : InjectingTestCase() {
         assertEquals(tasks[0].id, taskDao.fetch(tasks[3].id)!!.parent)
     }
 
-    private fun addTask(vararg properties: PropertyValue<in TaskContainer?, *>) {
+    private fun addTask(vararg properties: PropertyValue<in TaskContainer?, *>) = runBlocking {
         val t = newTaskContainer(*properties)
-        tasks.add(t)
         val task = t.task
         taskDao.createNew(task)
-        val caldavTask = CaldavTask(t.id, "calendar")
+        val caldavTask = CaldavTask(task = t.id, calendar = "calendar")
         if (task.parent > 0) {
             caldavTask.remoteParent = caldavDao.getRemoteIdForTask(task.parent)
         }
-        caldavTask.id = caldavDao.insert(caldavTask)
-        t.caldavTask = caldavTask.toSubset()
-    }
-
-    private fun CaldavTask.toSubset(): SubsetCaldav {
-        val result = SubsetCaldav()
-        result.cd_id = id
-        result.cd_calendar = calendar
-        result.cd_remote_parent = remoteParent
-        return result
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}
+        tasks.add(
+            t.copy(
+                caldavTask = caldavTask.copy(
+                    id = caldavDao.insert(caldavTask)
+                )
+            )
+        )
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/adapter/GoogleTaskManualSortAdapterTest.kt

@@ -1,46 +1,49 @@
 package com.todoroo.astrid.adapter
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
-import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import com.todoroo.astrid.service.TaskMover
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.LocalBroadcastManager
 import org.tasks.R
-import org.tasks.data.CaldavDao
-import org.tasks.data.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.Task
+import org.tasks.filters.CaldavFilter
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GoogleTaskListMaker.REMOTE_ID
-import org.tasks.makers.GoogleTaskListMaker.newGoogleTaskList
-import org.tasks.makers.GoogleTaskMaker
-import org.tasks.makers.GoogleTaskMaker.LIST
-import org.tasks.makers.GoogleTaskMaker.TASK
-import org.tasks.makers.GoogleTaskMaker.newGoogleTask
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
 import org.tasks.makers.TaskMaker.PARENT
 import org.tasks.makers.TaskMaker.newTask
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class GoogleTaskManualSortAdapterTest : InjectingTestCase() {
-
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var googleTaskDao: GoogleTaskDao
     @Inject lateinit var preferences: Preferences
     @Inject lateinit var localBroadcastManager: LocalBroadcastManager
+    @Inject lateinit var taskMover: TaskMover
 
     private lateinit var adapter: GoogleTaskManualSortAdapter
     private val tasks = ArrayList<TaskContainer>()
-    private val filter = GtasksFilter(newGoogleTaskList(with(REMOTE_ID, "1234")))
+    private val filter = CaldavFilter(
+        calendar = CaldavCalendar(uuid = "1234"),
+        account = CaldavAccount(accountType = TYPE_GOOGLE_TASKS)
+    )
     private val dataSource = object : TaskAdapterDataSource {
         override fun getItem(position: Int) = tasks[position]
 
@@ -415,35 +418,33 @@ class GoogleTaskManualSortAdapterTest : InjectingTestCase() {
         preferences.clear()
         preferences.setBoolean(R.string.p_manual_sort, true)
         tasks.clear()
-        adapter = GoogleTaskManualSortAdapter(googleTaskDao, caldavDao, taskDao, localBroadcastManager)
+        adapter = GoogleTaskManualSortAdapter(googleTaskDao, caldavDao, taskDao, localBroadcastManager, taskMover)
         adapter.setDataSource(dataSource)
     }
 
-    private fun move(from: Int, to: Int, indent: Int = 0) {
-        tasks.addAll(taskDao.fetchTasks { getQuery(preferences, filter, it) })
+    private fun move(from: Int, to: Int, indent: Int = 0) = runBlocking {
+        tasks.addAll(taskDao.fetchTasks(getQuery(preferences, filter)))
         val adjustedTo = if (from < to) to + 1 else to
         adapter.moved(from, adjustedTo, indent)
     }
 
-    private fun checkOrder(order: Long, index: Int, parent: Long = 0) {
-        val googleTask = googleTaskDao.getByTaskId(adapter.getTask(index).id)!!
+    private fun checkOrder(order: Long, index: Int, parent: Long = 0) = runBlocking {
+        val googleTask = taskDao.fetch(adapter.getTask(index).id)!!
         assertEquals(order, googleTask.order)
         assertEquals(parent, googleTask.parent)
     }
 
-    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long {
+    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long = runBlocking {
         val task = newTask(*properties)
-        val parent = task.parent
-        task.parent = 0
         taskDao.createNew(task)
         googleTaskDao.insertAndShift(
-                newGoogleTask(
-                        with(TASK, task.id),
-                        with(LIST, "1234"),
-                        with(GoogleTaskMaker.PARENT, parent)),
-                false)
-        return task.id
+            task,
+            newCaldavTask(
+                with(TASK, task.id),
+                with(CALENDAR, "1234"),
+            ),
+            false
+        )
+        task.id
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/com/todoroo/astrid/adapter/NonRecursiveQueryTest.kt

@@ -1,79 +0,0 @@
-package com.todoroo.astrid.adapter
-
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.natpryce.makeiteasy.MakeItEasy.with
-import com.natpryce.makeiteasy.PropertyValue
-import com.todoroo.astrid.core.BuiltInFilterExposer
-import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.LocalBroadcastManager
-import org.tasks.R
-import org.tasks.data.CaldavDao
-import org.tasks.data.GoogleTaskDao
-import org.tasks.data.TaskContainer
-import org.tasks.data.TaskListQuery.getQuery
-import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.TaskMaker.PARENT
-import org.tasks.makers.TaskMaker.newTask
-import org.tasks.preferences.Preferences
-import javax.inject.Inject
-
-@RunWith(AndroidJUnit4::class)
-class NonRecursiveQueryTest : InjectingTestCase() {
-
-    @Inject lateinit var googleTaskDao: GoogleTaskDao
-    @Inject lateinit var caldavDao: CaldavDao
-    @Inject lateinit var taskDao: TaskDao
-    @Inject lateinit var preferences: Preferences
-    @Inject lateinit var localBroadcastManager: LocalBroadcastManager
-
-    private lateinit var adapter: TaskAdapter
-    private val tasks = ArrayList<TaskContainer>()
-    private val filter = BuiltInFilterExposer.getMyTasksFilter(ApplicationProvider.getApplicationContext<Context>().resources)
-    private val dataSource = object : TaskAdapterDataSource {
-        override fun getItem(position: Int) = tasks[position]
-
-        override fun getTaskCount() = tasks.size
-    }
-
-    @Before
-    override fun setUp() {
-        super.setUp()
-        preferences.clear()
-        preferences.setBoolean(R.string.p_use_paged_queries, true)
-        tasks.clear()
-        adapter = TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager)
-        adapter.setDataSource(dataSource)
-    }
-
-    @Test
-    fun ignoreSubtasks() {
-        val parent = addTask()
-        val child = addTask(with(PARENT, parent))
-
-        query()
-
-        assertEquals(child, tasks[1].id)
-        assertEquals(parent, tasks[1].parent)
-        assertEquals(0, tasks[1].indent)
-    }
-
-    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long {
-        val task = newTask(*properties)
-        taskDao.createNew(task)
-        return task.id
-    }
-
-    private fun query() {
-        tasks.addAll(taskDao.fetchTasks { getQuery(preferences, filter, it) })
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}

app/src/androidTest/java/com/todoroo/astrid/adapter/OfflineSubtaskTest.kt

@@ -1,54 +1,34 @@
 package com.todoroo.astrid.adapter
 
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
-import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.LocalBroadcastManager
-import org.tasks.data.CaldavDao
-import org.tasks.data.GoogleTaskDao
 import org.tasks.data.TaskContainer
 import org.tasks.data.TaskListQuery.getQuery
+import org.tasks.data.entity.Task
+import org.tasks.filters.MyTasksFilter
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.makers.TaskMaker.PARENT
 import org.tasks.makers.TaskMaker.newTask
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class OfflineSubtaskTest : InjectingTestCase() {
-
-    @Inject lateinit var googleTaskDao: GoogleTaskDao
-    @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var preferences: Preferences
-    @Inject lateinit var localBroadcastManager: LocalBroadcastManager
-
-    private lateinit var adapter: TaskAdapter
-    private val tasks = ArrayList<TaskContainer>()
-    private val filter = BuiltInFilterExposer.getMyTasksFilter(ApplicationProvider.getApplicationContext<Context>().resources)
-    private val dataSource = object : TaskAdapterDataSource {
-        override fun getItem(position: Int) = tasks[position]
 
-        override fun getTaskCount() = tasks.size
-    }
+    private val filter = runBlocking { MyTasksFilter.create() }
 
     @Before
     override fun setUp() {
         super.setUp()
         preferences.clear()
-        tasks.clear()
-        adapter = TaskAdapter(false, googleTaskDao, caldavDao, taskDao, localBroadcastManager)
-        adapter.setDataSource(dataSource)
     }
 
     @Test
@@ -56,7 +36,7 @@ class OfflineSubtaskTest : InjectingTestCase() {
         val parent = addTask()
         val child = addTask(with(PARENT, parent))
 
-        query()
+        val tasks = query()
 
         assertEquals(child, tasks[1].id)
         assertEquals(parent, tasks[1].parent)
@@ -69,22 +49,81 @@ class OfflineSubtaskTest : InjectingTestCase() {
         val parent = addTask(with(PARENT, grandparent))
         val child = addTask(with(PARENT, parent))
 
-        query()
+        val tasks = query()
 
         assertEquals(child, tasks[2].id)
         assertEquals(parent, tasks[2].parent)
         assertEquals(2, tasks[2].indent)
     }
 
-    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long {
+    @Test
+    fun parentWithOneChildHasChildrenCountOne() {
+        val parent = addTask()
+        addTask(with(PARENT, parent))
+
+        val tasks = query()
+
+        val parentTask = tasks.find { it.id == parent }!!
+        assertEquals(1, parentTask.children)
+    }
+
+    @Test
+    fun parentWithMultipleChildrenHasCorrectCount() {
+        val parent = addTask()
+        addTask(with(PARENT, parent))
+        addTask(with(PARENT, parent))
+        addTask(with(PARENT, parent))
+
+        val tasks = query()
+
+        val parentTask = tasks.find { it.id == parent }!!
+        assertEquals(3, parentTask.children)
+    }
+
+    @Test
+    fun grandparentCountsAllDescendants() {
+        val grandparent = addTask()
+        val parent = addTask(with(PARENT, grandparent))
+        addTask(with(PARENT, parent))
+
+        val tasks = query()
+
+        val grandparentTask = tasks.find { it.id == grandparent }!!
+        assertEquals(2, grandparentTask.children)
+    }
+
+    @Test
+    fun leafTaskHasNoChildren() {
+        val parent = addTask()
+        val child = addTask(with(PARENT, parent))
+
+        val tasks = query()
+
+        val childTask = tasks.find { it.id == child }!!
+        assertEquals(0, childTask.children)
+    }
+
+    @Test
+    fun deepHierarchyCountsAllDescendants() {
+        val root = addTask()
+        val level1 = addTask(with(PARENT, root))
+        val level2 = addTask(with(PARENT, level1))
+        val level3 = addTask(with(PARENT, level2))
+        addTask(with(PARENT, level3))
+
+        val tasks = query()
+
+        val rootTask = tasks.find { it.id == root }!!
+        assertEquals(4, rootTask.children)
+    }
+
+    private fun addTask(vararg properties: PropertyValue<in Task?, *>): Long = runBlocking {
         val task = newTask(*properties)
         taskDao.createNew(task)
-        return task.id
+        task.id
     }
 
-    private fun query() {
-        tasks.addAll(taskDao.fetchTasks { getQuery(preferences, filter, it) })
+    private fun query(): List<TaskContainer> = runBlocking {
+        taskDao.fetchTasks(getQuery(preferences, filter))
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}
+}

app/src/androidTest/java/com/todoroo/astrid/adapter/RecursiveLoopTest.kt

@@ -0,0 +1,91 @@
+package com.todoroo.astrid.adapter
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import com.natpryce.makeiteasy.PropertyValue
+import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.tasks.data.TaskListQuery.getQuery
+import org.tasks.data.entity.Task
+import org.tasks.date.DateTimeUtils.newDateTime
+import org.tasks.filters.TodayFilter
+import org.tasks.injection.InjectingTestCase
+import org.tasks.makers.TaskMaker.DUE_DATE
+import org.tasks.makers.TaskMaker.PARENT
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.preferences.Preferences
+import javax.inject.Inject
+
+@HiltAndroidTest
+class RecursiveLoopTest : InjectingTestCase() {
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var preferences: Preferences
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+        preferences.clear()
+    }
+
+    @Test
+    fun handleSelfLoop() = runBlocking {
+        addTask(with(DUE_DATE, newDateTime()), with(PARENT, 1L))
+
+        val tasks = getTasks()
+
+        assertEquals(1, tasks.size)
+        assertEquals(1L, tasks[0].id)
+    }
+
+    @Test
+    fun handleSingleLevelLoop() = runBlocking {
+        val parent = addTask(with(DUE_DATE, newDateTime()))
+        val child = addTask(with(PARENT, parent))
+
+        taskDao.setParent(child, listOf(parent))
+
+        val tasks = getTasks()
+        assertEquals(2, tasks.size)
+        assertEquals(parent, tasks[0].id)
+        assertEquals(child, tasks[1].id)
+    }
+
+    @Test
+    fun handleMultiLevelLoop() = runBlocking {
+        val parent = addTask(with(DUE_DATE, newDateTime()))
+        val child = addTask(with(PARENT, parent))
+        val grandchild = addTask(with(PARENT, child))
+
+        taskDao.setParent(grandchild, listOf(parent))
+
+        val tasks = getTasks()
+        assertEquals(3, tasks.size)
+        assertEquals(parent, tasks[0].id)
+        assertEquals(child, tasks[1].id)
+        assertEquals(grandchild, tasks[2].id)
+    }
+
+    @Test
+    fun descendantsRecursiveLoopBothMatchFilter() = runBlocking {
+        val parent = addTask(with(DUE_DATE, newDateTime()))
+        val child = addTask(with(DUE_DATE, newDateTime()), with(PARENT, parent))
+
+        taskDao.setParent(child, listOf(parent))
+
+        val tasks = getTasks()
+        assertEquals(2, tasks.size)
+    }
+
+    private suspend fun getTasks() = taskDao.fetchTasks(
+        getQuery(preferences, TodayFilter.create())
+    )
+
+    private suspend fun addTask(vararg properties: PropertyValue<in Task?, *>): Long {
+        val task = newTask(*properties)
+        taskDao.createNew(task)
+        return task.id
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.kt

@@ -1,52 +1,287 @@
 package com.todoroo.astrid.alarms
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.Alarm
-import org.tasks.data.AlarmDao
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.data.createDueDate
+import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.Alarm
+import org.tasks.data.entity.Notification
+import org.tasks.data.entity.Task
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.jobs.AlarmEntry
-import org.tasks.jobs.NotificationQueue
-import org.tasks.makers.TaskMaker.REMINDER_LAST
-import org.tasks.makers.TaskMaker.newTask
 import org.tasks.time.DateTime
+import org.tasks.time.DateTimeUtils2
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class AlarmJobServiceTest : InjectingTestCase() {
-    @Inject lateinit var alarmDao: AlarmDao
     @Inject lateinit var taskDao: TaskDao
-    @Inject lateinit var jobs: NotificationQueue
     @Inject lateinit var alarmService: AlarmService
 
     @Test
-    fun scheduleAlarm() {
-        val task = newTask()
-        taskDao.createNew(task)
-        val alarmTime = DateTime(2017, 9, 24, 19, 57)
-        val alarm = Alarm(task.id, alarmTime.millis)
-        alarm.id = alarmDao.insert(alarm)
-        alarmService.scheduleAllAlarms()
+    fun testNoAlarms() = runBlocking {
+        testResults(emptyList(), 0)
+    }
+
+    @Test
+    fun futureAlarmWithNoPastAlarm() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 18).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(1, mutableSetOf(Alarm(type = Alarm.TYPE_REL_END)))
 
-        assertEquals(listOf(AlarmEntry(alarm)), jobs.getJobs())
+            testResults(emptyList(), DateTime(2024, 5, 18, 18, 0).millis)
+        }
     }
 
     @Test
-    fun ignoreStaleAlarm() {
-        val alarmTime = DateTime(2017, 9, 24, 19, 57)
-        val task = newTask(with(REMINDER_LAST, alarmTime.endOfMinute()))
-        taskDao.createNew(task)
-        alarmDao.insert(Alarm(task.id, alarmTime.millis))
-        alarmService.scheduleAllAlarms()
+    fun pastAlarmWithNoFutureAlarm() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(1, mutableSetOf(Alarm(type = Alarm.TYPE_REL_END)))
 
-        assertTrue(jobs.getJobs().isEmpty())
+            testResults(
+                listOf(
+                    Notification(
+                        taskId = 1L,
+                        timestamp = DateTimeUtils2.currentTimeMillis(),
+                        type = Alarm.TYPE_REL_END
+                    )
+                ),
+                0
+            )
+        }
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
+    @Test
+    fun pastRecurringAlarmWithFutureRecurrence() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(
+                    Alarm(
+                        type = Alarm.TYPE_REL_END,
+                        repeat = 1,
+                        interval = TimeUnit.HOURS.toMillis(6)
+                    )
+                )
+            )
+
+            testResults(
+                listOf(
+                    Notification(
+                        taskId = 1L,
+                        timestamp = DateTimeUtils2.currentTimeMillis(),
+                        type = Alarm.TYPE_REL_END
+                    )
+                ),
+                DateTime(2024, 5, 18, 0, 0).millis
+            )
+        }
+    }
+
+    @Test
+    fun pastAlarmsRemoveSnoozed() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(
+                    Alarm(type = Alarm.TYPE_REL_END),
+                    Alarm(time = DateTimeUtils2.currentTimeMillis(), type = Alarm.TYPE_SNOOZE)
+                )
+            )
+
+            testResults(
+                listOf(
+                    Notification(
+                        taskId = 1L,
+                        timestamp = DateTimeUtils2.currentTimeMillis(),
+                        type = Alarm.TYPE_REL_END
+                    )
+                ),
+                0
+            )
+
+            assertEquals(
+                listOf(Alarm(id = 1, task = 1, time = 0, type = Alarm.TYPE_REL_END)),
+                alarmService.getAlarms(1)
+            )
+        }
+    }
+
+    @Test
+    fun alarmsOneMinuteApart() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY_TIME,
+                        DateTime(2024, 5, 17, 23, 20).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(1, mutableSetOf(Alarm(type = Alarm.TYPE_REL_END)))
+            taskDao.insert(Task())
+            alarmService.synchronizeAlarms(
+                taskId = 2,
+                alarms = mutableSetOf(
+                    Alarm(
+                        type = Alarm.TYPE_SNOOZE,
+                        time = DateTime(2024, 5, 17, 23, 21).millis)
+                )
+            )
+
+            testResults(
+                listOf(
+                    Notification(
+                        taskId = 1L,
+                        timestamp = DateTimeUtils2.currentTimeMillis(),
+                        type = Alarm.TYPE_REL_END
+                    )
+                ),
+                DateTime(2024, 5, 17, 23, 21).millis
+            )
+        }
+    }
+
+    @Test
+    fun futureSnoozeOverrideOverdue() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    )
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(
+                    Alarm(type = Alarm.TYPE_REL_END),
+                    Alarm(
+                        time = DateTimeUtils2.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5),
+                        type = Alarm.TYPE_SNOOZE
+                    )
+                )
+            )
+
+            testResults(
+                emptyList(),
+                DateTimeUtils2.currentTimeMillis() + TimeUnit.MINUTES.toMillis(5)
+            )
+        }
+    }
+
+    @Test
+    fun ignoreStaleAlarm() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    ),
+                    reminderLast = DateTime(2024, 5, 17, 18, 0).millis,
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(Alarm(type = Alarm.TYPE_REL_END))
+            )
+
+            testResults(
+                emptyList(),
+                0
+            )
+        }
+    }
+
+    @Test
+    fun dontScheduleForCompletedTask() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    ),
+                    completionDate = DateTime(2024, 5, 17, 14, 0).millis,
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(Alarm(type = Alarm.TYPE_REL_END))
+            )
+
+            testResults(
+                emptyList(),
+                0
+            )
+        }
+    }
+
+    @Test
+    fun dontScheduleForDeletedTask() = runBlocking {
+        freezeAt(DateTime(2024, 5, 17, 23, 20)) {
+            taskDao.insert(
+                Task(
+                    dueDate = createDueDate(
+                        Task.URGENCY_SPECIFIC_DAY,
+                        DateTime(2024, 5, 17).millis
+                    ),
+                    deletionDate = DateTime(2024, 5, 17, 14, 0).millis,
+                )
+            )
+            alarmService.synchronizeAlarms(
+                1,
+                mutableSetOf(Alarm(type = Alarm.TYPE_REL_END))
+            )
+
+            testResults(
+                emptyList(),
+                0
+            )
+        }
+    }
+
+    private suspend fun testResults(notifications: List<Notification>, nextAlarm: Long) {
+        val actualNextAlarm = alarmService.triggerAlarms {
+            assertEquals(notifications, it)
+            it.forEach { taskDao.setLastNotified(it.taskId, DateTimeUtils2.currentTimeMillis()) }
+        }
+        assertEquals(nextAlarm, actualNextAlarm)
+    }
 }

app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.kt

@@ -5,29 +5,25 @@
  */
 package com.todoroo.astrid.dao
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.andlib.utility.DateUtilities
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.service.TaskDeleter
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.*
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.TaskMaker.ID
-import org.tasks.makers.TaskMaker.PARENT
-import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TaskDaoTests : InjectingTestCase() {
+
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var taskDeleter: TaskDeleter
 
     /** Test basic task creation, fetch, and save  */
     @Test
-    fun testTaskCreation() {
+    fun testTaskCreation() = runBlocking {
         assertEquals(0, taskDao.getAll().size)
 
         // create task "happy"
@@ -62,7 +58,7 @@ class TaskDaoTests : InjectingTestCase() {
 
     /** Test various task fetch conditions  */
     @Test
-    fun testTaskConditions() {
+    fun testTaskConditions() = runBlocking {
         // create normal task
         var task = Task()
         task.title = "normal"
@@ -76,23 +72,23 @@ class TaskDaoTests : InjectingTestCase() {
         // create hidden task
         task = Task()
         task.title = "hidden"
-        task.hideUntil = DateUtilities.now() + 10000
+        task.hideUntil = currentTimeMillis() + 10000
         taskDao.createNew(task)
 
         // create task with deadlines
         task = Task()
         task.title = "deadlineInFuture"
-        task.dueDate = DateUtilities.now() + 10000
+        task.dueDate = currentTimeMillis() + 10000
         taskDao.createNew(task)
         task = Task()
         task.title = "deadlineInPast"
-        task.dueDate = DateUtilities.now() - 10000
+        task.dueDate = currentTimeMillis() - 10000
         taskDao.createNew(task)
 
         // create completed task
         task = Task()
         task.title = "completed"
-        task.completionDate = DateUtilities.now() - 10000
+        task.completionDate = currentTimeMillis() - 10000
         taskDao.createNew(task)
 
         // check is active
@@ -104,7 +100,7 @@ class TaskDaoTests : InjectingTestCase() {
 
     /** Test task deletion  */
     @Test
-    fun testTDeletion() {
+    fun testTDeletion() = runBlocking {
         assertEquals(0, taskDao.getAll().size)
 
         // create task "happy"
@@ -120,7 +116,7 @@ class TaskDaoTests : InjectingTestCase() {
 
     /** Test save without prior create doesn't work  */
     @Test
-    fun testSaveWithoutCreate() {
+    fun testSaveWithoutCreate() = runBlocking {
         // try to save task "happy"
         val task = Task()
         task.title = "happy"
@@ -131,7 +127,7 @@ class TaskDaoTests : InjectingTestCase() {
 
     /** Test passing invalid task indices to various things  */
     @Test
-    fun testInvalidIndex() {
+    fun testInvalidIndex() = runBlocking {
         assertEquals(0, taskDao.getAll().size)
         assertNull(taskDao.fetch(1))
         taskDeleter.delete(listOf(1L))
@@ -139,29 +135,4 @@ class TaskDaoTests : InjectingTestCase() {
         // make sure db still works
         assertEquals(0, taskDao.getAll().size)
     }
-
-    @Test
-    fun findChildrenInList() {
-        taskDao.createNew(newTask(with(ID, 1L)))
-        taskDao.createNew(newTask(with(ID, 2L), with(PARENT, 1L)))
-        assertEquals(listOf(2L), taskDao.getChildren(listOf(1L, 2L)))
-    }
-
-    @Test
-    fun findRecursiveChildrenInList() {
-        taskDao.createNew(newTask(with(ID, 1L)))
-        taskDao.createNew(newTask(with(ID, 2L), with(PARENT, 1L)))
-        taskDao.createNew(newTask(with(ID, 3L), with(PARENT, 2L)))
-        assertEquals(listOf(2L, 3L, 3L), taskDao.getChildren(listOf(1L, 2L, 3L)))
-    }
-
-    @Test
-    fun findRecursiveChildrenInListAfterSkippingParent() {
-        taskDao.createNew(newTask(with(ID, 1L)))
-        taskDao.createNew(newTask(with(ID, 2L), with(PARENT, 1L)))
-        taskDao.createNew(newTask(with(ID, 3L), with(PARENT, 2L)))
-        assertEquals(listOf(2L, 3L), taskDao.getChildren(listOf(1L, 3L)))
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/com/todoroo/astrid/gcal/GCalHelperTest.kt

@@ -0,0 +1,142 @@
+package com.todoroo.astrid.gcal
+
+import android.Manifest
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.provider.CalendarContract
+import android.provider.CalendarContract.Calendars
+import android.provider.CalendarContract.Events
+import androidx.core.net.toUri
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.rule.GrantPermissionRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.tasks.TestUtilities.withTZ
+import org.tasks.data.entity.Task
+import org.tasks.injection.InjectingTestCase
+import org.tasks.time.DateTime
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltAndroidTest
+class GCalHelperTest : InjectingTestCase() {
+
+    @get:Rule
+    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        Manifest.permission.READ_CALENDAR,
+        Manifest.permission.WRITE_CALENDAR
+    )
+
+    @Inject lateinit var gcalHelper: GCalHelper
+
+    private var testCalendarId: Long = -1
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+        testCalendarId = createTestCalendar()
+    }
+
+    @After
+    fun tearDown() {
+        if (testCalendarId > 0) {
+            try {
+                val context = ApplicationProvider.getApplicationContext<Context>()
+                context.contentResolver.delete(
+                    ContentUris.withAppendedId(Calendars.CONTENT_URI, testCalendarId),
+                    null,
+                    null
+                )
+            } catch (e: Exception) {
+                Timber.e(e)
+            }
+        }
+    }
+
+    @Test fun allDayEventInNewYork() = assertAllDayEvent("America/New_York") // UTC-5
+    @Test fun allDayEventInBerlin() = assertAllDayEvent("Europe/Berlin") // UTC+1
+    @Test fun allDayEventInAuckland() = assertAllDayEvent("Pacific/Auckland") // UTC+13
+    @Test fun allDayEventInTokyo() = assertAllDayEvent("Asia/Tokyo") // UTC+9
+    @Test fun allDayEventInHonolulu() = assertAllDayEvent("Pacific/Honolulu") // UTC-10
+    @Test fun allDayEventInChatham() = assertAllDayEvent("Pacific/Chatham") // UTC+13:45
+
+    private fun assertAllDayEvent(timezone: String) = withTZ(timezone) {
+        val task = Task(dueDate = DateTime(2024, 12, 20).millis)
+
+        val eventUri = gcalHelper.createTaskEvent(task, testCalendarId.toString())
+            ?: throw RuntimeException("Event not created")
+
+        val event = queryEvent(eventUri.toString()) ?: throw RuntimeException("Event not found")
+
+        assertEquals(
+            "DTSTART should be Dec 20 00:00 UTC",
+            DateTime(2024, 12, 20, timeZone = DateTime.UTC).millis,
+            event.dtStart
+        )
+        assertEquals(
+            "DTEND should be Dec 21 00:00 UTC",
+            DateTime(2024, 12, 21, timeZone = DateTime.UTC).millis,
+            event.dtEnd
+        )
+    }
+
+    private fun createTestCalendar(): Long {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val values = ContentValues().apply {
+            put(Calendars.ACCOUNT_NAME, "test@test.com")
+            put(Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
+            put(Calendars.NAME, "Test Calendar")
+            put(Calendars.CALENDAR_DISPLAY_NAME, "Test Calendar")
+            put(Calendars.CALENDAR_COLOR, 0xFF0000)
+            put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_OWNER)
+            put(Calendars.OWNER_ACCOUNT, "test@test.com")
+            put(Calendars.VISIBLE, 1)
+            put(Calendars.SYNC_EVENTS, 1)
+        }
+        val uri = Calendars.CONTENT_URI.buildUpon()
+            .appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true")
+            .appendQueryParameter(Calendars.ACCOUNT_NAME, "test@test.com")
+            .appendQueryParameter(Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
+            .build()
+        val calendarUri = context.contentResolver.insert(uri, values)
+        return ContentUris.parseId(calendarUri!!)
+    }
+
+    private fun queryEvent(eventUri: String): CalendarEvent? {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        val cursor = context.contentResolver.query(
+            eventUri.toUri(),
+            arrayOf(
+                Events.DTSTART,
+                Events.DTEND,
+                Events.ALL_DAY,
+                Events.EVENT_TIMEZONE
+            ),
+            null,
+            null,
+            null
+        )
+        return cursor?.use {
+            if (it.moveToFirst()) {
+                CalendarEvent(
+                    dtStart = it.getLong(0),
+                    dtEnd = it.getLong(1),
+                    allDay = it.getInt(2) == 1,
+                    timezone = it.getString(3)
+                )
+            } else null
+        }
+    }
+
+    private data class CalendarEvent(
+        val dtStart: Long,
+        val dtEnd: Long,
+        val allDay: Boolean,
+        val timezone: String?
+    )
+}

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.kt

@@ -1,92 +1,93 @@
 package com.todoroo.astrid.gtasks
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.api.services.tasks.model.TaskList
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.service.TaskDeleter
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.LocalBroadcastManager
-import org.tasks.data.GoogleTaskAccount
-import org.tasks.data.GoogleTaskListDao
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GtaskListMaker.ID
-import org.tasks.makers.GtaskListMaker.NAME
-import org.tasks.makers.GtaskListMaker.REMOTE_ID
-import org.tasks.makers.GtaskListMaker.newGtaskList
 import org.tasks.makers.RemoteGtaskListMaker
 import org.tasks.makers.RemoteGtaskListMaker.newRemoteList
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class GtasksListServiceTest : InjectingTestCase() {
     @Inject lateinit var taskDeleter: TaskDeleter
     @Inject lateinit var localBroadcastManager: LocalBroadcastManager
-    @Inject lateinit var googleTaskListDao: GoogleTaskListDao
+    @Inject lateinit var caldavDao: CaldavDao
 
     private lateinit var gtasksListService: GtasksListService
 
+    @Before
     override fun setUp() {
         super.setUp()
-        gtasksListService = GtasksListService(googleTaskListDao, taskDeleter, localBroadcastManager)
+        gtasksListService = GtasksListService(caldavDao, taskDeleter, localBroadcastManager)
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     @Test
-    fun testCreateNewList() {
+    fun testCreateNewList() = runBlocking {
         setLists(
                 newRemoteList(
                         with(RemoteGtaskListMaker.REMOTE_ID, "1"), with(RemoteGtaskListMaker.NAME, "Default")))
         assertEquals(
-                newGtaskList(with(ID, 1L), with(REMOTE_ID, "1"), with(NAME, "Default")),
-                googleTaskListDao.getById(1L))
+            CaldavCalendar(id = 1, account = "account", uuid = "1", name = "Default"),
+            caldavDao.getCalendarById(1L)
+        )
     }
 
     @Test
-    fun testGetListByRemoteId() {
-        val list = newGtaskList(with(REMOTE_ID, "1"))
-        list.id = googleTaskListDao.insertOrReplace(list)
-        assertEquals(list, gtasksListService.getList("1"))
+    fun testGetListByRemoteId() = runBlocking {
+        val list = CaldavCalendar(uuid = "1")
+        caldavDao.insert(list)
+        assertEquals(list, caldavDao.getCalendarByUuid("1"))
     }
 
     @Test
-    fun testGetListReturnsNullWhenNotFound() {
-        assertNull(gtasksListService.getList("1"))
+    fun testGetListReturnsNullWhenNotFound() = runBlocking {
+        assertNull(caldavDao.getCalendarByUuid("1"))
     }
 
     @Test
-    fun testDeleteMissingList() {
-        googleTaskListDao.insertOrReplace(newGtaskList(with(ID, 1L), with(REMOTE_ID, "1")))
+    fun testDeleteMissingList() = runBlocking {
+        caldavDao.insert(CaldavCalendar(account = "account", uuid = "1"))
         val taskList = newRemoteList(with(RemoteGtaskListMaker.REMOTE_ID, "2"))
         setLists(taskList)
         assertEquals(
-                listOf(newGtaskList(with(ID, 2L), with(REMOTE_ID, "2"))),
-                googleTaskListDao.getLists("account"))
+            listOf(CaldavCalendar(id = 2, account = "account", uuid = "2", name = "Default")),
+            caldavDao.getCalendarsByAccount("account")
+        )
     }
 
     @Test
-    fun testUpdateListName() {
-        googleTaskListDao.insertOrReplace(
-                newGtaskList(with(ID, 1L), with(REMOTE_ID, "1"), with(NAME, "oldName")))
+    fun testUpdateListName() = runBlocking {
+        val calendar = CaldavCalendar(uuid = "1", name = "oldName", account = "account")
+        caldavDao.insert(calendar)
         setLists(
                 newRemoteList(
                         with(RemoteGtaskListMaker.REMOTE_ID, "1"), with(RemoteGtaskListMaker.NAME, "newName")))
-        assertEquals("newName", googleTaskListDao.getById(1)!!.title)
+        assertEquals("newName", caldavDao.getCalendarById(calendar.id)!!.name)
     }
 
     @Test
-    fun testNewListLastSyncIsZero() {
+    fun testNewListLastSyncIsZero() = runBlocking {
         setLists(TaskList().setId("1"))
-        assertEquals(0L, gtasksListService.getList("1").lastSync)
+        assertEquals(0L, caldavDao.getCalendarByUuid("1")!!.lastSync)
     }
 
-    private fun setLists(vararg list: TaskList) {
-        val account = GoogleTaskAccount("account")
-        googleTaskListDao.insert(account)
+    private suspend fun setLists(vararg list: TaskList) {
+        val account = CaldavAccount(
+            username = "account",
+            uuid = "account",
+        )
+        caldavDao.insert(account)
         gtasksListService.updateLists(account, listOf(*list))
     }
 }

app/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.kt

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.gtasks
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.GoogleTask
-import org.tasks.data.GoogleTaskDao
-import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import javax.inject.Inject
-
-@RunWith(AndroidJUnit4::class)
-class GtasksMetadataServiceTest : InjectingTestCase() {
-    @Inject lateinit var taskDao: TaskDao
-    @Inject lateinit var googleTaskDao: GoogleTaskDao
-    
-    private var task: Task? = null
-    private var metadata: GoogleTask? = null
-    
-    override fun inject(component: TestComponent) = component.inject(this)
-
-    @Test
-    fun testMetadataFound() {
-        givenTask(taskWithMetadata(null))
-        whenSearchForMetadata()
-        thenExpectMetadataFound()
-    }
-
-    @Test
-    fun testMetadataDoesntExist() {
-        givenTask(taskWithoutMetadata())
-        whenSearchForMetadata()
-        thenExpectNoMetadataFound()
-    }
-
-    private fun thenExpectNoMetadataFound() {
-        assertNull(metadata)
-    }
-
-    private fun thenExpectMetadataFound() {
-        assertNotNull(metadata)
-    }
-
-    // --- helpers
-    private fun whenSearchForMetadata() {
-        metadata = googleTaskDao.getByTaskId(task!!.id)
-    }
-
-    private fun taskWithMetadata(id: String?): Task {
-        val task = Task()
-        task.title = "cats"
-        taskDao.createNew(task)
-        val metadata = GoogleTask(task.id, "")
-        if (id != null) {
-            metadata.remoteId = id
-        }
-        metadata.task = task.id
-        googleTaskDao.insert(metadata)
-        return task
-    }
-
-    private fun givenTask(taskToTest: Task) {
-        task = taskToTest
-    }
-
-    private fun taskWithoutMetadata(): Task {
-        val task = Task()
-        task.title = "dogs"
-        taskDao.createNew(task)
-        return task
-    }
-}

app/src/androidTest/java/com/todoroo/astrid/model/TaskTest.kt

@@ -1,37 +1,34 @@
 package com.todoroo.astrid.model
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.Freeze
+import org.tasks.SuspendFreeze.Companion.freezeClock
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.time.DateTimeUtils
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TaskTest : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
 
     @Test
-    fun testSavedTaskHasCreationDate() {
-        Freeze.freezeClock {
+    fun testSavedTaskHasCreationDate() = runBlocking {
+        freezeClock {
             val task = Task()
             taskDao.createNew(task)
-            assertEquals(DateTimeUtils.currentTimeMillis(), task.creationDate)
+            assertEquals(currentTimeMillis(), task.creationDate)
         }
     }
 
     @Test
-    fun testReadTaskFromDb() {
+    fun testReadTaskFromDb() = runBlocking {
         val task = Task()
         taskDao.createNew(task)
         val fromDb = taskDao.fetch(task.id)
         assertEquals(task, fromDb)
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.kt

@@ -1,326 +0,0 @@
-package com.todoroo.astrid.reminders
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.andlib.utility.DateUtilities
-import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.Freeze
-import org.tasks.R
-import org.tasks.date.DateTimeUtils
-import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.jobs.NotificationQueue
-import org.tasks.jobs.ReminderEntry
-import org.tasks.makers.TaskMaker.COMPLETION_TIME
-import org.tasks.makers.TaskMaker.CREATION_TIME
-import org.tasks.makers.TaskMaker.DELETION_TIME
-import org.tasks.makers.TaskMaker.DUE_DATE
-import org.tasks.makers.TaskMaker.DUE_TIME
-import org.tasks.makers.TaskMaker.ID
-import org.tasks.makers.TaskMaker.RANDOM_REMINDER_PERIOD
-import org.tasks.makers.TaskMaker.REMINDERS
-import org.tasks.makers.TaskMaker.REMINDER_LAST
-import org.tasks.makers.TaskMaker.SNOOZE_TIME
-import org.tasks.makers.TaskMaker.newTask
-import org.tasks.preferences.Preferences
-import org.tasks.reminders.Random
-import org.tasks.time.DateTime
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-@RunWith(AndroidJUnit4::class)
-class ReminderServiceTest : InjectingTestCase() {
-    @Inject lateinit var preferences: Preferences
-    @Inject lateinit var taskDao: TaskDao
-    @Inject lateinit var jobs: NotificationQueue
-
-    private lateinit var service: ReminderService
-    private lateinit var random: RandomStub
-
-    override fun setUp() {
-        super.setUp()
-        random = RandomStub()
-        preferences.clear()
-        service = ReminderService(preferences, jobs, random, taskDao)
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-
-    @Test
-    fun dontScheduleDueDateReminderWhenFlagNotSet() {
-        service.scheduleAlarm(newTask(with(ID, 1L), with(DUE_TIME, DateTimeUtils.newDateTime())))
-
-        assertTrue(jobs.isEmpty())
-    }
-
-    @Test
-    fun dontScheduleDueDateReminderWhenTimeNotSet() {
-        service.scheduleAlarm(newTask(with(ID, 1L), with(REMINDERS, Task.NOTIFY_AT_DEADLINE)))
-
-        assertTrue(jobs.isEmpty())
-    }
-
-    @Test
-    fun schedulePastDueDate() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTimeUtils.newDateTime().minusDays(1)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, task.dueDate, ReminderService.TYPE_DUE))
-    }
-
-    @Test
-    fun scheduleFutureDueDate() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, task.dueDate, ReminderService.TYPE_DUE))
-    }
-
-    @Test
-    fun scheduleReminderAtDefaultDueTime() {
-        val now = DateTimeUtils.newDateTime()
-        val task = newTask(with(ID, 1L), with(DUE_DATE, now), with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, now.startOfDay().withHourOfDay(18).millis, ReminderService.TYPE_DUE))
-    }
-
-    @Test
-    fun dontScheduleReminderForCompletedTask() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)),
-                with(COMPLETION_TIME, DateTimeUtils.newDateTime()),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        assertTrue(jobs.isEmpty())
-    }
-
-    @Test
-    fun dontScheduleReminderForDeletedTask() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)),
-                with(DELETION_TIME, DateTimeUtils.newDateTime()),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        assertTrue(jobs.isEmpty())
-    }
-
-    @Test
-    fun dontScheduleDueDateReminderWhenAlreadyReminded() {
-        val now = DateTimeUtils.newDateTime()
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, now),
-                with(REMINDER_LAST, now.plusSeconds(1)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        assertTrue(jobs.isEmpty())
-    }
-
-    @Test
-    fun ignoreStaleSnoozeTime() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTimeUtils.newDateTime()),
-                with(SNOOZE_TIME, DateTimeUtils.newDateTime().minusMinutes(5)),
-                with(REMINDER_LAST, DateTimeUtils.newDateTime().minusMinutes(4)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, task.dueDate, ReminderService.TYPE_DUE))
-    }
-
-    @Test
-    fun dontIgnoreMissedSnoozeTime() {
-        val dueDate = DateTimeUtils.newDateTime()
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, dueDate),
-                with(SNOOZE_TIME, dueDate.minusMinutes(4)),
-                with(REMINDER_LAST, dueDate.minusMinutes(5)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, task.reminderSnooze, ReminderService.TYPE_SNOOZE))
-    }
-
-    @Test
-    fun scheduleInitialRandomReminder() {
-        random.seed = 0.3865f
-
-        Freeze.freezeClock {
-            val now = DateTimeUtils.newDateTime()
-            val task = newTask(
-                    with(ID, 1L),
-                    with(REMINDER_LAST, null as DateTime?),
-                    with(CREATION_TIME, now.minusDays(1)),
-                    with(RANDOM_REMINDER_PERIOD, DateUtilities.ONE_WEEK))
-
-            service.scheduleAlarm(task)
-
-            verify(ReminderEntry(1L, now.minusDays(1).millis + 584206592, ReminderService.TYPE_RANDOM))
-        }
-    }
-
-    @Test
-    fun scheduleNextRandomReminder() {
-        random.seed = 0.3865f
-
-        Freeze.freezeClock {
-            val now = DateTimeUtils.newDateTime()
-            val task = newTask(
-                    with(ID, 1L),
-                    with(REMINDER_LAST, now.minusDays(1)),
-                    with(CREATION_TIME, now.minusDays(30)),
-                    with(RANDOM_REMINDER_PERIOD, DateUtilities.ONE_WEEK))
-
-            service.scheduleAlarm(task)
-
-            verify(ReminderEntry(1L, now.minusDays(1).millis + 584206592, ReminderService.TYPE_RANDOM))
-        }
-    }
-
-    @Test
-    fun scheduleOverdueRandomReminder() {
-        random.seed = 0.3865f
-
-        Freeze.freezeClock {
-            val now = DateTimeUtils.newDateTime()
-            val task = newTask(
-                    with(ID, 1L),
-                    with(REMINDER_LAST, now.minusDays(14)),
-                    with(CREATION_TIME, now.minusDays(30)),
-                    with(RANDOM_REMINDER_PERIOD, DateUtilities.ONE_WEEK))
-
-            service.scheduleAlarm(task)
-
-            verify(ReminderEntry(1L, now.millis + 10148400, ReminderService.TYPE_RANDOM))
-        }
-    }
-
-    @Test
-    fun scheduleOverdueNoLastReminder() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 9, 22, 15, 30)),
-                with(REMINDER_LAST, null as DateTime?),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 23, 15, 30, 1, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun scheduleOverduePastLastReminder() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 9, 22, 15, 30)),
-                with(REMINDER_LAST, DateTime(2017, 9, 24, 12, 0)),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 24, 15, 30, 1, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun scheduleOverdueBeforeLastReminder() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 9, 22, 12, 30)),
-                with(REMINDER_LAST, DateTime(2017, 9, 24, 15, 0)),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 25, 12, 30, 1, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun scheduleOverdueWithNoDueTime() {
-        preferences.setInt(R.string.p_rmd_time, TimeUnit.HOURS.toMillis(15).toInt())
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_DATE, DateTime(2017, 9, 22)),
-                with(REMINDER_LAST, DateTime(2017, 9, 23, 12, 17, 59, 999)),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 23, 15, 0, 0, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun scheduleSubsequentOverdueReminder() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 9, 22, 15, 30)),
-                with(REMINDER_LAST, DateTime(2017, 9, 23, 15, 30, 59, 999)),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 24, 15, 30, 1, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun scheduleOverdueAfterLastReminder() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 9, 22, 15, 30)),
-                with(REMINDER_LAST, DateTime(2017, 9, 23, 12, 17, 59, 999)),
-                with(REMINDERS, Task.NOTIFY_AFTER_DEADLINE))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1L, DateTime(2017, 9, 23, 15, 30, 1, 0).millis, ReminderService.TYPE_OVERDUE))
-    }
-
-    @Test
-    fun snoozeOverridesAll() {
-        val now = DateTimeUtils.newDateTime()
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, now),
-                with(SNOOZE_TIME, now.plusMonths(12)),
-                with(REMINDERS, Task.NOTIFY_AT_DEADLINE or Task.NOTIFY_AFTER_DEADLINE),
-                with(RANDOM_REMINDER_PERIOD, DateUtilities.ONE_HOUR))
-
-        service.scheduleAlarm(task)
-
-        verify(ReminderEntry(1, now.plusMonths(12).millis, ReminderService.TYPE_SNOOZE))
-    }
-
-    private fun verify(vararg reminders: ReminderEntry) = assertEquals(reminders.toList(), jobs.getJobs())
-
-    internal class RandomStub : Random() {
-        var seed = 1.0f
-
-        override fun nextFloat() = seed
-    }
-}

app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatTaskHelperTest.kt

@@ -1,193 +0,0 @@
-package com.todoroo.astrid.repeats
-
-import android.annotation.SuppressLint
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.ical.values.RRule
-import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.alarms.AlarmService
-import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import com.todoroo.astrid.gcal.GCalHelper
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.InOrder
-import org.mockito.Mockito
-import org.tasks.LocalBroadcastManager
-import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.TaskMaker.AFTER_COMPLETE
-import org.tasks.makers.TaskMaker.COMPLETION_TIME
-import org.tasks.makers.TaskMaker.DUE_TIME
-import org.tasks.makers.TaskMaker.ID
-import org.tasks.makers.TaskMaker.RRULE
-import org.tasks.makers.TaskMaker.newTask
-import org.tasks.time.DateTime
-import java.text.ParseException
-import javax.inject.Inject
-
-@SuppressLint("NewApi")
-@RunWith(AndroidJUnit4::class)
-class RepeatTaskHelperTest : InjectingTestCase() {
-    @Inject lateinit var taskDao: TaskDao
-    private lateinit var localBroadcastManager: LocalBroadcastManager
-    private lateinit var alarmService: AlarmService
-    private lateinit var gCalHelper: GCalHelper
-    private lateinit var helper: RepeatTaskHelper
-    private lateinit var mocks: InOrder
-
-    @Before
-    fun before() {
-        alarmService = Mockito.mock(AlarmService::class.java)
-        gCalHelper = Mockito.mock(GCalHelper::class.java)
-        localBroadcastManager = Mockito.mock(LocalBroadcastManager::class.java)
-        mocks = Mockito.inOrder(alarmService, gCalHelper, localBroadcastManager)
-        helper = RepeatTaskHelper(gCalHelper, alarmService, taskDao, localBroadcastManager)
-    }
-
-    @After
-    fun after() {
-        Mockito.verifyNoMoreInteractions(localBroadcastManager, gCalHelper, alarmService)
-    }
-
-    @Test
-    fun noRepeat() {
-        helper.handleRepeat(newTask(with(DUE_TIME, DateTime(2017, 10, 4, 13, 30))))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMinutelyRepeat() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=MINUTELY;INTERVAL=30")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 4, 14, 0, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMinutelyRepeatAfterCompletion() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(COMPLETION_TIME, DateTime(2017, 10, 4, 13, 17, 45, 340)),
-                with(RRULE, RRule("RRULE:FREQ=MINUTELY;INTERVAL=30")),
-                with(AFTER_COMPLETE, true))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 4, 13, 47, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMinutelyDecrementCount() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=MINUTELY;COUNT=2;INTERVAL=30")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 4, 14, 0, 1))
-        assertEquals(1, RRule(task.getRecurrenceWithoutFrom()).count)
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMinutelyLastOccurrence() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=MINUTELY;COUNT=1;INTERVAL=30")))
-        helper.handleRepeat(task)
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testHourlyRepeat() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=HOURLY;INTERVAL=6")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 4, 19, 30, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testHourlyRepeatAfterCompletion() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(COMPLETION_TIME, DateTime(2017, 10, 4, 13, 17, 45, 340)),
-                with(RRULE, RRule("RRULE:FREQ=HOURLY;INTERVAL=6")),
-                with(AFTER_COMPLETE, true))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 4, 19, 17, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testDailyRepeat() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=DAILY;INTERVAL=6")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 10, 13, 30, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testRepeatWeeklyNoDays() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=WEEKLY;INTERVAL=2")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2017, 10, 18, 13, 30, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testYearly() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=YEARLY;INTERVAL=3")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2020, 10, 4, 13, 30, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMonthlyRepeat() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 10, 4, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=MONTHLY;INTERVAL=3")))
-        repeatAndVerify(
-                task, DateTime(2017, 10, 4, 13, 30, 1), DateTime(2018, 1, 4, 13, 30, 1))
-    }
-
-    @Test
-    @Throws(ParseException::class)
-    fun testMonthlyRepeatAtEndOfMonth() {
-        val task = newTask(
-                with(ID, 1L),
-                with(DUE_TIME, DateTime(2017, 1, 31, 13, 30)),
-                with(RRULE, RRule("RRULE:FREQ=MONTHLY;INTERVAL=1")))
-        repeatAndVerify(
-                task, DateTime(2017, 1, 31, 13, 30, 1), DateTime(2017, 2, 28, 13, 30, 1))
-    }
-
-    private fun repeatAndVerify(task: Task, oldDueDate: DateTime, newDueDate: DateTime) {
-        helper.handleRepeat(task)
-        mocks.verify(gCalHelper).rescheduleRepeatingTask(task)
-        mocks.verify(alarmService).rescheduleAlarms(1, oldDueDate.millis, newDueDate.millis)
-        mocks.verify(localBroadcastManager).broadcastRepeat(1, oldDueDate.millis, newDueDate.millis)
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}

app/src/androidTest/java/com/todoroo/astrid/repeats/RepeatWithSubtasksTests.kt

@@ -0,0 +1,66 @@
+package com.todoroo.astrid.repeats
+
+import org.tasks.data.entity.Task
+import com.todoroo.astrid.service.TaskCompleter
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.dao.TaskDao
+import org.tasks.injection.InjectingTestCase
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
+import javax.inject.Inject
+
+@HiltAndroidTest
+class RepeatWithSubtasksTests : InjectingTestCase() {
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var taskCompleter: TaskCompleter
+
+    @Test
+    fun uncompleteGrandchildren() = runBlocking {
+        val grandparent = taskDao.createNew(
+            Task(
+                recurrence = "RRULE:FREQ=DAILY"
+            )
+        )
+        val parent = taskDao.createNew(
+            Task(
+                parent = grandparent
+            )
+        )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        assertTrue(taskDao.fetch(child)!!.isCompleted)
+
+        taskCompleter.setComplete(grandparent)
+
+        assertFalse(taskDao.fetch(child)!!.isCompleted)
+    }
+
+    @Test
+    fun uncompleteGoogleTaskChildren() = runBlocking {
+        val parent = taskDao.createNew(
+                Task(
+                    recurrence = "RRULE:FREQ=DAILY"
+                )
+            )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        assertTrue(taskDao.fetch(child)!!.isCompleted)
+
+        taskCompleter.setComplete(parent)
+
+        assertFalse(taskDao.fetch(child)!!.isCompleted)
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.kt

@@ -5,26 +5,23 @@
  */
 package com.todoroo.astrid.service
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import com.todoroo.astrid.utility.TitleParser
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import java.util.*
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class QuickAddMarkupTest : InjectingTestCase() {
     private val tags = ArrayList<String>()
     @Inject lateinit var tagDataDao: TagDataDao
     
     private var task: Task? = null
-    
-    override fun inject(component: TestComponent) = component.inject(this)
 
     @Test
     fun testTags() {
@@ -82,11 +79,11 @@ class QuickAddMarkupTest : InjectingTestCase() {
         assertEquals(title, task!!.title)
     }
 
-    private fun whenTitleIs(title: String) {
+    private fun whenTitleIs(title: String) = runBlocking {
         task = Task()
         task!!.title = title
         tags.clear()
-        TitleParser.parse(tagDataDao, task, tags)
+        TitleParser.parse(tagDataDao, task!!, tags)
     }
 
     private fun assertPriority(priority: Int) {

app/src/androidTest/java/com/todoroo/astrid/service/TaskCreatorTest.kt

@@ -0,0 +1,100 @@
+package com.todoroo.astrid.service
+
+import com.todoroo.astrid.api.PermaSql.VALUE_EOD
+import com.todoroo.astrid.api.PermaSql.VALUE_EOD_NEXT_WEEK
+import com.todoroo.astrid.api.PermaSql.VALUE_EOD_TOMORROW
+import org.tasks.data.entity.Task
+import org.tasks.data.entity.Task.Companion.DUE_DATE
+import org.tasks.data.entity.Task.Companion.HIDE_UNTIL
+import org.tasks.data.entity.Task.Companion.URGENCY_SPECIFIC_DAY
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.tasks.R
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.data.createDueDate
+import org.tasks.injection.InjectingTestCase
+import org.tasks.preferences.Preferences
+import org.tasks.time.DateTime
+import javax.inject.Inject
+
+@HiltAndroidTest
+class TaskCreatorTest : InjectingTestCase() {
+    @Inject lateinit var preferences: Preferences
+    @Inject lateinit var taskCreator: TaskCreator
+
+    @Test
+    fun setStartAndDueFromFilter() = runBlocking {
+        val task = freezeAt(DateTime(2021, 2, 4, 14, 56, 34, 126)) {
+            taskCreator.create(mapOf(
+                    HIDE_UNTIL.name!! to VALUE_EOD,
+                    DUE_DATE.name!! to VALUE_EOD_TOMORROW
+            ), null)
+        }
+
+        assertEquals(DateTime(2021, 2, 4).millis, task.hideUntil)
+        assertEquals(
+                createDueDate(URGENCY_SPECIFIC_DAY, DateTime(2021, 2, 5).millis),
+                task.dueDate
+        )
+    }
+
+    @Test
+    fun setDefaultStartWithFilterDue() = runBlocking {
+        preferences.setString(R.string.p_default_hideUntil_key, Task.HIDE_UNTIL_DUE.toString())
+        val task = freezeAt(DateTime(2021, 2, 4, 14, 56, 34, 126)) {
+            taskCreator.create(mapOf(
+                    DUE_DATE.name!! to VALUE_EOD
+            ), null)
+        }
+
+        assertEquals(DateTime(2021, 2, 4).millis, task.hideUntil)
+    }
+
+    @Test
+    fun setStartAndDueFromPreferences() = runBlocking {
+        preferences.setString(R.string.p_default_urgency_key, Task.URGENCY_TODAY.toString())
+        preferences.setString(R.string.p_default_hideUntil_key, Task.HIDE_UNTIL_DUE.toString())
+
+        val task = freezeAt(DateTime(2021, 2, 4, 14, 56, 34, 126)) {
+            taskCreator.create(null, "test")
+        }
+
+        assertEquals(DateTime(2021, 2, 4).millis, task.hideUntil)
+        assertEquals(
+                createDueDate(URGENCY_SPECIFIC_DAY, DateTime(2021, 2, 4).millis),
+                task.dueDate
+        )
+    }
+
+    @Test
+    fun filterStartOverridesDefaultStart() = runBlocking {
+        preferences.setString(R.string.p_default_urgency_key, Task.URGENCY_TODAY.toString())
+        preferences.setString(R.string.p_default_hideUntil_key, Task.HIDE_UNTIL_DUE.toString())
+
+        val task = freezeAt(DateTime(2021, 2, 4, 14, 56, 34, 126)) {
+            taskCreator.create(mapOf(
+                    HIDE_UNTIL.name!! to VALUE_EOD_NEXT_WEEK
+            ), null)
+        }
+
+        assertEquals(DateTime(2021, 2, 11).millis, task.hideUntil)
+    }
+
+    @Test
+    fun filterDueOverridesDefaultDue() = runBlocking {
+        preferences.setString(R.string.p_default_urgency_key, Task.URGENCY_TODAY.toString())
+
+        val task = freezeAt(DateTime(2021, 2, 4, 14, 56, 34, 126)) {
+            taskCreator.create(mapOf(
+                    DUE_DATE.name!! to VALUE_EOD_TOMORROW
+            ), null)
+        }
+
+        assertEquals(
+                createDueDate(URGENCY_SPECIFIC_DAY, DateTime(2021, 2, 5).millis),
+                task.dueDate
+        )
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/service/TaskDeleterTest.kt

@@ -0,0 +1,39 @@
+package com.todoroo.astrid.service
+
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.dao.TaskDao
+import org.tasks.injection.InjectingTestCase
+import javax.inject.Inject
+
+@HiltAndroidTest
+class TaskDeleterTest : InjectingTestCase() {
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var taskDeleter: TaskDeleter
+
+    @Test
+    fun markTaskAsDeleted() = runBlocking {
+        val task = Task()
+        taskDao.createNew(task)
+
+        taskDeleter.markDeleted(task)
+
+        assertTrue(taskDao.fetch(task.id)!!.isDeleted)
+    }
+
+    @Test
+    fun dontDeleteReadOnlyTasks() = runBlocking {
+        val task = Task(
+            readOnly = true
+        )
+        taskDao.createNew(task)
+
+        taskDeleter.markDeleted(task)
+
+        assertFalse(taskDao.fetch(task.id)!!.isDeleted)
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/service/TaskMoverTest.kt

@@ -1,123 +1,123 @@
 package com.todoroo.astrid.service
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.api.CaldavFilter
-import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.CaldavCalendar
-import org.tasks.data.CaldavDao
-import org.tasks.data.GoogleTaskDao
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.filters.CaldavFilter
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.jobs.WorkManager
-import org.tasks.makers.CaldavTaskMaker
 import org.tasks.makers.CaldavTaskMaker.CALENDAR
 import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
 import org.tasks.makers.CaldavTaskMaker.REMOTE_PARENT
+import org.tasks.makers.CaldavTaskMaker.TASK
 import org.tasks.makers.CaldavTaskMaker.newCaldavTask
-import org.tasks.makers.GoogleTaskMaker.LIST
-import org.tasks.makers.GoogleTaskMaker.PARENT
-import org.tasks.makers.GoogleTaskMaker.TASK
-import org.tasks.makers.GoogleTaskMaker.newGoogleTask
-import org.tasks.makers.GtaskListMaker
-import org.tasks.makers.GtaskListMaker.newGtaskList
-import org.tasks.makers.TaskMaker
 import org.tasks.makers.TaskMaker.ID
+import org.tasks.makers.TaskMaker.PARENT
 import org.tasks.makers.TaskMaker.newTask
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TaskMoverTest : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var googleTaskDao: GoogleTaskDao
-    @Inject lateinit var workManager: WorkManager
     @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var taskMover: TaskMover
 
     @Before
-    override fun setUp() {
-        super.setUp()
-        taskDao.initialize(workManager)
+    fun setup() {
+        runBlocking {
+            caldavDao.insert(CaldavCalendar(uuid = "1", account = "account1"))
+            caldavDao.insert(CaldavCalendar(uuid = "2", account = "account2"))
+        }
     }
 
     @Test
-    fun moveBetweenGoogleTaskLists() {
+    fun moveBetweenGoogleTaskLists() = runBlocking {
+        setAccountType("account1", TYPE_GOOGLE_TASKS)
+        setAccountType("account2", TYPE_GOOGLE_TASKS)
         createTasks(1)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 1)
-        assertEquals("2", googleTaskDao.getByTaskId(1)!!.listId)
+        assertEquals("2", googleTaskDao.getByTaskId(1)?.calendar)
     }
 
     @Test
-    fun deleteGoogleTaskAfterMove() {
+    fun deleteGoogleTaskAfterMove() = runBlocking {
         createTasks(1)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 1)
-        val deleted = googleTaskDao.getDeletedByTaskId(1)
+        val deleted = googleTaskDao.getDeletedByTaskId(1, "account1")
         assertEquals(1, deleted.size.toLong())
         assertEquals(1, deleted[0].task)
         assertTrue(deleted[0].deleted > 0)
     }
 
     @Test
-    fun moveChildrenBetweenGoogleTaskLists() {
-        createTasks(1, 2)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
-        googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L)))
+    fun moveChildrenBetweenGoogleTaskLists() = runBlocking {
+        setAccountType("account1", TYPE_GOOGLE_TASKS)
+        setAccountType("account2", TYPE_GOOGLE_TASKS)
+        createTasks(1)
+        createSubtask(2, 1)
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 1)
-        val deleted = googleTaskDao.getDeletedByTaskId(2)
+        val deleted = googleTaskDao.getDeletedByTaskId(2, "account1")
         assertEquals(1, deleted.size.toLong())
         assertEquals(2, deleted[0].task)
         assertTrue(deleted[0].deleted > 0)
-        val task = googleTaskDao.getByTaskId(2)!!
-        assertEquals(1, task.parent)
-        assertEquals("2", task.listId)
+        assertEquals(1L, taskDao.fetch(2)?.parent)
+        assertEquals("2", googleTaskDao.getByTaskId(2)?.calendar)
     }
 
     @Test
-    fun moveBetweenCaldavList() {
+    fun moveBetweenCaldavList() = runBlocking {
         createTasks(1)
-        caldavDao.insert(newCaldavTask(with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1")))
+        caldavDao.insert(newCaldavTask(with(TASK, 1L), with(CALENDAR, "1")))
         moveToCaldavList("2", 1)
         assertEquals("2", caldavDao.getTask(1)!!.calendar)
     }
 
     @Test
-    fun deleteCaldavTaskAfterMove() {
+    fun deleteCaldavTaskAfterMove() = runBlocking {
         createTasks(1)
-        caldavDao.insert(newCaldavTask(with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1")))
+        caldavDao.insert(newCaldavTask(with(TASK, 1L), with(CALENDAR, "1")))
         moveToCaldavList("2", 1)
-        val deleted = caldavDao.getDeleted("1")
+        val deleted = caldavDao.getMoved("1")
         assertEquals(1, deleted.size.toLong())
         assertEquals(1, deleted[0].task)
         assertTrue(deleted[0].deleted > 0)
     }
 
     @Test
-    fun moveRecursiveCaldavChildren() {
+    fun moveRecursiveCaldavChildren() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         createSubtask(3, 2)
         caldavDao.insert(
                 listOf(
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
+                                with(TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 2L),
+                                with(TASK, 2L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_ID, "b"),
                                 with(REMOTE_PARENT, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 3L),
+                                with(TASK, 3L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_PARENT, "b"))))
         moveToCaldavList("2", 1)
-        val deleted = caldavDao.getDeleted("1")
+        val deleted = caldavDao.getMoved("1")
         assertEquals(3, deleted.size.toLong())
         val task = caldavDao.getTask(3)
         assertEquals("2", task!!.calendar)
@@ -125,36 +125,38 @@ class TaskMoverTest : InjectingTestCase() {
     }
 
     @Test
-    fun moveGoogleTaskChildrenToCaldav() {
-        createTasks(1, 2)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
-        googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L)))
-        moveToCaldavList("1", 1)
+    fun moveGoogleTaskChildrenToCaldav() = runBlocking {
+        setAccountType("account1", TYPE_GOOGLE_TASKS)
+        setAccountType("account2", TYPE_CALDAV)
+        createTasks(1)
+        createSubtask(2, 1)
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "1")))
+        moveToCaldavList("2", 1)
         val task = caldavDao.getTask(2)
-        assertEquals("1", task!!.calendar)
-        assertEquals(1, taskDao.fetch(2)!!.parent)
+        assertEquals("2", task!!.calendar)
+        assertEquals(1L, taskDao.fetch(2)?.parent)
     }
 
     @Test
-    fun flattenLocalSubtasksWhenMovingToGoogleTasks() {
+    fun flattenLocalSubtasksWhenMovingToGoogleTasks() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         createSubtask(3, 2)
         moveToGoogleTasks("1", 1)
-        assertEquals(1, googleTaskDao.getByTaskId(3)!!.parent)
-        assertEquals(0, taskDao.fetch(3)!!.parent)
+        assertEquals(1L, taskDao.fetch(3)?.parent)
     }
 
     @Test
-    fun moveLocalChildToGoogleTasks() {
+    fun moveLocalChildToGoogleTasks() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         moveToGoogleTasks("1", 2)
-        assertEquals(0, taskDao.fetch(2)!!.parent)
+        assertEquals(0L, taskDao.fetch(2)?.parent)
     }
 
     @Test
-    fun moveLocalChildToCaldav() {
+    fun moveLocalChildToCaldav() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         moveToCaldavList("1", 2)
@@ -162,49 +164,50 @@ class TaskMoverTest : InjectingTestCase() {
     }
 
     @Test
-    fun flattenCaldavSubtasksWhenMovingToGoogleTasks() {
+    fun flattenCaldavSubtasksWhenMovingToGoogleTasks() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         createSubtask(3, 2)
         caldavDao.insert(
                 listOf(
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
+                                with(TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 2L),
+                                with(TASK, 2L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_ID, "b"),
                                 with(REMOTE_PARENT, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 3L),
+                                with(TASK, 3L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_PARENT, "b"))))
-        moveToGoogleTasks("1", 1)
-        val task = googleTaskDao.getByTaskId(3L)!!
-        assertEquals(1, task.parent)
+        moveToGoogleTasks("2", 1)
+        val task = taskDao.fetch(3L)
+        assertEquals(1L, task?.parent)
     }
 
     @Test
-    fun moveGoogleTaskChildWithoutParent() {
-        createTasks(1, 2)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
-        googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L)))
+    fun moveGoogleTaskChildWithoutParent() = runBlocking {
+        setAccountType("account2", TYPE_GOOGLE_TASKS)
+        createTasks(1)
+        createSubtask(2, 1)
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 2)
-        val task = googleTaskDao.getByTaskId(2)!!
-        assertEquals(0L, task.parent)
-        assertEquals("2", task.listId)
+        assertEquals(0L, taskDao.fetch(2)?.parent)
+        assertEquals("2", googleTaskDao.getByTaskId(2)?.calendar)
     }
 
     @Test
-    fun moveCaldavChildWithoutParent() {
+    fun moveCaldavChildWithoutParent() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         caldavDao.insert(
                 listOf(
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
+                                with(TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 2L),
+                                with(TASK, 2L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_PARENT, "a"))))
         moveToCaldavList("2", 2)
@@ -213,91 +216,114 @@ class TaskMoverTest : InjectingTestCase() {
     }
 
     @Test
-    fun moveGoogleTaskToCaldav() {
+    fun moveGoogleTaskToCaldav() = runBlocking {
         createTasks(1)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
         moveToCaldavList("2", 1)
         assertEquals("2", caldavDao.getTask(1)!!.calendar)
     }
 
     @Test
-    fun moveCaldavToGoogleTask() {
+    fun moveCaldavToGoogleTask() = runBlocking {
+        setAccountType("account1", TYPE_CALDAV)
+        setAccountType("account2", TYPE_GOOGLE_TASKS)
         createTasks(1)
-        caldavDao.insert(newCaldavTask(with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1")))
+        caldavDao.insert(newCaldavTask(with(TASK, 1L), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 1)
-        assertEquals("2", googleTaskDao.getByTaskId(1L)!!.listId)
+        assertEquals("2", googleTaskDao.getByTaskId(1L)?.calendar)
     }
 
     @Test
-    fun moveLocalToCaldav() {
+    fun moveLocalToCaldav() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         createSubtask(3, 2)
         moveToCaldavList("1", 1)
-        assertEquals("1", caldavDao.getTask(3)!!.calendar)
-        assertEquals(2, taskDao.fetch(3)!!.parent)
+        assertEquals("1", caldavDao.getTask(3)?.calendar)
+        assertEquals(2L, taskDao.fetch(3)?.parent)
     }
 
     @Test
-    fun moveToSameGoogleTaskListIsNoop() {
+    fun moveToSameGoogleTaskListIsNoop() = runBlocking {
+        setAccountType("account1", TYPE_GOOGLE_TASKS)
         createTasks(1)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
         moveToGoogleTasks("1", 1)
-        assertTrue(googleTaskDao.getDeletedByTaskId(1).isEmpty())
+        assertTrue(googleTaskDao.getDeletedByTaskId(1, "account1").isEmpty())
         assertEquals(1, googleTaskDao.getAllByTaskId(1).size.toLong())
     }
 
     @Test
-    fun moveToSameCaldavListIsNoop() {
+    fun moveToSameCaldavListIsNoop() = runBlocking {
         createTasks(1)
-        caldavDao.insert(newCaldavTask(with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1")))
+        caldavDao.insert(newCaldavTask(with(TASK, 1L), with(CALENDAR, "1")))
         moveToCaldavList("1", 1)
-        assertTrue(caldavDao.getDeleted("1").isEmpty())
+        assertTrue(caldavDao.getMoved("1").isEmpty())
         assertEquals(1, caldavDao.getTasks(1).size.toLong())
     }
 
     @Test
-    fun dontDuplicateWhenParentAndChildGoogleTaskMoved() {
-        createTasks(1, 2)
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
-        googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L)))
+    fun dontDuplicateWhenParentAndChildGoogleTaskMoved() = runBlocking {
+        createTasks(1)
+        createSubtask(2, 1)
+        googleTaskDao.insert(newCaldavTask(with(TASK, 1), with(CALENDAR, "1")))
+        googleTaskDao.insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "1")))
         moveToGoogleTasks("2", 1, 2)
         assertEquals(1, googleTaskDao.getAllByTaskId(2).filter { it.deleted == 0L }.size)
     }
 
     @Test
-    fun dontDuplicateWhenParentAndChildCaldavMoved() {
+    fun dontDuplicateWhenParentAndChildCaldavMoved() = runBlocking {
         createTasks(1)
         createSubtask(2, 1)
         caldavDao.insert(
                 listOf(
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
+                                with(TASK, 1L), with(CALENDAR, "1"), with(REMOTE_ID, "a")),
                         newCaldavTask(
-                                with(CaldavTaskMaker.TASK, 2L),
+                                with(TASK, 2L),
                                 with(CALENDAR, "1"),
                                 with(REMOTE_PARENT, "a"))))
         moveToCaldavList("2", 1, 2)
         assertEquals(1, caldavDao.getTasks(2).filter { it.deleted == 0L }.size)
     }
 
-    private fun createTasks(vararg ids: Long) {
+    private suspend fun createTasks(vararg ids: Long) {
         for (id in ids) {
             taskDao.createNew(newTask(with(ID, id)))
         }
     }
 
-    private fun createSubtask(id: Long, parent: Long) {
-        taskDao.createNew(newTask(with(ID, id), with(TaskMaker.PARENT, parent)))
+    private suspend fun createSubtask(id: Long, parent: Long) {
+        taskDao.createNew(newTask(with(ID, id), with(PARENT, parent)))
     }
 
-    private fun moveToGoogleTasks(list: String, vararg tasks: Long) {
-        taskMover.move(tasks.toList(), GtasksFilter(newGtaskList(with(GtaskListMaker.REMOTE_ID, list))))
+    private suspend fun moveToGoogleTasks(list: String, vararg tasks: Long) {
+        taskMover.move(
+            tasks.toList(),
+            CaldavFilter(
+                calendar = CaldavCalendar(uuid = list),
+                account = CaldavAccount(accountType = TYPE_GOOGLE_TASKS)
+            )
+        )
     }
 
-    private fun moveToCaldavList(calendar: String, vararg tasks: Long) {
-        taskMover.move(tasks.toList(), CaldavFilter(CaldavCalendar("", calendar)))
+    private suspend fun moveToCaldavList(calendar: String, vararg tasks: Long) {
+        taskMover.move(
+            tasks.toList(),
+            CaldavFilter(
+                CaldavCalendar(name = "", uuid = calendar),
+                account = CaldavAccount(accountType = TYPE_CALDAV)
+            )
+        )
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
+    private suspend fun setAccountType(account: String, type: Int) {
+        caldavDao.insert(
+            CaldavAccount(
+                uuid = account,
+                accountType = type,
+            )
+        )
+    }
 }

app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt

@@ -5,42 +5,53 @@
  */
 package com.todoroo.astrid.service
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.ical.values.Frequency
-import com.google.ical.values.RRule
-import com.todoroo.astrid.data.Task
 import com.todoroo.astrid.utility.TitleParser
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import net.fortuna.ical4j.model.Recur.Frequency.DAILY
+import net.fortuna.ical4j.model.Recur.Frequency.MONTHLY
+import net.fortuna.ical4j.model.Recur.Frequency.WEEKLY
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotSame
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.R
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.Task
+import org.tasks.data.newLocalAccount
 import org.tasks.date.DateTimeUtils
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.preferences.Preferences
-import java.util.*
+import org.tasks.repeats.RecurrenceUtils.newRecur
+import java.util.Calendar
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TitleParserTest : InjectingTestCase() {
     @Inject lateinit var tagDataDao: TagDataDao
     @Inject lateinit var preferences: Preferences
     @Inject lateinit var taskCreator: TaskCreator
-    
+    @Inject lateinit var caldavDao: CaldavDao
+
+    @Before
     override fun setUp() {
-        super.setUp()
-        preferences.setStringFromInteger(R.string.p_default_urgency_key, 0)
+        runBlocking {
+            super.setUp()
+            preferences.setStringFromInteger(R.string.p_default_urgency_key, 0)
+            caldavDao.newLocalAccount()
+        }
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     /**
      * test that completing a task w/ no regular expressions creates a simple task with no date, no
      * repeat, no lists
      */
     @Test
-    fun testNoRegexes() {
+    fun testNoRegexes() = runBlocking {
         val task = taskCreator.basicQuickAddTask("Jog")
         val nothing = Task()
         assertFalse(task.hasDueTime())
@@ -146,13 +157,14 @@ class TitleParserTest : InjectingTestCase() {
         }
     }
 
-    private fun insertTitleAddTask(title: String): Task {
-        return taskCreator.createWithValues(title)
+    private fun insertTitleAddTask(title: String): Task = runBlocking {
+        taskCreator.createWithValues(title)
     }
 
     // ----------------Days begin----------------//
     @Test
-    fun testDays() {
+    @Ignore("Flaky test")
+    fun testDays() = runBlocking {
         val today = Calendar.getInstance()
         var title = "Jog today"
         var task = taskCreator.createWithValues(title)
@@ -181,7 +193,7 @@ class TitleParserTest : InjectingTestCase() {
     // ----------------Priority begin----------------//
     /** tests all words using priority 0  */
     @Test
-    fun testPriority0() {
+    fun testPriority0() = runBlocking {
         val acceptedStrings = arrayOf("priority 0", "least priority", "lowest priority", "bang 0")
         for (acceptedString in acceptedStrings) {
             val title = "Jog $acceptedString"
@@ -196,7 +208,7 @@ class TitleParserTest : InjectingTestCase() {
     }
 
     @Test
-    fun testPriority1() {
+    fun testPriority1() = runBlocking {
         val acceptedStringsAtEnd = arrayOf("priority 1", "low priority", "bang", "bang 1")
         val acceptedStringsAnywhere = arrayOf("!1", "!")
         var task: Task
@@ -221,7 +233,7 @@ class TitleParserTest : InjectingTestCase() {
     }
 
     @Test
-    fun testPriority2() {
+    fun testPriority2() = runBlocking {
         val acceptedStringsAtEnd = arrayOf("priority 2", "high priority", "bang bang", "bang 2")
         val acceptedStringsAnywhere = arrayOf("!2", "!!")
         for (acceptedStringAtEnd in acceptedStringsAtEnd) {
@@ -243,7 +255,7 @@ class TitleParserTest : InjectingTestCase() {
     }
 
     @Test
-    fun testPriority3() {
+    fun testPriority3() = runBlocking {
         val acceptedStringsAtEnd = arrayOf(
                 "priority 3",
                 "highest priority",
@@ -273,25 +285,25 @@ class TitleParserTest : InjectingTestCase() {
     // ----------------Repeats begin----------------//
     /** test daily repeat from due date, but with no due date set  */
     @Test
-    fun testDailyWithNoDueDate() {
+    fun testDailyWithNoDueDate() = runBlocking {
         var title = "Jog daily"
         var task = taskCreator.createWithValues(title)
-        val rrule = RRule()
-        rrule.freq = Frequency.DAILY
-        rrule.interval = 1
-        assertEquals(task.recurrence, rrule.toIcal())
+        val recur = newRecur()
+        recur.setFrequency(DAILY.name)
+        recur.interval = 1
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         title = "Jog every day"
         task = taskCreator.createWithValues(title)
-        assertEquals(task.recurrence, rrule.toIcal())
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         for (i in 1..12) {
             title = "Jog every $i days."
-            rrule.interval = i
+            recur.interval = i
             task = taskCreator.createWithValues(title)
-            assertEquals(task.recurrence, rrule.toIcal())
+            assertEquals(task.recurrence, recur.toString())
             assertFalse(task.hasDueTime())
             assertFalse(task.hasDueDate())
         }
@@ -299,25 +311,25 @@ class TitleParserTest : InjectingTestCase() {
 
     /** test weekly repeat from due date, with no due date & time set  */
     @Test
-    fun testWeeklyWithNoDueDate() {
+    fun testWeeklyWithNoDueDate() = runBlocking {
         var title = "Jog weekly"
         var task = taskCreator.createWithValues(title)
-        val rrule = RRule()
-        rrule.freq = Frequency.WEEKLY
-        rrule.interval = 1
-        assertEquals(task.recurrence, rrule.toIcal())
+        val recur = newRecur()
+        recur.setFrequency(WEEKLY.name)
+        recur.interval = 1
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         title = "Jog every week"
         task = taskCreator.createWithValues(title)
-        assertEquals(task.recurrence, rrule.toIcal())
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         for (i in 1..12) {
             title = "Jog every $i weeks"
-            rrule.interval = i
+            recur.interval = i
             task = taskCreator.createWithValues(title)
-            assertEquals(task.recurrence, rrule.toIcal())
+            assertEquals(task.recurrence, recur.toString())
             assertFalse(task.hasDueTime())
             assertFalse(task.hasDueDate())
         }
@@ -325,70 +337,70 @@ class TitleParserTest : InjectingTestCase() {
 
     /** test hourly repeat from due date, with no due date but no time  */
     @Test
-    fun testMonthlyFromNoDueDate() {
+    fun testMonthlyFromNoDueDate() = runBlocking {
         var title = "Jog monthly"
         var task = taskCreator.createWithValues(title)
-        val rrule = RRule()
-        rrule.freq = Frequency.MONTHLY
-        rrule.interval = 1
-        assertEquals(task.recurrence, rrule.toIcal())
+        val recur = newRecur()
+        recur.setFrequency(MONTHLY.name)
+        recur.interval = 1
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         title = "Jog every month"
         task = taskCreator.createWithValues(title)
-        assertEquals(task.recurrence, rrule.toIcal())
+        assertEquals(task.recurrence, recur.toString())
         assertFalse(task.hasDueTime())
         assertFalse(task.hasDueDate())
         for (i in 1..12) {
             title = "Jog every $i months"
-            rrule.interval = i
+            recur.interval = i
             task = taskCreator.createWithValues(title)
-            assertEquals(task.recurrence, rrule.toIcal())
+            assertEquals(task.recurrence, recur.toString())
             assertFalse(task.hasDueTime())
             assertFalse(task.hasDueDate())
         }
     }
 
     @Test
-    fun testDailyFromDueDate() {
+    fun testDailyFromDueDate() = runBlocking {
         var title = "Jog daily starting from today"
         var task = taskCreator.createWithValues(title)
-        val rrule = RRule()
-        rrule.freq = Frequency.DAILY
-        rrule.interval = 1
-        assertEquals(task.recurrence, rrule.toIcal())
+        val recur = newRecur()
+        recur.setFrequency(DAILY.name)
+        recur.interval = 1
+        assertEquals(task.recurrence, recur.toString())
         assertTrue(task.hasDueDate())
         title = "Jog every day starting from today"
         task = taskCreator.createWithValues(title)
-        assertEquals(task.recurrence, rrule.toIcal())
+        assertEquals(task.recurrence, recur.toString())
         assertTrue(task.hasDueDate())
         for (i in 1..12) {
             title = "Jog every $i days starting from today"
-            rrule.interval = i
+            recur.interval = i
             task = taskCreator.createWithValues(title)
-            assertEquals(task.recurrence, rrule.toIcal())
+            assertEquals(task.recurrence, recur.toString())
             assertTrue(task.hasDueDate())
         }
     }
 
     @Test
-    fun testWeeklyFromDueDate() {
+    fun testWeeklyFromDueDate() = runBlocking {
         var title = "Jog weekly starting from today"
         var task = taskCreator.createWithValues(title)
-        val rrule = RRule()
-        rrule.freq = Frequency.WEEKLY
-        rrule.interval = 1
-        assertEquals(task.recurrence, rrule.toIcal())
+        val recur = newRecur()
+        recur.setFrequency(WEEKLY.name)
+        recur.interval = 1
+        assertEquals(task.recurrence, recur.toString())
         assertTrue(task.hasDueDate())
         title = "Jog every week starting from today"
         task = taskCreator.createWithValues(title)
-        assertEquals(task.recurrence, rrule.toIcal())
+        assertEquals(task.recurrence, recur.toString())
         assertTrue(task.hasDueDate())
         for (i in 1..12) {
             title = "Jog every $i weeks starting from today"
-            rrule.interval = i
+            recur.interval = i
             task = taskCreator.createWithValues(title)
-            assertEquals(task.recurrence, rrule.toIcal())
+            assertEquals(task.recurrence, recur.toString())
             assertTrue(task.hasDueDate())
         }
     }
@@ -396,7 +408,7 @@ class TitleParserTest : InjectingTestCase() {
     // ----------------Tags begin----------------//
     /** tests all words using priority 0  */
     @Test
-    fun testTagsPound() {
+    fun testTagsPound() = runBlocking {
         val acceptedStrings = arrayOf("#tag", "#a", "#(a cool tag)", "#(cool)")
         var task: Task
         for (acceptedString in acceptedStrings) {
@@ -413,7 +425,7 @@ class TitleParserTest : InjectingTestCase() {
 
     /** tests all words using priority 0  */
     @Test
-    fun testTagsAt() {
+    fun testTagsAt() = runBlocking {
         val acceptedStrings = arrayOf("@tag", "@a", "@(a cool tag)", "@(cool)")
         var task: Task
         for (acceptedString in acceptedStrings) {

app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_12_3_Test.kt

@@ -0,0 +1,62 @@
+@file:Suppress("ClassName")
+
+package com.todoroo.astrid.service
+
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.todoroo.astrid.service.Upgrade_11_12_3.Companion.LEGACY_PREFERENCE
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.tasks.TestUtilities.newPreferences
+import org.tasks.preferences.Preferences
+
+@RunWith(AndroidJUnit4::class)
+class Upgrade_11_12_3_Test {
+    private lateinit var preferences: Preferences
+    private lateinit var upgrader: Upgrade_11_12_3
+
+    @Test
+    fun migrateNoDefaultReminders() {
+        preferences.setString(LEGACY_PREFERENCE, "0")
+        upgrader.migrateDefaultReminderPreference()
+
+        assertEquals(emptySet<String>(), preferences.defaultRemindersSet)
+        assertEquals(0, preferences.defaultReminders)
+    }
+
+    @Test
+    fun migrateWhenDue() {
+        preferences.setString(LEGACY_PREFERENCE, "2")
+        upgrader.migrateDefaultReminderPreference()
+
+        assertEquals(setOf("2"), preferences.defaultRemindersSet)
+        assertEquals(2, preferences.defaultReminders)
+    }
+
+    @Test
+    fun migrateWhenOverdue() {
+        preferences.setString(LEGACY_PREFERENCE, "4")
+        upgrader.migrateDefaultReminderPreference()
+
+        assertEquals(setOf("4"), preferences.defaultRemindersSet)
+        assertEquals(4, preferences.defaultReminders)
+    }
+
+    @Test
+    fun migrateWhenDueAndOverdue() {
+        preferences.setString(LEGACY_PREFERENCE, "6")
+        upgrader.migrateDefaultReminderPreference()
+
+        assertEquals(setOf("2", "4"), preferences.defaultRemindersSet)
+        assertEquals(6, preferences.defaultReminders)
+    }
+
+    @Before
+    fun setUp() {
+        preferences = newPreferences(ApplicationProvider.getApplicationContext())
+        preferences.clear()
+        upgrader = Upgrade_11_12_3(preferences)
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/service/Upgrade_11_3_Test.kt

@@ -0,0 +1,217 @@
+@file:Suppress("ClassName")
+
+package com.todoroo.astrid.service
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.TestUtilities.assertEquals
+import org.tasks.caldav.VtodoCache
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.Task
+import org.tasks.injection.InjectingTestCase
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
+import org.tasks.makers.TaskMaker.DUE_DATE
+import org.tasks.makers.TaskMaker.HIDE_TYPE
+import org.tasks.makers.TaskMaker.MODIFICATION_TIME
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.opentasks.TestOpenTaskDao
+import org.tasks.time.DateTime
+import javax.inject.Inject
+
+@HiltAndroidTest
+class Upgrade_11_3_Test : InjectingTestCase() {
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var caldavDao: CaldavDao
+    @Inject lateinit var openTaskDao: TestOpenTaskDao
+    @Inject lateinit var upgrader: Upgrade_11_3
+    @Inject lateinit var vtodoCache: VtodoCache
+
+    private lateinit var calendar: CaldavCalendar
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+        calendar = CaldavCalendar()
+        runBlocking {
+            caldavDao.insert(calendar)
+        }
+    }
+
+    @Test
+    fun applyRemoteiCalendarStartDate() = runBlocking {
+        val taskId = taskDao.insert(newTask())
+        val caldavTask = newCaldavTask(with(TASK, taskId), with(CALENDAR, calendar.uuid))
+        caldavDao.insert(caldavTask)
+        vtodoCache.putVtodo(calendar, caldavTask, VTODO_WITH_START_DATE)
+
+        upgrader.applyiCalendarStartDates()
+
+        assertEquals(DateTime(2021, 1, 21), taskDao.fetch(taskId)?.hideUntil)
+    }
+
+    @Test
+    fun ignoreRemoteiCalendarStartDate() = runBlocking {
+        val taskId = taskDao.insert(newTask(
+                with(DUE_DATE, DateTime(2021, 1, 20)),
+                with(HIDE_TYPE, Task.HIDE_UNTIL_DUE)
+        ))
+        val caldavTask = newCaldavTask(with(TASK, taskId), with(CALENDAR, calendar.uuid))
+        caldavDao.insert(caldavTask)
+        vtodoCache.putVtodo(calendar, caldavTask, VTODO_WITH_START_DATE)
+
+        upgrader.applyiCalendarStartDates()
+
+        assertEquals(DateTime(2021, 1, 20), taskDao.fetch(taskId)?.hideUntil)
+    }
+
+    @Test
+    fun touchTaskWithLocaliCalendarStartDate() = runBlocking {
+        val upgradeTime = DateTime(2021, 1, 21, 11, 47, 32, 450)
+        val taskId = taskDao.insert(newTask(
+                with(DUE_DATE, DateTime(2021, 1, 20)),
+                with(HIDE_TYPE, Task.HIDE_UNTIL_DUE),
+                with(MODIFICATION_TIME, DateTime(2021, 1, 21, 9, 50, 4, 348))
+        ))
+        val caldavTask = newCaldavTask(with(TASK, taskId), with(CALENDAR, calendar.uuid))
+        caldavDao.insert(caldavTask)
+        vtodoCache.putVtodo(calendar, caldavTask, VTODO_WITH_START_DATE)
+
+        freezeAt(upgradeTime) {
+            upgrader.applyiCalendarStartDates()
+        }
+
+        assertEquals(upgradeTime, taskDao.fetch(taskId)?.modificationDate)
+    }
+
+    @Test
+    fun dontTouchWhenNoiCalendarStartDate() = runBlocking {
+        val modificationTime = DateTime(2021, 1, 21, 9, 50, 4, 348)
+        val taskId = taskDao.insert(newTask(with(MODIFICATION_TIME, modificationTime)))
+        val caldavTask = newCaldavTask(with(TASK, taskId), with(CALENDAR, calendar.uuid))
+        caldavDao.insert(caldavTask)
+        vtodoCache.putVtodo(calendar, caldavTask, VTODO_NO_START_DATE)
+
+        upgrader.applyiCalendarStartDates()
+
+        assertEquals(modificationTime, taskDao.fetch(taskId)?.modificationDate)
+    }
+
+    @Test
+    fun applyRemoteOpenTaskStartDate() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        openTaskDao.insertTask(listId, VTODO_WITH_START_DATE)
+        val taskId = taskDao.insert(newTask())
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "4586964443060640060"),
+                with(TASK, taskId)
+        ))
+
+        upgrader.applyOpenTaskStartDates()
+
+        assertEquals(DateTime(2021, 1, 21), taskDao.fetch(taskId)?.hideUntil)
+    }
+
+    @Test
+    fun ignoreRemoteOpenTaskStartDate() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        openTaskDao.insertTask(listId, VTODO_WITH_START_DATE)
+        val taskId = taskDao.insert(newTask(
+                with(DUE_DATE, DateTime(2021, 1, 20)),
+                with(HIDE_TYPE, Task.HIDE_UNTIL_DUE)
+        ))
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "4586964443060640060"),
+                with(TASK, taskId)
+        ))
+
+        upgrader.applyOpenTaskStartDates()
+
+        assertEquals(DateTime(2021, 1, 20), taskDao.fetch(taskId)?.hideUntil)
+    }
+
+    @Test
+    fun touchWithOpenTaskStartDate() = runBlocking {
+        val upgradeTime = DateTime(2021, 1, 21, 11, 47, 32, 450)
+        val (listId, list) = openTaskDao.insertList()
+        openTaskDao.insertTask(listId, VTODO_WITH_START_DATE)
+        val taskId = taskDao.insert(newTask(
+                with(DUE_DATE, DateTime(2021, 1, 20)),
+                with(HIDE_TYPE, Task.HIDE_UNTIL_DUE),
+                with(MODIFICATION_TIME, DateTime(2021, 1, 21, 9, 50, 4, 348))
+        ))
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "4586964443060640060"),
+                with(TASK, taskId)
+        ))
+
+        freezeAt(upgradeTime) {
+            upgrader.applyOpenTaskStartDates()
+        }
+
+        assertEquals(upgradeTime, taskDao.fetch(taskId)?.modificationDate)
+    }
+
+    @Test
+    fun dontTouchNoOpenTaskStartDate() = runBlocking {
+        val modificationTime = DateTime(2021, 1, 21, 9, 50, 4, 348)
+        val (listId, list) = openTaskDao.insertList()
+        openTaskDao.insertTask(listId, VTODO_NO_START_DATE)
+        val taskId = taskDao.insert(newTask(with(MODIFICATION_TIME, modificationTime)))
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "4586964443060640060"),
+                with(TASK, taskId)
+        ))
+
+        upgrader.applyOpenTaskStartDates()
+
+        assertEquals(modificationTime, taskDao.fetch(taskId)?.modificationDate)
+    }
+
+    companion object {
+        val VTODO_WITH_START_DATE = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110301//EN
+            BEGIN:VTODO
+            DTSTAMP:20210121T153032Z
+            UID:4586964443060640060
+            CREATED:20210121T153000Z
+            LAST-MODIFIED:20210121T153029Z
+            SUMMARY:Test
+            PRIORITY:9
+            X-APPLE-SORT-ORDER:-27
+            DTSTART;VALUE=DATE:20210121
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        val VTODO_NO_START_DATE = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110301//EN
+            BEGIN:VTODO
+            DTSTAMP:20210121T153032Z
+            UID:4586964443060640060
+            CREATED:20210121T153000Z
+            LAST-MODIFIED:20210121T153029Z
+            SUMMARY:Test
+            PRIORITY:9
+            X-APPLE-SORT-ORDER:-27
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.kt

@@ -1,26 +1,28 @@
 package com.todoroo.astrid.subtasks
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.TaskListMetadata
-import org.tasks.injection.TestComponent
+import org.tasks.data.entity.TaskListMetadata
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class SubtasksHelperTest : SubtasksTestCase() {
-    
+    @Before
     override fun setUp() {
         super.setUp()
         createTasks()
         val m = TaskListMetadata()
         m.filter = TaskListMetadata.FILTER_ID_ALL
-        updater.initializeFromSerializedTree(
-                m, filter, SubtasksHelper.convertTreeToRemoteIds(taskDao, DEFAULT_SERIALIZED_TREE))
+        runBlocking {
+            updater.initializeFromSerializedTree(
+                    m, filter, SubtasksHelper.convertTreeToRemoteIds(taskDao, DEFAULT_SERIALIZED_TREE))
+        }
     }
 
-    private fun createTask(title: String, uuid: String) {
+    private fun createTask(title: String, uuid: String) = runBlocking {
         val t = Task()
         t.title = title
         t.uuid = uuid
@@ -47,16 +49,14 @@ class SubtasksHelperTest : SubtasksTestCase() {
     }
 
     @Test
-    fun testLocalToRemoteIdMapping() {
+    fun testLocalToRemoteIdMapping() = runBlocking {
         val mapped = SubtasksHelper.convertTreeToRemoteIds(taskDao, DEFAULT_SERIALIZED_TREE)
                 .replace("\\s".toRegex(), "")
         assertEquals(EXPECTED_REMOTE, mapped)
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     companion object {
         private val EXPECTED_ORDER = arrayOf("-1", "1", "2", "3", "4", "5", "6")
-        private val EXPECTED_REMOTE = "[\"-1\", [\"6\", \"4\", [\"3\", \"1\"]], \"2\", \"5\"]".replace("\\s".toRegex(), "")
+        private val EXPECTED_REMOTE = """["-1", ["6", "4", ["3", "1"]], "2", "5"]""".replace("\\s".toRegex(), "")
     }
 }

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.kt

@@ -1,13 +1,13 @@
 package com.todoroo.astrid.subtasks
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.TaskListMetadata
-import org.tasks.injection.TestComponent
+import org.tasks.data.entity.TaskListMetadata
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class SubtasksMovingTest : SubtasksTestCase() {
     private lateinit var A: Task
     private lateinit var B: Task
@@ -16,13 +16,16 @@ class SubtasksMovingTest : SubtasksTestCase() {
     private lateinit var E: Task
     private lateinit var F: Task
 
+    @Before
     override fun setUp() {
         super.setUp()
         createTasks()
         val m = TaskListMetadata()
         m.filter = TaskListMetadata.FILTER_ID_ALL
-        updater.initializeFromSerializedTree(
-                m, filter, SubtasksHelper.convertTreeToRemoteIds(taskDao, DEFAULT_SERIALIZED_TREE))
+        runBlocking {
+            updater.initializeFromSerializedTree(
+                    m, filter, SubtasksHelper.convertTreeToRemoteIds(taskDao, DEFAULT_SERIALIZED_TREE))
+        }
 
         // Assert initial state is correct
         expectParentAndPosition(A, null, 0)
@@ -33,8 +36,6 @@ class SubtasksMovingTest : SubtasksTestCase() {
         expectParentAndPosition(F, null, 2)
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     private fun createTasks() {
         A = createTask("A")
         B = createTask("B")
@@ -44,16 +45,16 @@ class SubtasksMovingTest : SubtasksTestCase() {
         F = createTask("F")
     }
 
-    private fun createTask(title: String): Task {
+    private fun createTask(title: String): Task = runBlocking {
         val task = Task()
         task.title = title
         taskDao.createNew(task)
-        return task
+        task
     }
 
-    private fun whenTriggerMoveBefore(target: Task?, before: Task?) {
-        val beforeId = if (before == null) "-1" else before.uuid
-        updater.moveTo(null, filter, target!!.uuid, beforeId)
+    private fun whenTriggerMoveBefore(target: Task?, before: Task?) = runBlocking {
+        val beforeId = before?.uuid ?: "-1"
+        updater.moveTo(TaskListMetadata(), filter, target!!.uuid, beforeId)
     }
 
     /* Starting State (see SubtasksTestCase):

app/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.kt

@@ -1,37 +1,37 @@
 package com.todoroo.astrid.subtasks
 
-import androidx.test.InstrumentationRegistry
-import com.todoroo.astrid.api.Filter
-import com.todoroo.astrid.core.BuiltInFilterExposer
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
-import org.tasks.data.TaskListMetadataDao
+import org.tasks.data.dao.TaskListMetadataDao
+import org.tasks.data.entity.Task
+import org.tasks.filters.AstridOrderingFilter
+import org.tasks.filters.MyTasksFilter
 import org.tasks.injection.InjectingTestCase
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
 
 abstract class SubtasksTestCase : InjectingTestCase() {
     lateinit var updater: SubtasksFilterUpdater
-    lateinit var filter: Filter
+    lateinit var filter: AstridOrderingFilter
     @Inject lateinit var taskListMetadataDao: TaskListMetadataDao
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var preferences: Preferences
     
     override fun setUp() {
         super.setUp()
-        filter = BuiltInFilterExposer.getMyTasksFilter(InstrumentationRegistry.getTargetContext().resources)
+        filter = runBlocking { MyTasksFilter.create() }
         preferences.clear(SubtasksFilterUpdater.ACTIVE_TASKS_ORDER)
         updater = SubtasksFilterUpdater(taskListMetadataDao, taskDao)
     }
 
     fun expectParentAndPosition(task: Task, parent: Task?, positionInParent: Int) {
-        val parentId = if (parent == null) "-1" else parent.uuid
+        val parentId = parent?.uuid ?: "-1"
         val n = updater.findNodeForTask(task.uuid)
         assertNotNull("No node found for task " + task.title, n)
-        assertEquals("Parent mismatch", parentId, n.parent.uuid)
-        assertEquals("Position mismatch", positionInParent, n.parent.children.indexOf(n))
+        assertEquals("Parent mismatch", parentId, n!!.parent!!.uuid)
+        assertEquals("Position mismatch", positionInParent, n.parent!!.children.indexOf(n))
     }
 
     companion object {

app/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.kt

@@ -1,34 +1,31 @@
 package com.todoroo.astrid.sync
 
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import org.tasks.data.TagData
-import org.tasks.data.TagDataDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.TagData
+import org.tasks.data.entity.Task
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import javax.inject.Inject
 
 open class NewSyncTestCase : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var tagDataDao: TagDataDao
 
-    fun createTask(): Task {
-        val task = Task()
-        task.title = SYNC_TASK_TITLE
-        task.priority = SYNC_TASK_IMPORTANCE
+    suspend fun createTask(): Task {
+        val task = Task(
+            title = SYNC_TASK_TITLE,
+            priority = SYNC_TASK_IMPORTANCE,
+        )
         taskDao.createNew(task)
         return task
     }
 
-    fun createTagData(): TagData {
-        val tag = TagData()
-        tag.name = "new tag"
-        tagDataDao.createNew(tag)
+    suspend fun createTagData(): TagData {
+        val tag = TagData(name = "new tag")
+        tagDataDao.insert(tag)
         return tag
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     companion object {
         private const val SYNC_TASK_TITLE = "new title"
         private const val SYNC_TASK_IMPORTANCE = Task.Priority.MEDIUM

app/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.kt

@@ -1,21 +1,22 @@
 package com.todoroo.astrid.sync
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class SyncModelTest : NewSyncTestCase() {
+
     @Test
-    fun testCreateTaskMakesUuid() {
+    fun testCreateTaskMakesUuid() = runBlocking{
         val task = createTask()
         assertNotEquals(Task.NO_UUID, task.uuid)
     }
 
     @Test
-    fun testCreateTagMakesUuid() {
+    fun testCreateTagMakesUuid() = runBlocking{
         val tag = createTagData()
         assertNotEquals(Task.NO_UUID, tag.remoteId)
     }

app/src/androidTest/java/org/tasks/Freeze.kt

@@ -0,0 +1 @@
+../../../../test/java/org/tasks/Freeze.kt

app/src/androidTest/java/org/tasks/SuspendFreeze.kt

@@ -0,0 +1 @@
+../../../../test/java/org/tasks/SuspendFreeze.kt

app/src/androidTest/java/org/tasks/TestRunner.kt

@@ -0,0 +1,13 @@
+package org.tasks
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+@Suppress("unused")
+class TestRunner : AndroidJUnitRunner() {
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}

app/src/androidTest/java/org/tasks/TestUtilities.kt

@@ -0,0 +1 @@
+../../../../test/java/org/tasks/TestUtilities.kt

app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.kt

@@ -1,20 +1,18 @@
 package org.tasks.caldav
 
-import android.content.Context
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.TestUtilities.newPreferences
-import java.security.KeyManagementException
-import java.security.NoSuchAlgorithmException
+import org.tasks.injection.InjectingTestCase
+import javax.inject.Inject
+
+@HiltAndroidTest
+class CaldavClientTest : InjectingTestCase() {
+
+    @Inject lateinit var clientProvider: CaldavClientProvider
 
-@RunWith(AndroidJUnit4::class)
-class CaldavClientTest {
     @Test
-    fun dontCrashOnSpaceInUrl() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        CaldavClient(context, null, newPreferences(context), null)
-                .forUrl("https://example.com/remote.php/a space/", "username", "password")
+    fun dontCrashOnSpaceInUrl(): Unit = runBlocking {
+        clientProvider.forUrl("https://example.com/remote.php/a space/", "username", "password")
     }
 }

app/src/androidTest/java/org/tasks/caldav/CaldavSynchronizerTest.kt

@@ -0,0 +1,220 @@
+package org.tasks.caldav
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import org.tasks.data.UUIDHelper
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.ETAG
+import org.tasks.makers.CaldavTaskMaker.OBJECT
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
+import org.tasks.makers.TaskMaker.newTask
+
+@HiltAndroidTest
+class CaldavSynchronizerTest : CaldavTest() {
+
+    @Before
+    override fun setUp() = runBlocking {
+        super.setUp()
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = "username",
+            password = encryption.encrypt("password"),
+            url = server.url("/remote.php/dav/calendars/user1/").toString(),
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+    }
+
+    @Test
+    fun setMessageOnError() = runBlocking {
+        enqueue()
+
+        synchronizer.sync(account)
+
+        assertEquals("HTTP 500 Server Error", caldavDao.getAccounts().first().error)
+    }
+
+    @Test
+    fun dontFetchCalendarIfCtagMatches() = runBlocking {
+        caldavDao.insert(
+            CaldavCalendar(
+                account = this@CaldavSynchronizerTest.account.uuid,
+                ctag = "http://sabre.io/ns/sync/1",
+                url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
+            )
+        )
+        enqueue(OC_SHARE_PROPFIND)
+
+        sync()
+    }
+
+    @Test
+    fun dontFetchTaskIfEtagMatches() = runBlocking {
+        val calendar = CaldavCalendar(
+            account = this@CaldavSynchronizerTest.account.uuid,
+            uuid = UUIDHelper.newUUID(),
+            url = "${this@CaldavSynchronizerTest.account.url}test-shared/",
+        )
+        caldavDao.insert(calendar)
+        caldavDao.insert(newCaldavTask(
+            with(TASK, taskDao.insert(newTask())),
+            with(OBJECT, "3164728546640386952.ics"),
+            with(ETAG, "43b3ffaac5131880e4dd07a79adba82a"),
+            with(CALENDAR, calendar.uuid)
+        ))
+        enqueue(OC_SHARE_PROPFIND, OC_SHARE_REPORT)
+
+        sync()
+    }
+
+    @Test
+    fun syncNewTask() = runBlocking {
+        enqueue(OC_SHARE_PROPFIND, OC_SHARE_REPORT, OC_SHARE_TASK)
+
+        sync()
+
+        val calendar = caldavDao.getCalendars().takeIf { it.size == 1 }!!.first()
+        val caldavTask = caldavDao.getTaskByRemoteId(calendar.uuid!!, "3164728546640386952")!!
+        assertEquals("Test task", taskDao.fetch(caldavTask.task)!!.title)
+    }
+
+    companion object {
+        private val OC_SHARE_PROPFIND = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:d="DAV:" xmlns:cal="urn:ietf:params:xml:ns:caldav"
+              xmlns:cs="http://calendarserver.org/ns/" xmlns:oc="http://owncloud.org/ns">
+                <d:response>
+                    <d:href>/remote.php/dav/calendars/user1/test-shared/</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:resourcetype>
+                                <d:collection />
+                                <cal:calendar />
+                            </d:resourcetype>
+                            <d:displayname>Test shared</d:displayname>
+                            <cal:supported-calendar-component-set>
+                                <cal:comp name="VTODO" />
+                            </cal:supported-calendar-component-set>
+                            <cs:getctag>http://sabre.io/ns/sync/1</cs:getctag>
+                            <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/">#0082c9</x1:calendar-color>
+                            <d:sync-token>http://sabre.io/ns/sync/1</d:sync-token>
+                            <oc:owner-principal>principals/users/user1</oc:owner-principal>
+                            <oc:invite>
+                                <oc:user>
+                                    <d:href>principal:principals/users/user2</d:href>
+                                    <oc:common-name>user2</oc:common-name>
+                                    <oc:invite-accepted />
+                                    <oc:access>
+                                        <oc:read />
+                                    </oc:access>
+                                </oc:user>
+                            </oc:invite>
+                            <d:current-user-privilege-set>
+                                <d:privilege>
+                                    <d:write />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-properties />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-content />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unlock />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:bind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unbind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-current-user-privilege-set />
+                                </d:privilege>
+                                <d:privilege>
+                                    <cal:read-free-busy />
+                                </d:privilege>
+                            </d:current-user-privilege-set>
+                            <d:current-user-principal>
+                                <d:href>/remote.php/dav/principals/users/user1/</d:href>
+                            </d:current-user-principal>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <d:share-access />
+                            <d:invite />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+
+        private val OC_SHARE_REPORT = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:d="DAV:">
+                <d:response>
+                    <d:href>/remote.php/dav/calendars/user1/test-shared/3164728546640386952.ics</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:getetag>&quot;43b3ffaac5131880e4dd07a79adba82a&quot;</d:getetag>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+
+        private val OC_SHARE_TASK = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:d="DAV:" xmlns:cal="urn:ietf:params:xml:ns:caldav">
+                <d:response>
+                    <d:href>/remote.php/dav/calendars/user1/test-shared/3164728546640386952.ics</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:getcontenttype>text/calendar; charset=utf-8; component=vtodo</d:getcontenttype>
+                            <d:getetag>&quot;43b3ffaac5131880e4dd07a79adba82a&quot;</d:getetag>
+                            <cal:calendar-data>BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110500//EN
+            BEGIN:VTODO
+            DTSTAMP:20210223T154147Z
+            UID:3164728546640386952
+            CREATED:20210223T154134Z
+            LAST-MODIFIED:20210223T154140Z
+            SUMMARY:Test task
+            PRIORITY:9
+            END:VTODO
+            END:VCALENDAR</cal:calendar-data>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <cal:schedule-tag />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/caldav/CaldavTest.kt

@@ -0,0 +1,68 @@
+package org.tasks.caldav
+
+import com.todoroo.astrid.dao.TaskDao
+import junit.framework.Assert.assertFalse
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.rules.Timeout
+import org.tasks.R
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.dao.CaldavDao
+import org.tasks.injection.InjectingTestCase
+import org.tasks.preferences.Preferences
+import org.tasks.security.KeyStoreEncryption
+import javax.inject.Inject
+
+abstract class CaldavTest : InjectingTestCase() {
+    @Inject lateinit var synchronizer: CaldavSynchronizer
+    @Inject lateinit var encryption: KeyStoreEncryption
+    @Inject lateinit var preferences: Preferences
+    @Inject lateinit var caldavDao: CaldavDao
+    @Inject lateinit var taskDao: TaskDao
+    protected val server = MockWebServer()
+    protected lateinit var account: CaldavAccount
+
+    @get:Rule
+    val globalTimeout: Timeout = Timeout.seconds(30)
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+
+        preferences.setBoolean(R.string.p_debug_pro, true)
+        server.start()
+        headers.clear()
+    }
+
+    @After
+    fun after() = server.shutdown()
+
+    protected suspend fun sync(account: CaldavAccount = this.account) {
+        synchronizer.sync(account)
+
+        assertFalse(caldavDao.getAccountByUuid(account.uuid!!)!!.hasError)
+    }
+
+    val headers = HashMap<String, String>()
+
+    protected fun enqueue(vararg responses: String) {
+        responses.forEach {
+            server.enqueue(
+                MockResponse()
+                    .setResponseCode(207)
+                    .setHeader("Content-Type", "text/xml; charset=\"utf-8\"")
+                    .apply { this@CaldavTest.headers.forEach { (k, v) -> setHeader(k, v) } }
+                    .setBody(it))
+        }
+        server.enqueue(MockResponse().setResponseCode(500))
+    }
+
+    companion object {
+        init {
+            CaldavSynchronizer.registerFactories()
+        }
+    }
+}

app/src/androidTest/java/org/tasks/caldav/ServerDetectionTest.kt

@@ -0,0 +1,97 @@
+package org.tasks.caldav
+
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.tasks.data.UUIDHelper
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_NEXTCLOUD
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_OPEN_XCHANGE
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_SABREDAV
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_TASKS
+import org.tasks.data.entity.CaldavAccount.Companion.SERVER_UNKNOWN
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_CALDAV
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_TASKS
+
+@HiltAndroidTest
+class ServerDetectionTest : CaldavTest() {
+
+    @Test
+    fun detectTasksServer() = runBlocking {
+        setup(
+            "DAV" to SABREDAV_COMPLIANCE,
+            "x-sabre-version" to "4.1.3",
+            accountType = TYPE_TASKS
+        )
+
+        sync()
+
+        assertEquals(SERVER_TASKS, loadAccount().serverType)
+    }
+
+    @Test
+    fun detectNextcloudServer() = runBlocking {
+        setup("DAV" to NEXTCLOUD_COMPLIANCE)
+
+        sync()
+
+        assertEquals(SERVER_NEXTCLOUD, loadAccount().serverType)
+    }
+
+    @Test
+    fun detectSabredavServer() = runBlocking {
+        setup(
+            "DAV" to SABREDAV_COMPLIANCE,
+            "x-sabre-version" to "4.1.3"
+        )
+
+        sync()
+
+        assertEquals(SERVER_SABREDAV, loadAccount().serverType)
+    }
+
+    @Test
+    fun detectOpenXchangeServer() = runBlocking {
+        setup("server" to "Openexchange WebDAV")
+
+        sync()
+
+        assertEquals(SERVER_OPEN_XCHANGE, loadAccount().serverType)
+    }
+
+    @Test
+    fun unknownServer() = runBlocking {
+        setup()
+
+        sync()
+
+        assertEquals(SERVER_UNKNOWN, loadAccount().serverType)
+    }
+
+    private suspend fun loadAccount(): CaldavAccount =
+        caldavDao.getAccounts().apply { assertEquals(1, size) }.first()
+
+    private suspend fun setup(
+        vararg headers: Pair<String, String>,
+        accountType: Int = TYPE_CALDAV
+    ) {
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = "username",
+            password = encryption.encrypt("password"),
+            url = server.url("/remote.php/dav/calendars/user1/").toString(),
+            accountType = accountType,
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+        this.headers.putAll(headers)
+        enqueue(NO_CALENDARS)
+    }
+
+    companion object {
+        private const val NO_CALENDARS = """<?xml version="1.0"?><d:multistatus xmlns:d="DAV:"/>"""
+        private const val SABREDAV_COMPLIANCE = "1, 3, extended-mkcol, access-control, calendarserver-principal-property-search, calendar-access, calendar-proxy, calendarserver-subscribed, calendar-auto-schedule, calendar-availability, resource-sharing, calendarserver-sharing"
+        private const val NEXTCLOUD_COMPLIANCE = "1, 3, extended-mkcol, access-control, calendarserver-principal-property-search, calendar-access, calendar-proxy, calendar-auto-schedule, calendar-availability, nc-calendar-webcal-cache, calendarserver-subscribed, oc-resource-sharing, oc-calendar-publishing, calendarserver-sharing, nc-calendar-search, nc-enable-birthday-calendar"
+    }
+}

app/src/androidTest/java/org/tasks/caldav/SharingMailboxDotOrgTest.kt

@@ -0,0 +1,149 @@
+package org.tasks.caldav
+
+import org.tasks.data.UUIDHelper
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
+import org.tasks.data.dao.PrincipalDao
+import javax.inject.Inject
+
+@HiltAndroidTest
+class SharingMailboxDotOrgTest : CaldavTest() {
+
+    @Inject lateinit var principalDao: PrincipalDao
+
+    @Test
+    fun ownerAccess() = runBlocking {
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = "3",
+            password = encryption.encrypt("password"),
+            url = server.url("/caldav/").toString(),
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+        val calendar = CaldavCalendar(
+            account = this@SharingMailboxDotOrgTest.account.uuid,
+            ctag = "1614876450015",
+            url = "${this@SharingMailboxDotOrgTest.account.url}MzM/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SHARE_OWNER)
+
+        sync()
+
+        // TODO: mailbox.org uses share-access differently, need to figure out how to set owner
+        assertEquals(ACCESS_READ_WRITE, caldavDao.getCalendar(calendar.uuid!!)!!.access)
+    }
+
+    @Test
+    fun principalForSharee() = runBlocking {
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = "3",
+            password = encryption.encrypt("password"),
+            url = server.url("/caldav/").toString(),
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+        val calendar = CaldavCalendar(
+            account = this@SharingMailboxDotOrgTest.account.uuid,
+            ctag = "1614876450015",
+            url = "${this@SharingMailboxDotOrgTest.account.url}MzM/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SHARE_OWNER)
+
+        sync()
+
+        val principal = principalDao.getAll().first()
+
+        assertEquals(calendar.id, principal.list)
+        assertEquals("/principals/users/5", principal.href)
+        assertNull(principal.displayName)
+        assertEquals(CaldavCalendar.INVITE_ACCEPTED, principal.inviteStatus)
+        assertEquals(CaldavCalendar.ACCESS_UNKNOWN, principal.access.access)
+    }
+
+    companion object {
+        private val SHARE_OWNER = """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <D:multistatus xmlns:APPLE="http://apple.com/ns/ical/" xmlns:CAL="urn:ietf:params:xml:ns:caldav"
+                xmlns:CS="http://calendarserver.org/ns/" xmlns:D="DAV:">
+                <D:response>
+                    <D:href>/caldav/MzM/</D:href>
+                    <D:propstat>
+                        <D:prop>
+                            <D:current-user-privilege-set>
+                                <D:privilege>
+                                    <D:read-acl />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:read-current-user-privilege-set />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:read />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:write />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:write-content />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:write-properties />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:write-acl />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:bind />
+                                </D:privilege>
+                                <D:privilege>
+                                    <D:unbind />
+                                </D:privilege>
+                            </D:current-user-privilege-set>
+                            <D:displayname>Tasks</D:displayname>
+                            <D:current-user-principal>
+                                <D:href>/principals/users/3</D:href>
+                            </D:current-user-principal>
+                            <calendar-color symbolic-color="custom" xmlns="http://apple.com/ns/ical/">
+                                #CEE7FFFF
+                            </calendar-color>
+                            <D:invite>
+                                <D:sharee>
+                                    <D:href>/principals/users/5</D:href>
+                                    <D:invite-accepted />
+                                    <D:share-access>read</D:share-access>
+                                </D:sharee>
+                            </D:invite>
+                            <D:sync-token>1614876450015</D:sync-token>
+                            <D:share-access>shared-owner</D:share-access>
+                            <D:resourcetype>
+                                <D:collection />
+                                <CAL:calendar />
+                            </D:resourcetype>
+                            <supported-calendar-component-set xmlns="urn:ietf:params:xml:ns:caldav">
+                                <CAL:comp name="VTODO" />
+                            </supported-calendar-component-set>
+                            <getctag xmlns="http://calendarserver.org/ns/">33-1614876450015</getctag>
+                        </D:prop>
+                        <D:status>HTTP/1.1 200 OK</D:status>
+                    </D:propstat>
+                    <D:propstat>
+                        <D:prop>
+                            <invite xmlns="http://owncloud.org/ns" />
+                            <owner-principal xmlns="http://owncloud.org/ns" />
+                        </D:prop>
+                        <D:status>HTTP/1.1 404 NOT FOUND</D:status>
+                    </D:propstat>
+                </D:response>
+            </D:multistatus>
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/caldav/SharingOwncloudTest.kt

@@ -0,0 +1,250 @@
+package org.tasks.caldav
+
+import org.tasks.data.UUIDHelper
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.*
+import org.junit.Test
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY
+import org.tasks.data.dao.PrincipalDao
+import javax.inject.Inject
+
+@HiltAndroidTest
+class SharingOwncloudTest : CaldavTest() {
+
+    @Inject lateinit var principalDao: PrincipalDao
+
+    private suspend fun setupAccount(user: String) {
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = user,
+            password = encryption.encrypt("password"),
+            url = server.url("/remote.php/dav/calendars/$user/").toString(),
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+    }
+
+    @Test
+    fun calendarOwner() = runBlocking {
+        setupAccount("user1")
+        val calendar = CaldavCalendar(
+            account = this@SharingOwncloudTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingOwncloudTest.account.url}test-shared/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(OC_OWNER)
+
+        sync()
+
+        assertEquals(ACCESS_OWNER, caldavDao.getCalendarByUuid(calendar.uuid!!)?.access)
+    }
+
+    @Test
+    fun readOnly() = runBlocking {
+        setupAccount("user2")
+        val calendar = CaldavCalendar(
+            account = this@SharingOwncloudTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/2",
+            url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(OC_READ_ONLY)
+
+        sync()
+
+        assertEquals(ACCESS_READ_ONLY, caldavDao.getCalendarByUuid(calendar.uuid!!)?.access)
+    }
+
+    @Test
+    fun principalForSharee() = runBlocking {
+        setupAccount("user1")
+        val calendar = CaldavCalendar(
+            account = this@SharingOwncloudTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingOwncloudTest.account.url}test-shared/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(OC_OWNER)
+
+        sync()
+
+        val principal = principalDao.getAll()
+            .apply { assertTrue(size == 1) }
+            .first()
+
+        assertEquals(calendar.id, principal.list)
+        assertEquals("principal:principals/users/user2", principal.href)
+        assertEquals("user2", principal.name)
+        assertEquals(CaldavCalendar.INVITE_ACCEPTED, principal.inviteStatus)
+        assertEquals(ACCESS_READ_ONLY, principal.access.access)
+    }
+
+    @Test
+    fun principalForOwner() = runBlocking {
+        setupAccount("user2")
+        val calendar = CaldavCalendar(
+            account = this@SharingOwncloudTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/2",
+            url = "${this@SharingOwncloudTest.account.url}test-shared_shared_by_user1/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(OC_READ_ONLY)
+
+        sync()
+
+        val principal = principalDao.getAll()
+            .apply { assertTrue(size == 1) }
+            .first()
+
+        assertEquals(calendar.id, principal.list)
+        assertEquals("principals/users/user1", principal.href)
+        assertEquals(null, principal.displayName)
+        assertEquals(CaldavCalendar.INVITE_ACCEPTED, principal.inviteStatus)
+        assertEquals(ACCESS_OWNER, principal.access.access)
+    }
+
+    companion object {
+        private val OC_OWNER = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:d="DAV:" xmlns:cal="urn:ietf:params:xml:ns:caldav"
+              xmlns:cs="http://calendarserver.org/ns/" xmlns:oc="http://owncloud.org/ns">
+                <d:response>
+                    <d:href>/remote.php/dav/calendars/user1/test-shared/</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:resourcetype>
+                                <d:collection />
+                                <cal:calendar />
+                            </d:resourcetype>
+                            <d:displayname>Test shared</d:displayname>
+                            <cal:supported-calendar-component-set>
+                                <cal:comp name="VTODO" />
+                            </cal:supported-calendar-component-set>
+                            <cs:getctag>http://sabre.io/ns/sync/1</cs:getctag>
+                            <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/">#0082c9</x1:calendar-color>
+                            <d:sync-token>http://sabre.io/ns/sync/1</d:sync-token>
+                            <oc:owner-principal>principals/users/user1</oc:owner-principal>
+                            <oc:invite>
+                                <oc:user>
+                                    <d:href>principal:principals/users/user2</d:href>
+                                    <oc:common-name>user2</oc:common-name>
+                                    <oc:invite-accepted />
+                                    <oc:access>
+                                        <oc:read />
+                                    </oc:access>
+                                </oc:user>
+                            </oc:invite>
+                            <d:current-user-privilege-set>
+                                <d:privilege>
+                                    <d:write />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-properties />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-content />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unlock />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:bind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unbind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-current-user-privilege-set />
+                                </d:privilege>
+                                <d:privilege>
+                                    <cal:read-free-busy />
+                                </d:privilege>
+                            </d:current-user-privilege-set>
+                            <d:current-user-principal>
+                                <d:href>/remote.php/dav/principals/users/user1/</d:href>
+                            </d:current-user-principal>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <d:share-access />
+                            <d:invite />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+
+        val OC_READ_ONLY = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:cal="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/"
+                xmlns:d="DAV:" xmlns:nc="http://nextcloud.org/ns"
+                xmlns:oc="http://owncloud.org/ns" xmlns:s="http://sabredav.org/ns">
+                <d:response>
+                    <d:href>/remote.php/dav/calendars/user2/test-shared_shared_by_user1/</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:resourcetype>
+                                <d:collection />
+                                <cal:calendar />
+                            </d:resourcetype>
+                            <d:displayname>Test shared (user1)</d:displayname>
+                            <cal:supported-calendar-component-set>
+                                <cal:comp name="VTODO" />
+                            </cal:supported-calendar-component-set>
+                            <cs:getctag>http://sabre.io/ns/sync/2</cs:getctag>
+                            <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/">#0082c9</x1:calendar-color>
+                            <d:sync-token>http://sabre.io/ns/sync/2</d:sync-token>
+                            <oc:owner-principal>principals/users/user1</oc:owner-principal>
+                            <oc:invite />
+                            <d:current-user-privilege-set>
+                                <d:privilege>
+                                    <d:write-properties />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-current-user-privilege-set />
+                                </d:privilege>
+                                <d:privilege>
+                                    <cal:read-free-busy />
+                                </d:privilege>
+                            </d:current-user-privilege-set>
+                            <d:current-user-principal>
+                                <d:href>/remote.php/dav/principals/users/user2/</d:href>
+                            </d:current-user-principal>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <d:share-access />
+                            <d:invite />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/caldav/SharingSabredavTest.kt

@@ -0,0 +1,318 @@
+package org.tasks.caldav
+
+import org.tasks.data.UUIDHelper
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_OWNER
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
+import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_ACCEPTED
+import org.tasks.data.dao.PrincipalDao
+import javax.inject.Inject
+
+@HiltAndroidTest
+class SharingSabredavTest : CaldavTest() {
+
+    @Inject lateinit var principalDao: PrincipalDao
+
+    private suspend fun setupAccount(user: String) {
+        account = CaldavAccount(
+            uuid = UUIDHelper.newUUID(),
+            username = user,
+            password = encryption.encrypt("password"),
+            url = server.url("/calendars/$user/").toString(),
+        ).let {
+            it.copy(id = caldavDao.insert(it))
+        }
+    }
+
+    @Test
+    fun calendarOwner() = runBlocking {
+        setupAccount("user1")
+        val calendar = CaldavCalendar(
+            account = this@SharingSabredavTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingSabredavTest.account.url}940468858232147861/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SD_OWNER)
+
+        sync()
+
+        assertEquals(
+            ACCESS_OWNER,
+            caldavDao.getCalendarByUuid(calendar.uuid!!)?.access
+        )
+    }
+
+    @Test
+    fun calendarSharee() = runBlocking {
+        setupAccount("user2")
+        val calendar = CaldavCalendar(
+            account = this@SharingSabredavTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SD_SHAREE)
+
+        sync()
+
+        assertEquals(
+            ACCESS_READ_WRITE,
+            caldavDao.getCalendarByUuid(calendar.uuid!!)?.access
+        )
+    }
+
+    @Test
+    fun excludeCurrentUserPrincipalFromSharees() = runBlocking {
+        setupAccount("user1")
+        caldavDao.insert(
+            CaldavCalendar(
+                account = account.uuid,
+                ctag = "http://sabre.io/ns/sync/1",
+                url = "${account.url}940468858232147861/",
+            )
+        )
+        enqueue(SD_OWNER)
+
+        sync()
+
+        assertEquals(1, principalDao.getAll().size)
+    }
+
+    @Test
+    fun principalForSharee() = runBlocking {
+        setupAccount("user1")
+        val calendar = CaldavCalendar(
+            account = this@SharingSabredavTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingSabredavTest.account.url}940468858232147861/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SD_OWNER)
+
+        sync()
+
+        val principal = principalDao.getAll().first()
+
+        assertEquals(calendar.id, principal.list)
+        assertEquals("mailto:user@example.com", principal.href)
+        assertEquals("Example User", principal.displayName)
+        assertEquals(INVITE_ACCEPTED, principal.inviteStatus)
+        assertEquals(ACCESS_READ_WRITE, principal.access.access)
+    }
+
+    @Test
+    fun principalForOwner() = runBlocking {
+        setupAccount("user2")
+        val calendar = CaldavCalendar(
+            account = this@SharingSabredavTest.account.uuid,
+            ctag = "http://sabre.io/ns/sync/1",
+            url = "${this@SharingSabredavTest.account.url}c3853d69-cb7a-476c-a23b-30ffd70f110b/",
+        )
+        caldavDao.insert(calendar)
+        enqueue(SD_SHAREE)
+
+        sync()
+
+        val principal = principalDao.getAll()
+            .apply { assertTrue(size == 1) }
+            .first()
+
+        assertEquals(calendar.id, principal.list)
+        assertEquals("/principals/user1", principal.href)
+        assertEquals(null, principal.displayName)
+        assertEquals(INVITE_ACCEPTED, principal.inviteStatus)
+        assertEquals(ACCESS_OWNER, principal.access.access)
+    }
+
+    companion object {
+        private val SD_OWNER = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:cal="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/"
+                xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
+                <d:response>
+                    <d:href>/calendars/user1/940468858232147861/</d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:resourcetype>
+                                <d:collection />
+                                <cal:calendar />
+                                <cs:shared-owner />
+                            </d:resourcetype>
+                            <d:displayname>Shared</d:displayname>
+                            <cal:supported-calendar-component-set>
+                                <cal:comp name="VTODO" />
+                            </cal:supported-calendar-component-set>
+                            <cs:getctag>http://sabre.io/ns/sync/1</cs:getctag>
+                            <d:sync-token>http://sabre.io/ns/sync/1</d:sync-token>
+                            <d:share-access>
+                                <d:shared-owner />
+                            </d:share-access>
+                            <d:invite>
+                                <d:sharee>
+                                    <d:href>/principals/user1</d:href>
+                                    <d:prop />
+                                    <d:share-access>
+                                        <d:shared-owner />
+                                    </d:share-access>
+                                    <d:invite-accepted />
+                                </d:sharee>
+                                <d:sharee>
+                                    <d:href>mailto:user@example.com</d:href>
+                                    <d:prop>
+                                        <d:displayname>Example User</d:displayname>
+                                    </d:prop>
+                                    <d:share-access>
+                                        <d:read-write />
+                                    </d:share-access>
+                                    <d:invite-accepted />
+                                </d:sharee>
+                            </d:invite>
+                            <d:current-user-privilege-set>
+                                <d:privilege>
+                                    <cal:read-free-busy />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-current-user-privilege-set />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-properties />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-content />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unlock />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:bind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unbind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:share />
+                                </d:privilege>
+                            </d:current-user-privilege-set>
+                            <d:current-user-principal>
+                                <d:href>/principals/user1/</d:href>
+                            </d:current-user-principal>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/" />
+                            <x2:owner-principal xmlns:x2="http://owncloud.org/ns" />
+                            <x2:invite xmlns:x2="http://owncloud.org/ns" />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+
+        private val SD_SHAREE = """
+            <?xml version="1.0"?>
+            <d:multistatus xmlns:cal="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/"
+                xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
+                <d:response>
+                    <d:href>/calendars/user2/c3853d69-cb7a-476c-a23b-30ffd70f110b/
+                    </d:href>
+                    <d:propstat>
+                        <d:prop>
+                            <d:resourcetype>
+                                <d:collection />
+                                <cal:calendar />
+                            </d:resourcetype>
+                            <d:displayname>Shared</d:displayname>
+                            <cal:supported-calendar-component-set>
+                                <cal:comp name="VTODO" />
+                            </cal:supported-calendar-component-set>
+                            <cs:getctag>http://sabre.io/ns/sync/1</cs:getctag>
+                            <d:sync-token>http://sabre.io/ns/sync/1</d:sync-token>
+                            <d:share-access>
+                                <d:read-write />
+                            </d:share-access>
+                            <d:invite>
+                                <d:sharee>
+                                    <d:href>/principals/user1</d:href>
+                                    <d:prop />
+                                    <d:share-access>
+                                        <d:shared-owner />
+                                    </d:share-access>
+                                    <d:invite-accepted />
+                                </d:sharee>
+                            </d:invite>
+                            <d:current-user-privilege-set>
+                                <d:privilege>
+                                    <cal:read-free-busy />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-acl />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:read-current-user-privilege-set />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-properties />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-content />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unlock />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:bind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:unbind />
+                                </d:privilege>
+                                <d:privilege>
+                                    <d:write-acl />
+                                </d:privilege>
+                            </d:current-user-privilege-set>
+                            <d:current-user-principal>
+                                <d:href>/principals/user2/</d:href>
+                            </d:current-user-principal>
+                        </d:prop>
+                        <d:status>HTTP/1.1 200 OK</d:status>
+                    </d:propstat>
+                    <d:propstat>
+                        <d:prop>
+                            <x1:calendar-color xmlns:x1="http://apple.com/ns/ical/" />
+                            <x2:owner-principal xmlns:x2="http://owncloud.org/ns" />
+                            <x2:invite xmlns:x2="http://owncloud.org/ns" />
+                        </d:prop>
+                        <d:status>HTTP/1.1 404 Not Found</d:status>
+                    </d:propstat>
+                </d:response>
+            </d:multistatus>
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/data/CaldavDaoExtensionsTest.kt

@@ -0,0 +1,25 @@
+package org.tasks.data
+
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.injection.InjectingTestCase
+import javax.inject.Inject
+
+@HiltAndroidTest
+class CaldavDaoExtensionsTest : InjectingTestCase() {
+    @Inject lateinit var caldavDao: CaldavDao
+
+    @Test
+    fun getLocalListCreatesAccountIfNeeded() = runBlocking {
+        withTimeout(5000L) {
+            assertTrue(caldavDao.getAccounts().isEmpty())
+            caldavDao.getLocalList()
+            assertTrue(caldavDao.getAccounts(CaldavAccount.TYPE_LOCAL).isNotEmpty())
+        }
+    }
+}

app/src/androidTest/java/org/tasks/data/CaldavDaoShiftTests.kt

@@ -1,32 +1,32 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.natpryce.makeiteasy.PropertyValue
-import com.todoroo.andlib.utility.DateUtilities.now
-import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.Freeze.Companion.freezeAt
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.makers.TaskContainerMaker
 import org.tasks.makers.TaskContainerMaker.CREATED
 import org.tasks.time.DateTime
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class CaldavDaoShiftTests : InjectingTestCase() {
-
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var caldavDao: CaldavDao
 
     private val tasks = ArrayList<TaskContainer>()
 
     @Test
-    fun basicShiftDown() {
+    fun basicShiftDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
         addTask(with(CREATED, created.plusSeconds(1)))
@@ -40,7 +40,7 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     }
 
     @Test
-    fun shiftDownOnlyWhenNecessary() {
+    fun shiftDownOnlyWhenNecessary() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
         addTask(with(CREATED, created.plusSeconds(1)))
@@ -56,7 +56,7 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     }
 
     @Test
-    fun ignoreUnnecessaryShiftDown() {
+    fun ignoreUnnecessaryShiftDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
         addTask(with(CREATED, created.plusSeconds(2)))
@@ -68,7 +68,7 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     }
 
     @Test
-    fun ignoreOtherCalendarWhenShiftingDown() {
+    fun ignoreOtherCalendarWhenShiftingDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask("calendar1", with(CREATED, created))
         addTask("calendar2", with(CREATED, created))
@@ -80,7 +80,7 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     }
 
     @Test
-    fun partialShiftDown() {
+    fun partialShiftDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
         addTask(with(CREATED, created.plusSeconds(1)))
@@ -98,29 +98,31 @@ class CaldavDaoShiftTests : InjectingTestCase() {
     }
 
     @Test
-    fun ignoreMovedTasksWhenShiftingDown() {
+    fun ignoreMovedTasksWhenShiftingDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
-        caldavDao.update(caldavDao.getTask(tasks[0].id).apply { this?.deleted = now() }!!)
+        caldavDao.update(caldavDao.getTask(tasks[0].id).apply { this?.deleted =
+            currentTimeMillis()
+        }!!)
 
         caldavDao.shiftDown("calendar", 0, created.toAppleEpoch())
 
-        assertNull(caldavDao.getTasks(tasks[0].id)[0].order)
+        assertNull(taskDao.fetch(tasks[0].id)!!.order)
     }
 
     @Test
-    fun ignoreDeletedTasksWhenShiftingDown() {
+    fun ignoreDeletedTasksWhenShiftingDown() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
-        taskDao.update(taskDao.fetch(tasks[0].id).apply { this?.deletionDate = now() }!!)
+        taskDao.update(taskDao.fetch(tasks[0].id).apply { this?.deletionDate = currentTimeMillis() }!!)
 
         caldavDao.shiftDown("calendar", 0, created.toAppleEpoch())
 
-        assertNull(caldavDao.getTasks(tasks[0].id)[0].order)
+        assertNull(taskDao.fetch(tasks[0].id)!!.order)
     }
 
     @Test
-    fun touchShiftedTasks() {
+    fun touchShiftedTasks() = runBlocking {
         val created = DateTime(2020, 5, 17, 9, 53, 17)
         addTask(with(CREATED, created))
         addTask(with(CREATED, created.plusSeconds(1)))
@@ -133,36 +135,31 @@ class CaldavDaoShiftTests : InjectingTestCase() {
         assertEquals(created.plusMinutes(1).millis, taskDao.fetch(tasks[1].id)!!.modificationDate)
     }
 
-    private fun checkOrder(dateTime: DateTime?, task: TaskContainer) {
+    private suspend fun checkOrder(dateTime: DateTime?, task: TaskContainer) {
+        val order = taskDao.fetch(task.id)!!.order
         if (dateTime == null) {
-            assertNull(caldavDao.getTask(task.id)!!.order)
+            assertNull(order)
         } else {
-            assertEquals(dateTime.toAppleEpoch(), caldavDao.getTask(task.id)!!.order)
+            assertEquals(dateTime.toAppleEpoch(), order)
         }
     }
 
-    private fun addTask(vararg properties: PropertyValue<in TaskContainer?, *>) = addTask("calendar", *properties)
+    private suspend fun addTask(vararg properties: PropertyValue<in TaskContainer?, *>) = addTask("calendar", *properties)
 
-    private fun addTask(calendar: String, vararg properties: PropertyValue<in TaskContainer?, *>) {
+    private suspend fun addTask(calendar: String, vararg properties: PropertyValue<in TaskContainer?, *>) {
         val t = TaskContainerMaker.newTaskContainer(*properties)
-        tasks.add(t)
         val task = t.task
         taskDao.createNew(task)
-        val caldavTask = CaldavTask(t.id, calendar)
+        val caldavTask = CaldavTask(task = t.id, calendar = calendar)
         if (task.parent > 0) {
             caldavTask.remoteParent = caldavDao.getRemoteIdForTask(task.parent)
         }
-        caldavTask.id = caldavDao.insert(caldavTask)
-        t.caldavTask = caldavTask.toSubset()
-    }
-
-    private fun CaldavTask.toSubset(): SubsetCaldav {
-        val result = SubsetCaldav()
-        result.cd_id = id
-        result.cd_calendar = calendar
-        result.cd_remote_parent = remoteParent
-        return result
+        tasks.add(
+            t.copy(
+                caldavTask = caldavTask.copy(
+                    id = caldavDao.insert(caldavTask)
+                )
+            )
+        )
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}
+}

app/src/androidTest/java/org/tasks/data/CaldavDaoTests.kt

@@ -1,26 +1,25 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.andlib.utility.DateUtilities
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.TagDataMaker.newTagData
-import org.tasks.makers.TagMaker.TAGDATA
-import org.tasks.makers.TagMaker.TASK
-import org.tasks.makers.TagMaker.newTag
 import org.tasks.makers.TaskMaker.CREATION_TIME
-import org.tasks.makers.TaskMaker.ID
 import org.tasks.makers.TaskMaker.newTask
 import org.tasks.time.DateTime
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class CaldavDaoTests : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var tagDao: TagDao
@@ -28,121 +27,80 @@ class CaldavDaoTests : InjectingTestCase() {
     @Inject lateinit var caldavDao: CaldavDao
 
     @Test
-    fun insertNewTaskAtTopOfEmptyList() {
+    fun insertNewTaskAtTopOfEmptyList() = runBlocking {
         val task = newTask()
         taskDao.createNew(task)
-        val caldavTask = CaldavTask(task.id, "calendar")
-        caldavDao.insert(task, caldavTask, true)
+        caldavDao.insert(task, CaldavTask(task = task.id, calendar = "calendar"), true)
 
         checkOrder(null, task.id)
     }
 
     @Test
-    fun insertNewTaskAboveExistingTask() {
+    fun insertNewTaskAboveExistingTask() = runBlocking {
         val created = DateTime(2020, 5, 21, 15, 29, 16, 452)
         val first = newTask(with(CREATION_TIME, created))
         val second = newTask(with(CREATION_TIME, created.plusSeconds(1)))
         taskDao.createNew(first)
         taskDao.createNew(second)
-        caldavDao.insert(first, CaldavTask(first.id, "calendar"), true)
-
-        caldavDao.insert(second, CaldavTask(second.id, "calendar"), true)
+        caldavDao.insert(first, CaldavTask(task = first.id, calendar = "calendar"), true)
+        caldavDao.insert(second, CaldavTask(task = second.id, calendar = "calendar"), true)
 
         checkOrder(null, first.id)
         checkOrder(created.minusSeconds(1), second.id)
     }
 
     @Test
-    fun insertNewTaskBelowExistingTask() {
+    fun insertNewTaskBelowExistingTask() = runBlocking {
         val created = DateTime(2020, 5, 21, 15, 29, 16, 452)
         val first = newTask(with(CREATION_TIME, created))
         val second = newTask(with(CREATION_TIME, created.plusSeconds(1)))
         taskDao.createNew(first)
         taskDao.createNew(second)
-        caldavDao.insert(first, CaldavTask(first.id, "calendar"), false)
-
-        caldavDao.insert(second, CaldavTask(second.id, "calendar"), false)
+        caldavDao.insert(first, CaldavTask(task = first.id, calendar = "calendar"), false)
+        caldavDao.insert(second, CaldavTask(task = second.id, calendar = "calendar"), false)
 
         checkOrder(null, first.id)
         checkOrder(null, second.id)
     }
 
     @Test
-    fun insertNewTaskBelowExistingTaskWithSameCreationDate() {
+    fun insertNewTaskBelowExistingTaskWithSameCreationDate() = runBlocking {
         val created = DateTime(2020, 5, 21, 15, 29, 16, 452)
         val first = newTask(with(CREATION_TIME, created))
         val second = newTask(with(CREATION_TIME, created))
         taskDao.createNew(first)
         taskDao.createNew(second)
-        caldavDao.insert(first, CaldavTask(first.id, "calendar"), false)
-
-        caldavDao.insert(second, CaldavTask(second.id, "calendar"), false)
+        caldavDao.insert(first, CaldavTask(task = first.id, calendar = "calendar"), false)
+        caldavDao.insert(second, CaldavTask(task = second.id, calendar = "calendar"), false)
 
         checkOrder(null, first.id)
         checkOrder(created.plusSeconds(1), second.id)
     }
 
     @Test
-    fun insertNewTaskAtBottomOfEmptyList() {
+    fun insertNewTaskAtBottomOfEmptyList() = runBlocking {
         val task = newTask()
         taskDao.createNew(task)
-        val caldavTask = CaldavTask(task.id, "calendar")
-        caldavDao.insert(task, caldavTask, false)
+        caldavDao.insert(task, CaldavTask(task = task.id, calendar = "calendar"), false)
 
         checkOrder(null, task.id)
     }
 
     @Test
-    fun getCaldavTasksWithTags() {
-            val task = newTask(with(ID, 1L))
-            taskDao.createNew(task)
-            val one = newTagData()
-            val two = newTagData()
-            tagDataDao.createNew(one)
-            tagDataDao.createNew(two)
-            tagDao.insert(newTag(with(TASK, task), with(TAGDATA, one)))
-            tagDao.insert(newTag(with(TASK, task), with(TAGDATA, two)))
-            caldavDao.insert(CaldavTask(task.id, "calendar"))
-            assertEquals(listOf(task.id), caldavDao.getTasksWithTags())
-        }
-
-    @Test
-    fun ignoreNonCaldavTaskWithTags() {
-        val task = newTask(with(ID, 1L))
-        taskDao.createNew(task)
-        val tag = newTagData()
-        tagDataDao.createNew(tag)
-        tagDao.insert(newTag(with(TASK, task), with(TAGDATA, tag)))
-        assertTrue(caldavDao.getTasksWithTags().isEmpty())
-    }
-
-    @Test
-    fun ignoreCaldavTaskWithoutTags() {
-        val task = newTask(with(ID, 1L))
-        taskDao.createNew(task)
-        tagDataDao.createNew(newTagData())
-        caldavDao.insert(CaldavTask(task.id, "calendar"))
-        assertTrue(caldavDao.getTasksWithTags().isEmpty())
-    }
-
-    @Test
-    fun noResultsForEmptyAccounts() {
-        val caldavAccount = CaldavAccount()
-        caldavAccount.uuid = UUIDHelper.newUUID()
+    fun noResultsForEmptyAccounts() = runBlocking {
+        val caldavAccount = CaldavAccount(uuid = UUIDHelper.newUUID())
         caldavDao.insert(caldavAccount)
         assertTrue(caldavDao.getCaldavFilters(caldavAccount.uuid!!).isEmpty())
     }
 
-    private fun checkOrder(dateTime: DateTime, task: Long) = checkOrder(dateTime.toAppleEpoch(), task)
+    private suspend fun checkOrder(dateTime: DateTime, task: Long) = checkOrder(dateTime.toAppleEpoch(), task)
 
-    private fun checkOrder(order: Long?, task: Long) {
-        val sortOrder = caldavDao.getTask(task)!!.order
+    private suspend fun checkOrder(order: Long?, task: Long) {
+        val sortOrder = taskDao.fetch(task)!!.order
         if (order == null) {
             assertNull(sortOrder)
         } else {
             assertEquals(order, sortOrder)
         }
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}
+}

app/src/androidTest/java/org/tasks/data/DeletionDaoTests.kt

@@ -1,65 +1,70 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.data.CaldavDao.Companion.LOCAL
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.DeletionDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavTask
 import org.tasks.date.DateTimeUtils.newDateTime
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.makers.TaskMaker.CREATION_TIME
 import org.tasks.makers.TaskMaker.DELETION_TIME
 import org.tasks.makers.TaskMaker.newTask
 import org.tasks.time.DateTime
-import org.tasks.time.DateTimeUtils
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class DeletionDaoTests : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var deletionDao: DeletionDao
     @Inject lateinit var caldavDao: CaldavDao
 
     @Test
-    fun deleting1000DoesntCrash() {
-        deletionDao.delete((1L..1000L).toList())
+    fun deleting1000DoesntCrash() = runBlocking {
+        deletionDao.delete((1L..1000L).toList(), {})
     }
 
     @Test
-    fun marking998ForDeletionDoesntCrash() {
-        deletionDao.markDeleted(1L..1000L)
+    fun marking998ForDeletionDoesntCrash() = runBlocking {
+        deletionDao.markDeleted(1L..1000L, {})
     }
 
     @Test
-    fun markDeletedUpdatesModificationTime() {
+    fun markDeletedUpdatesModificationTime() = runBlocking {
         var task = newTask(with(CREATION_TIME, DateTime().minusMinutes(1)))
         taskDao.createNew(task)
-        deletionDao.markDeleted(listOf(task.id))
+        deletionDao.markDeleted(listOf(task.id), {})
         task = taskDao.fetch(task.id)!!
         assertTrue(task.modificationDate > task.creationDate)
-        assertTrue(task.modificationDate < DateTimeUtils.currentTimeMillis())
+        assertTrue(task.modificationDate < currentTimeMillis())
     }
 
     @Test
-    fun markDeletedUpdatesDeletionTime() {
+    fun markDeletedUpdatesDeletionTime() = runBlocking {
         var task = newTask(with(CREATION_TIME, DateTime().minusMinutes(1)))
         taskDao.createNew(task)
-        deletionDao.markDeleted(listOf(task.id))
+        deletionDao.markDeleted(listOf(task.id), {})
         task = taskDao.fetch(task.id)!!
         assertTrue(task.deletionDate > task.creationDate)
-        assertTrue(task.deletionDate < DateTimeUtils.currentTimeMillis())
+        assertTrue(task.deletionDate < currentTimeMillis())
     }
 
     @Test
-    fun purgeDeletedLocalTask() {
+    fun purgeDeletedLocalTask() = runBlocking {
         val task = newTask(with(DELETION_TIME, newDateTime()))
         taskDao.createNew(task)
-        caldavDao.insert(CaldavCalendar("", "1234").apply { account = LOCAL })
-        caldavDao.insert(CaldavTask(task.id, "1234"))
+        caldavDao.insert(CaldavAccount(uuid = "abcd", accountType = CaldavAccount.TYPE_LOCAL))
+        caldavDao.insert(CaldavCalendar(name = "", uuid = "1234", account = "abcd"))
+        caldavDao.insert(CaldavTask(task = task.id, calendar = "1234"))
 
         deletionDao.purgeDeleted()
 
@@ -67,11 +72,12 @@ class DeletionDaoTests : InjectingTestCase() {
     }
 
     @Test
-    fun dontPurgeActiveTasks() {
+    fun dontPurgeActiveTasks() = runBlocking {
         val task = newTask()
         taskDao.createNew(task)
-        caldavDao.insert(CaldavCalendar("", "1234").apply { account = LOCAL })
-        caldavDao.insert(CaldavTask(task.id, "1234"))
+        caldavDao.insert(CaldavAccount(uuid = "abcd", accountType = CaldavAccount.TYPE_LOCAL))
+        caldavDao.insert(CaldavCalendar(name = "", uuid = "1234", account = "abcd"))
+        caldavDao.insert(CaldavTask(task = task.id, calendar = "1234"))
 
         deletionDao.purgeDeleted()
 
@@ -79,16 +85,14 @@ class DeletionDaoTests : InjectingTestCase() {
     }
 
     @Test
-    fun dontPurgeDeletedCaldavTask() {
+    fun dontPurgeDeletedCaldavTask() = runBlocking {
         val task = newTask(with(DELETION_TIME, newDateTime()))
         taskDao.createNew(task)
-        caldavDao.insert(CaldavCalendar("", "1234").apply { account = UUIDHelper.newUUID() })
-        caldavDao.insert(CaldavTask(task.id, "1234"))
+        caldavDao.insert(CaldavCalendar(name = "", uuid = "1234", account = UUIDHelper.newUUID()))
+        caldavDao.insert(CaldavTask(task = task.id, calendar = "1234"))
 
         deletionDao.purgeDeleted()
 
         assertNotNull(taskDao.fetch(task.id))
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
-}
+}

app/src/androidTest/java/org/tasks/data/GoogleTaskDaoTests.kt

@@ -1,182 +1,283 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavTask
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GoogleTaskMaker.LIST
-import org.tasks.makers.GoogleTaskMaker.PARENT
-import org.tasks.makers.GoogleTaskMaker.REMOTE_ID
-import org.tasks.makers.GoogleTaskMaker.TASK
-import org.tasks.makers.GoogleTaskMaker.newGoogleTask
-import org.tasks.makers.GtaskListMaker.newGtaskList
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
+import org.tasks.makers.CaldavTaskMaker.REMOTE_PARENT
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
 import org.tasks.makers.TaskMaker.newTask
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class GoogleTaskDaoTests : InjectingTestCase() {
-    @Inject lateinit var googleTaskListDao: GoogleTaskListDao
     @Inject lateinit var googleTaskDao: GoogleTaskDao
     @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var caldavDao: CaldavDao
 
     @Before
     override fun setUp() {
         super.setUp()
-        googleTaskListDao.insert(newGtaskList())
+        runBlocking {
+            caldavDao.insert(CaldavAccount(uuid = "account", accountType = TYPE_GOOGLE_TASKS))
+            caldavDao.insert(CaldavCalendar(account = "account", uuid = "calendar"))
+        }
     }
 
     @Test
-    fun insertAtTopOfEmptyList() {
-        insertTop(newGoogleTask(with(REMOTE_ID, "1234")))
-        val tasks = googleTaskDao.getByLocalOrder("1")
+    fun insertAtTopOfEmptyList() = runBlocking {
+        insertTop(newCaldavTask(with(REMOTE_ID, "1234")))
+        val tasks = googleTaskDao.getByLocalOrder("calendar")
         assertEquals(1, tasks.size.toLong())
         val task = tasks[0]
-        assertEquals("1234", task.remoteId)
-        assertEquals(0, task.order)
+        assertEquals("1234", googleTaskDao.getByTaskId(task.id)?.remoteId)
+        assertEquals(0L, task.order)
     }
 
     @Test
-    fun insertAtBottomOfEmptyList() {
-        insertBottom(newGoogleTask(with(REMOTE_ID, "1234")))
-        val tasks = googleTaskDao.getByLocalOrder("1")
+    fun insertAtBottomOfEmptyList() = runBlocking {
+        insertBottom(newCaldavTask(with(REMOTE_ID, "1234")))
+        val tasks = googleTaskDao.getByLocalOrder("calendar")
         assertEquals(1, tasks.size.toLong())
         val task = tasks[0]
-        assertEquals("1234", task.remoteId)
-        assertEquals(0, task.order)
+        assertEquals("1234", googleTaskDao.getByTaskId(task.id)?.remoteId)
+        assertEquals(0L, task.order)
     }
 
     @Test
-    fun getPreviousIsNullForTopTask() {
-        googleTaskDao.insertAndShift(newGoogleTask(), true)
+    fun getPreviousIsNullForTopTask() = runBlocking {
+        insert(newCaldavTask())
         assertNull(googleTaskDao.getPrevious("1", 0, 0))
     }
 
     @Test
-    fun getPrevious() {
-        insertTop(newGoogleTask())
-        insertTop(newGoogleTask(with(REMOTE_ID, "1234")))
-        assertEquals("1234", googleTaskDao.getPrevious("1", 0, 1))
+    fun getPrevious() = runBlocking {
+        insertTop(newCaldavTask())
+        insertTop(newCaldavTask(with(REMOTE_ID, "1234")))
+        assertEquals("1234", googleTaskDao.getPrevious("calendar", 0, 1))
     }
 
     @Test
-    fun insertAtTopOfList() {
-        insertTop(newGoogleTask(with(REMOTE_ID, "1234")))
-        insertTop(newGoogleTask(with(REMOTE_ID, "5678")))
-        val tasks = googleTaskDao.getByLocalOrder("1")
+    fun insertAtTopOfList() = runBlocking {
+        insertTop(newCaldavTask(with(REMOTE_ID, "1234")))
+        insertTop(newCaldavTask(with(REMOTE_ID, "5678")))
+        val tasks = googleTaskDao.getByLocalOrder("calendar")
         assertEquals(2, tasks.size.toLong())
         val top = tasks[0]
-        assertEquals("5678", top.remoteId)
-        assertEquals(0, top.order)
+        assertEquals("5678", googleTaskDao.getByTaskId(top.id)?.remoteId)
+        assertEquals(0L, top.order)
     }
 
     @Test
-    fun insertAtTopOfListShiftsExisting() {
-        insertTop(newGoogleTask(with(REMOTE_ID, "1234")))
-        insertTop(newGoogleTask(with(REMOTE_ID, "5678")))
-        val tasks = googleTaskDao.getByLocalOrder("1")
+    fun insertAtTopOfListShiftsExisting() = runBlocking {
+        insertTop(newCaldavTask(with(REMOTE_ID, "1234")))
+        insertTop(newCaldavTask(with(REMOTE_ID, "5678")))
+        val tasks = googleTaskDao.getByLocalOrder("calendar")
         assertEquals(2, tasks.size.toLong())
         val bottom = tasks[1]
-        assertEquals("1234", bottom.remoteId)
-        assertEquals(1, bottom.order)
+        assertEquals("1234", googleTaskDao.getByTaskId(bottom.id)?.remoteId)
+        assertEquals(1L, bottom.order)
     }
 
     @Test
-    fun getTaskFromRemoteId() {
-        googleTaskDao.insert(newGoogleTask(with(REMOTE_ID, "1234"), with(TASK, 4)))
-        assertEquals(4, googleTaskDao.getTask("1234"))
+    fun getTaskFromRemoteId() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1234")))
+        assertEquals(1L, googleTaskDao.getTask("1234"))
     }
 
     @Test
-    fun getRemoteIdForTask() {
-        googleTaskDao.insert(newGoogleTask(with(REMOTE_ID, "1234"), with(TASK, 4)))
-        assertEquals("1234", googleTaskDao.getRemoteId(4L))
+    fun getRemoteIdForTask() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1234")))
+        assertEquals("1234", googleTaskDao.getRemoteId(1L))
     }
 
     @Test
-    fun moveDownInList() {
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "1")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "2")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "3")), false)
+    fun moveDownInList() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1")))
+        insert(newCaldavTask(with(REMOTE_ID, "2")))
+        insert(newCaldavTask(with(REMOTE_ID, "3")))
         val two = getByRemoteId("2")
-        googleTaskDao.move(two, 0, 0)
-        assertEquals(0, googleTaskDao.getByRemoteId("2")!!.order)
-        assertEquals(1, googleTaskDao.getByRemoteId("1")!!.order)
-        assertEquals(2, googleTaskDao.getByRemoteId("3")!!.order)
+        googleTaskDao.move(taskDao.fetch(two.task)!!, "calendar", 0, 0)
+        assertEquals(0L, getOrder("2"))
+        assertEquals(1L, getOrder("1"))
+        assertEquals(2L, getOrder("3"))
     }
 
     @Test
-    fun moveUpInList() {
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "1")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "2")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "3")), false)
+    fun moveUpInList() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1")))
+        insert(newCaldavTask(with(REMOTE_ID, "2")))
+        insert(newCaldavTask(with(REMOTE_ID, "3")))
         val one = getByRemoteId("1")
-        googleTaskDao.move(one, 0, 1)
-        assertEquals(0, googleTaskDao.getByRemoteId("2")!!.order)
-        assertEquals(1, googleTaskDao.getByRemoteId("1")!!.order)
-        assertEquals(2, googleTaskDao.getByRemoteId("3")!!.order)
+        googleTaskDao.move(taskDao.fetch(one.task)!!, "calendar", 0, 1)
+        assertEquals(0L, getOrder("2"))
+        assertEquals(1L, getOrder("1"))
+        assertEquals(2L, getOrder("3"))
     }
 
     @Test
-    fun moveToTop() {
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "1")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "2")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "3")), false)
+    fun moveToTop() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1")))
+        insert(newCaldavTask(with(REMOTE_ID, "2")))
+        insert(newCaldavTask(with(REMOTE_ID, "3")))
         val three = getByRemoteId("3")
-        googleTaskDao.move(three, 0, 0)
-        assertEquals(0, googleTaskDao.getByRemoteId("3")!!.order)
-        assertEquals(1, googleTaskDao.getByRemoteId("1")!!.order)
-        assertEquals(2, googleTaskDao.getByRemoteId("2")!!.order)
+        googleTaskDao.move(taskDao.fetch(three.task)!!, "calendar", 0, 0)
+        assertEquals(0L, getOrder("3"))
+        assertEquals(1L, getOrder("1"))
+        assertEquals(2L, getOrder("2"))
     }
 
     @Test
-    fun moveToBottom() {
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "1")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "2")), false)
-        googleTaskDao.insertAndShift(newGoogleTask(with(REMOTE_ID, "3")), false)
+    fun moveToBottom() = runBlocking {
+        insert(newCaldavTask(with(REMOTE_ID, "1")))
+        insert(newCaldavTask(with(REMOTE_ID, "2")))
+        insert(newCaldavTask(with(REMOTE_ID, "3")))
         val one = getByRemoteId("1")
-        googleTaskDao.move(one, 0, 2)
-        assertEquals(0, googleTaskDao.getByRemoteId("2")!!.order)
-        assertEquals(1, googleTaskDao.getByRemoteId("3")!!.order)
-        assertEquals(2, googleTaskDao.getByRemoteId("1")!!.order)
+        googleTaskDao.move(taskDao.fetch(one.task)!!, "calendar", 0, 2)
+        assertEquals(0L, getOrder("2"))
+        assertEquals(1L, getOrder("3"))
+        assertEquals(2L, getOrder("1"))
     }
 
     @Test
-    fun findChildrenInList() {
-        googleTaskDao.insert(newGoogleTask(with(TASK, 1), with(LIST, "1")))
-        googleTaskDao.insert(newGoogleTask(with(TASK, 2), with(LIST, "1"), with(PARENT, 1L)))
-        assertEquals(listOf(2L), googleTaskDao.getChildren(listOf(1L, 2L)))
+    fun dontAllowEmptyParent() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "1234")))
+
+        googleTaskDao.updatePosition("1234", "", "0")
+
+        assertNull(googleTaskDao.getByTaskId(1)!!.remoteParent)
     }
+    
+    @Test
+    fun updatePositionWithNullParent() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "1234")))
+
+        googleTaskDao.updatePosition("1234", null, "0")
+
+        assertNull(googleTaskDao.getByTaskId(1)!!.remoteParent)
+    }
+
+    @Test
+    fun updatePosition() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "1234")))
+
+        googleTaskDao.updatePosition("1234", "abcd", "0")
+
+        assertEquals("abcd", googleTaskDao.getByTaskId(1)!!.remoteParent)
+    }
+
+    @Test
+    fun ignoreSelfParent() = runBlocking {
+        insert(
+            newCaldavTask(
+                with(TASK, 1),
+                with(REMOTE_ID, "123"),
+                with(REMOTE_PARENT, "123")
+            )
+        )
 
-    private fun insertTop(googleTask: GoogleTask) {
+        caldavDao.updateParents()
+
+        assertEquals(0, taskDao.fetch(1)!!.parent)
+    }
+
+    @Test
+    fun updateParents() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "123")))
+        insert(newCaldavTask(with(TASK, 2), with(REMOTE_PARENT, "123")))
+
+        caldavDao.updateParents()
+
+        assertEquals(1, taskDao.fetch(2)!!.parent)
+    }
+
+    @Test
+    fun updateParentsByList() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "123")))
+        insert(newCaldavTask(with(TASK, 2), with(REMOTE_PARENT, "123")))
+
+        caldavDao.updateParents("calendar")
+
+        assertEquals(1, taskDao.fetch(2)!!.parent)
+    }
+
+    @Test
+    fun updateParentsMustMatchList() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "123")))
+        insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "2"), with(REMOTE_PARENT, "123")))
+
+        caldavDao.updateParents()
+
+        assertEquals(0, taskDao.fetch(2)!!.parent)
+    }
+
+    @Test
+    fun updateParentsByListMustMatchList() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "123")))
+        insert(newCaldavTask(with(TASK, 2), with(CALENDAR, "2"), with(REMOTE_PARENT, "123")))
+
+        caldavDao.updateParents("2")
+
+        assertEquals(0, taskDao.fetch(2)!!.parent)
+    }
+
+    @Test
+    fun ignoreEmptyStringWhenUpdatingParents() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "")))
+        insert(newCaldavTask(with(TASK, 2), with(REMOTE_ID, ""), with(REMOTE_PARENT, "")))
+
+        caldavDao.updateParents()
+
+        assertEquals(0, taskDao.fetch(2)!!.parent)
+    }
+
+    @Test
+    fun ignoreEmptyStringWhenUpdatingParentsForList() = runBlocking {
+        insert(newCaldavTask(with(TASK, 1), with(REMOTE_ID, "")))
+        insert(newCaldavTask(with(TASK, 2), with(REMOTE_ID, ""), with(REMOTE_PARENT, "")))
+
+        caldavDao.updateParents("1")
+
+        assertEquals(0, taskDao.fetch(2)!!.parent)
+    }
+
+    private suspend fun getOrder(remoteId: String): Long? {
+        return taskDao.fetch(googleTaskDao.getByRemoteId(remoteId)!!.task)?.order
+    }
+
+    private suspend fun insertTop(googleTask: CaldavTask) {
         insert(googleTask, true)
     }
 
-    private fun insertBottom(googleTask: GoogleTask) {
+    private suspend fun insertBottom(googleTask: CaldavTask) {
         insert(googleTask, false)
     }
 
-    private fun insert(googleTask: GoogleTask, top: Boolean) {
+    private suspend fun insert(googleTask: CaldavTask, top: Boolean = false) {
         val task = newTask()
         taskDao.createNew(task)
-        googleTask.task = task.id
-        googleTaskDao.insertAndShift(googleTask, top)
+        googleTaskDao.insertAndShift(
+            task,
+            googleTask.copy(task = task.id),
+            top
+        )
     }
 
-    private fun getByRemoteId(remoteId: String): SubsetGoogleTask {
-        val googleTask = googleTaskDao.getByRemoteId(remoteId)!!
-        val result = SubsetGoogleTask()
-        result.gt_id = googleTask.id
-        result.gt_list_id = googleTask.listId
-        result.gt_order = googleTask.order
-        result.gt_parent = googleTask.parent
-        return result
+    private suspend fun getByRemoteId(remoteId: String): CaldavTask {
+        return googleTaskDao.getByRemoteId(remoteId)!!
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/org/tasks/data/GoogleTaskListDaoTest.kt

@@ -1,54 +1,26 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.natpryce.makeiteasy.MakeItEasy.with
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.entity.CaldavAccount
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GoogleTaskListMaker.ACCOUNT
-import org.tasks.makers.GoogleTaskListMaker.REMOTE_ID
-import org.tasks.makers.GoogleTaskListMaker.newGoogleTaskList
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class GoogleTaskListDaoTest : InjectingTestCase() {
-
-    @Inject lateinit var googleTaskListDao: GoogleTaskListDao
-
-    @Test
-    fun noResultsForEmptyAccount() {
-        val account = GoogleTaskAccount()
-        account.account = "user@gmail.com"
-        googleTaskListDao.insert(account)
-
-        assertTrue(googleTaskListDao.getGoogleTaskFilters(account.account!!).isEmpty())
-    }
+    @Inject lateinit var caldavDao: CaldavDao
 
     @Test
-    fun findListWithNullAccount() {
-        val list = newGoogleTaskList(with(REMOTE_ID, "1234"), with(ACCOUNT, null as String?))
-        list.id = googleTaskListDao.insert(list)
-
-        assertEquals(list, googleTaskListDao.findExistingList("1234"))
+    fun noResultsForEmptyAccount() = runBlocking {
+        val account = CaldavAccount(
+            uuid = "user@gmail.com",
+            username = "user@gmail.com",
+        )
+        caldavDao.insert(account)
+
+        assertTrue(caldavDao.getCaldavFilters(account.username!!).isEmpty())
     }
-
-    @Test
-    fun findListWithEmptyAccount() {
-        val list = newGoogleTaskList(with(REMOTE_ID, "1234"), with(ACCOUNT, ""))
-        list.id = googleTaskListDao.insert(list)
-
-        assertEquals(list, googleTaskListDao.findExistingList("1234"))
-    }
-
-    @Test
-    fun ignoreListWithAccount() {
-        val list = newGoogleTaskList(with(REMOTE_ID, "1234"), with(ACCOUNT, "user@gmail.com"))
-        googleTaskListDao.insert(list)
-
-        assertNull(googleTaskListDao.findExistingList("1234"))
-    }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/org/tasks/data/LocationDaoTest.kt

@@ -1,60 +1,59 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.andlib.utility.DateUtilities.now
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
-import org.junit.Assert.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.Freeze
+import org.tasks.SuspendFreeze.Companion.freezeAt
 import org.tasks.caldav.GeoUtils.toLikeString
+import org.tasks.data.dao.AlarmDao
+import org.tasks.data.dao.LocationDao
+import org.tasks.data.entity.Alarm
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Geofence
+import org.tasks.data.entity.Place
+import org.tasks.data.entity.Task
 import org.tasks.date.DateTimeUtils.newDateTime
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GeofenceMaker.ARRIVAL
-import org.tasks.makers.GeofenceMaker.DEPARTURE
-import org.tasks.makers.GeofenceMaker.PLACE
-import org.tasks.makers.GeofenceMaker.TASK
-import org.tasks.makers.GeofenceMaker.newGeofence
-import org.tasks.makers.PlaceMaker.LATITUDE
-import org.tasks.makers.PlaceMaker.LONGITUDE
-import org.tasks.makers.PlaceMaker.newPlace
 import org.tasks.makers.TaskMaker.COMPLETION_TIME
 import org.tasks.makers.TaskMaker.DELETION_TIME
 import org.tasks.makers.TaskMaker.DUE_TIME
 import org.tasks.makers.TaskMaker.HIDE_TYPE
 import org.tasks.makers.TaskMaker.ID
-import org.tasks.makers.TaskMaker.SNOOZE_TIME
 import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class LocationDaoTest : InjectingTestCase() {
-
     @Inject lateinit var locationDao: LocationDao
     @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var alarmDao: AlarmDao
 
     @Test
-    fun getExistingPlace() {
-        locationDao.insert(newPlace(with(LATITUDE, 48.067222), with(LONGITUDE, 12.863611)))
+    fun getExistingPlace() = runBlocking {
+        locationDao.insert(Place(latitude = 48.067222, longitude = 12.863611))
         val place = locationDao.findPlace(48.067222.toLikeString(), 12.863611.toLikeString())
         assertEquals(48.067222, place?.latitude)
         assertEquals(12.863611, place?.longitude)
     }
 
     @Test
-    fun getPlaceWithLessPrecision() {
-        locationDao.insert(newPlace(with(LATITUDE, 50.7547), with(LONGITUDE, -2.2279)))
+    fun getPlaceWithLessPrecision() = runBlocking {
+        locationDao.insert(Place(latitude = 50.7547, longitude = -2.2279))
         val place = locationDao.findPlace(50.754712.toLikeString(), (-2.227945).toLikeString())
         assertEquals(50.7547, place?.latitude)
         assertEquals(-2.2279, place?.longitude)
     }
 
     @Test
-    fun getPlaceWithMorePrecision() {
-        locationDao.insert(newPlace(with(LATITUDE, 36.246944), with(LONGITUDE, -116.816944)))
+    fun getPlaceWithMorePrecision() = runBlocking {
+        locationDao.insert(Place(latitude = 36.246944, longitude = -116.816944))
         locationDao.getPlaces().forEach { println(it) }
         val place = locationDao.findPlace(36.2469.toLikeString(), (-116.8169).toLikeString())
         assertEquals(36.246944, place?.latitude)
@@ -62,21 +61,21 @@ class LocationDaoTest : InjectingTestCase() {
     }
 
     @Test
-    fun noActiveGeofences() {
-        val place = newPlace()
+    fun noActiveGeofences() = runBlocking {
+        val place = Place()
         locationDao.insert(place)
         taskDao.createNew(newTask(with(ID, 1)))
-        locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid)))
+        locationDao.insert(Geofence(task = 1, place = place.uid))
 
         assertNull(locationDao.getGeofencesByPlace(place.uid!!))
     }
 
     @Test
-    fun activeArrivalGeofence() {
-        val place = newPlace()
+    fun activeArrivalGeofence() = runBlocking {
+        val place = Place()
         locationDao.insert(place)
         taskDao.createNew(newTask(with(ID, 1)))
-        locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true)))
+        locationDao.insert(Geofence(task = 1, place = place.uid, isArrival = true))
 
         val geofence = locationDao.getGeofencesByPlace(place.uid!!)
 
@@ -85,11 +84,11 @@ class LocationDaoTest : InjectingTestCase() {
     }
 
     @Test
-    fun activeDepartureGeofence() {
-        val place = newPlace()
+    fun activeDepartureGeofence() = runBlocking {
+        val place = Place()
         locationDao.insert(place)
         taskDao.createNew(newTask(with(ID, 1)))
-        locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(DEPARTURE, true)))
+        locationDao.insert(Geofence(task = 1, place = place.uid, isDeparture = true))
 
         val geofence = locationDao.getGeofencesByPlace(place.uid!!)
 
@@ -98,137 +97,173 @@ class LocationDaoTest : InjectingTestCase() {
     }
 
     @Test
-    fun geofenceInactiveForCompletedTask() {
-        val place = newPlace()
+    fun geofenceInactiveForCompletedTask() = runBlocking {
+        val place = Place()
         locationDao.insert(place)
         taskDao.createNew(newTask(with(ID, 1), with(COMPLETION_TIME, newDateTime())))
-        locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true)))
+        locationDao.insert(Geofence(task = 1, place = place.uid, isArrival = true))
 
         assertNull(locationDao.getGeofencesByPlace(place.uid!!))
     }
 
     @Test
-    fun geofenceInactiveForDeletedTask() {
-        val place = newPlace()
+    fun geofenceInactiveForDeletedTask() = runBlocking {
+        val place = Place()
         locationDao.insert(place)
         taskDao.createNew(newTask(with(ID, 1), with(DELETION_TIME, newDateTime())))
-        locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true)))
+        locationDao.insert(Geofence(task = 1, place = place.uid, isArrival = true))
 
         assertNull(locationDao.getGeofencesByPlace(place.uid!!))
     }
 
     @Test
-    fun ignoreArrivalForSnoozedTask() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun ignoreArrivalForSnoozedTask() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
-            taskDao.createNew(newTask(with(ID, 1), with(SNOOZE_TIME, newDateTime().plusMinutes(15))))
-            locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true)))
-
-            assertTrue(locationDao.getArrivalGeofences(place.uid!!, now()).isEmpty())
+            val task = taskDao.createNew(newTask())
+            alarmDao.insert(
+                Alarm(
+                    task = task,
+                    time = newDateTime().plusMinutes(15).millis,
+                    type = TYPE_SNOOZE
+                )
+            )
+            locationDao.insert(Geofence(task = task, place = place.uid, isArrival = true))
+
+            assertTrue(locationDao.getArrivalGeofences(place.uid!!, currentTimeMillis()).isEmpty())
         }
     }
 
     @Test
-    fun ignoreDepartureForSnoozedTask() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun ignoreDepartureForSnoozedTask() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
-            taskDao.createNew(newTask(with(ID, 1), with(SNOOZE_TIME, newDateTime().plusMinutes(15))))
-            locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(DEPARTURE, true)))
-
-            assertTrue(locationDao.getDepartureGeofences(place.uid!!, now()).isEmpty())
+            val task = taskDao.createNew(newTask())
+            alarmDao.insert(
+                Alarm(
+                    task = task,
+                    time = newDateTime().plusMinutes(15).millis,
+                    type = TYPE_SNOOZE
+                )
+            )
+            locationDao.insert(Geofence(task = task, place = place.uid, isDeparture = true))
+
+            assertTrue(locationDao.getDepartureGeofences(place.uid!!, currentTimeMillis()).isEmpty())
         }
     }
 
     @Test
-    fun getArrivalWithElapsedSnooze() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun getArrivalWithElapsedSnooze() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
-            taskDao.createNew(newTask(with(ID, 1), with(SNOOZE_TIME, newDateTime().minusMinutes(15))))
-            val geofence = newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true))
-            geofence.id = locationDao.insert(geofence)
-
-            assertEquals(listOf(geofence), locationDao.getArrivalGeofences(place.uid!!, now()))
+            val task = taskDao.createNew(newTask())
+            alarmDao.insert(
+                Alarm(
+                    task = task,
+                    time = newDateTime().minusMinutes(15).millis,
+                    type = TYPE_SNOOZE
+                )
+            )
+            val geofence = Geofence(task = task, place = place.uid, isArrival = true)
+                .let { it.copy(id = locationDao.insert(it)) }
+
+            assertEquals(listOf(geofence), locationDao.getArrivalGeofences(place.uid!!,
+                currentTimeMillis()
+            ))
         }
     }
 
     @Test
-    fun getDepartureWithElapsedSnooze() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun getDepartureWithElapsedSnooze() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
-            taskDao.createNew(newTask(with(ID, 1), with(SNOOZE_TIME, newDateTime().minusMinutes(15))))
-            val geofence = newGeofence(with(TASK, 1), with(PLACE, place.uid), with(DEPARTURE, true))
-            geofence.id = locationDao.insert(geofence)
-
-            assertEquals(listOf(geofence), locationDao.getDepartureGeofences(place.uid!!, now()))
+            val task = taskDao.createNew(newTask())
+            alarmDao.insert(
+                Alarm(
+                    task = task,
+                    time = newDateTime().minusMinutes(15).millis,
+                    type = TYPE_SNOOZE
+                )
+            )
+            val geofence = Geofence(task = task, place = place.uid, isDeparture = true)
+                .let { it.copy(id = locationDao.insert(it)) }
+
+            assertEquals(listOf(geofence), locationDao.getDepartureGeofences(place.uid!!,
+                currentTimeMillis()
+            ))
         }
     }
 
     @Test
-    fun ignoreArrivalForHiddenTask() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun ignoreArrivalForHiddenTask() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
             taskDao.createNew(newTask(
                     with(ID, 1),
                     with(DUE_TIME, newDateTime().plusMinutes(15)),
                     with(HIDE_TYPE, Task.HIDE_UNTIL_DUE_TIME)))
-            locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true)))
+            locationDao.insert(Geofence(task = 1, place = place.uid, isArrival = true))
 
-            assertTrue(locationDao.getArrivalGeofences(place.uid!!, now()).isEmpty())
+            assertTrue(locationDao.getArrivalGeofences(place.uid!!, currentTimeMillis()).isEmpty())
         }
     }
 
     @Test
-    fun ignoreDepartureForHiddenTask() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun ignoreDepartureForHiddenTask() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
             taskDao.createNew(newTask(
                     with(ID, 1),
                     with(DUE_TIME, newDateTime().plusMinutes(15)),
                     with(HIDE_TYPE, Task.HIDE_UNTIL_DUE_TIME)))
-            locationDao.insert(newGeofence(with(TASK, 1), with(PLACE, place.uid), with(DEPARTURE, true)))
+            locationDao.insert(Geofence(task = 1, place = place.uid, isDeparture = true))
 
-            assertTrue(locationDao.getDepartureGeofences(place.uid!!, now()).isEmpty())
+            assertTrue(locationDao.getDepartureGeofences(place.uid!!, currentTimeMillis()).isEmpty())
         }
     }
 
     @Test
-    fun getArrivalWithElapsedHideUntil() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun getArrivalWithElapsedHideUntil() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
             taskDao.createNew(newTask(
                     with(ID, 1),
                     with(DUE_TIME, newDateTime().minusMinutes(15)),
                     with(HIDE_TYPE, Task.HIDE_UNTIL_DUE_TIME)))
-            val geofence = newGeofence(with(TASK, 1), with(PLACE, place.uid), with(ARRIVAL, true))
-            geofence.id = locationDao.insert(geofence)
-
-            assertEquals(listOf(geofence), locationDao.getArrivalGeofences(place.uid!!, now()))
+            val geofence = Geofence(task = 1, place = place.uid, isArrival = true)
+                .let {
+                    it.copy(id = locationDao.insert(it))
+                }
+
+            assertEquals(listOf(geofence), locationDao.getArrivalGeofences(place.uid!!,
+                currentTimeMillis()
+            ))
         }
     }
 
     @Test
-    fun getDepartureWithElapsedHideUntil() {
-        Freeze.freezeAt(now()).thawAfter {
-            val place = newPlace()
+    fun getDepartureWithElapsedHideUntil() = runBlocking {
+        freezeAt(currentTimeMillis()).thawAfter {
+            val place = Place()
             locationDao.insert(place)
             taskDao.createNew(newTask(
                     with(ID, 1),
                     with(DUE_TIME, newDateTime().minusMinutes(15)),
                     with(HIDE_TYPE, Task.HIDE_UNTIL_DUE_TIME)))
-            val geofence = newGeofence(with(TASK, 1), with(PLACE, place.uid), with(DEPARTURE, true))
-            geofence.id = locationDao.insert(geofence)
+            val geofence = Geofence(task = 1, place = place.uid, isDeparture = true)
+                .let { it.copy(id = locationDao.insert(it)) }
 
-            assertEquals(listOf(geofence), locationDao.getDepartureGeofences(place.uid!!, now()))
+            assertEquals(listOf(geofence), locationDao.getDepartureGeofences(place.uid!!,
+                currentTimeMillis()
+            ))
         }
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }
 

app/src/androidTest/java/org/tasks/data/ManualGoogleTaskQueryTest.kt

@@ -1,48 +1,53 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.api.GtasksFilter
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.helper.UUIDHelper
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.R
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.GoogleTaskDao
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.filters.CaldavFilter
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.GoogleTaskListMaker.REMOTE_ID
-import org.tasks.makers.GoogleTaskListMaker.newGoogleTaskList
-import org.tasks.makers.GoogleTaskMaker.LIST
-import org.tasks.makers.GoogleTaskMaker.ORDER
-import org.tasks.makers.GoogleTaskMaker.PARENT
-import org.tasks.makers.GoogleTaskMaker.TASK
-import org.tasks.makers.GoogleTaskMaker.newGoogleTask
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
 import org.tasks.makers.TaskMaker
 import org.tasks.makers.TaskMaker.ID
-import org.tasks.makers.TaskMaker.UUID
+import org.tasks.makers.TaskMaker.ORDER
+import org.tasks.makers.TaskMaker.PARENT
 import org.tasks.preferences.Preferences
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class ManualGoogleTaskQueryTest : InjectingTestCase() {
-
+    @Inject lateinit var caldavDao: CaldavDao
     @Inject lateinit var googleTaskDao: GoogleTaskDao
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var preferences: Preferences
-    private val filter: GtasksFilter = GtasksFilter(newGoogleTaskList(with(REMOTE_ID, "1234")))
+    private lateinit var filter: CaldavFilter
 
     @Before
     override fun setUp() {
         super.setUp()
         preferences.clear()
         preferences.setBoolean(R.string.p_manual_sort, true)
+        val calendar = CaldavCalendar(uuid = "1234")
+        runBlocking {
+            caldavDao.insert(CaldavAccount())
+            caldavDao.insert(calendar)
+        }
+        filter = CaldavFilter(calendar, account = CaldavAccount(accountType = TYPE_GOOGLE_TASKS))
     }
 
     @Test
-    fun setIndentOnSubtask() {
+    fun setIndentOnSubtask() = runBlocking {
         newTask(1, 0, 0)
         newTask(2, 0, 1)
 
@@ -52,7 +57,7 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
     }
 
     @Test
-    fun setParentOnSubtask() {
+    fun setParentOnSubtask() = runBlocking {
         newTask(2, 0, 0)
         newTask(1, 0, 2)
 
@@ -62,7 +67,7 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
     }
 
     @Test
-    fun querySetsPrimarySort() {
+    fun querySetsPrimarySort() = runBlocking {
         newTask(1, 0, 0)
         newTask(2, 1, 0)
         newTask(3, 0, 2)
@@ -75,7 +80,7 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
     }
 
     @Test
-    fun querySetsSecondarySortOnSubtasks() {
+    fun querySetsSecondarySortOnSubtasks() = runBlocking {
         newTask(1, 0, 0)
         newTask(2, 0, 1)
         newTask(3, 1, 1)
@@ -87,25 +92,17 @@ class ManualGoogleTaskQueryTest : InjectingTestCase() {
         assertEquals(1, subtasks[2].secondarySort)
     }
 
-    @Test
-    fun ignoreDisableSubtasksPreference() {
-        preferences.setBoolean(R.string.p_use_paged_queries, true)
-        newTask(1, 0, 0)
-        newTask(2, 0, 1)
-
-        val parent = query()[0]
-
-        assertTrue(parent.hasChildren())
-    }
-
-    private fun newTask(id: Long, order: Long, parent: Long = 0) {
-        taskDao.insert(TaskMaker.newTask(with(ID, id), with(UUID, UUIDHelper.newUUID())))
-        googleTaskDao.insert(newGoogleTask(with(LIST, filter.list.remoteId), with(TASK, id), with(PARENT, parent), with(ORDER, order)))
-    }
-
-    private fun query(): List<TaskContainer> = taskDao.fetchTasks {
-        TaskListQuery.getQuery(preferences, filter, it)
+    private suspend fun newTask(id: Long, order: Long, parent: Long = 0) {
+        taskDao.insert(TaskMaker.newTask(
+            with(ID, id),
+            with(TaskMaker.UUID, UUIDHelper.newUUID()),
+            with(ORDER, order),
+            with(PARENT, parent),
+        ))
+        googleTaskDao.insert(newCaldavTask(with(CALENDAR, filter.uuid), with(TASK, id)))
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
+    private suspend fun query(): List<TaskContainer> = taskDao.fetchTasks(
+        TaskListQuery.getQuery(preferences, filter)
+    )
 }

app/src/androidTest/java/org/tasks/data/TagDataDaoTest.kt

@@ -1,90 +1,84 @@
 package org.tasks.data
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
 import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.junit.runner.RunWith
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.Tag
+import org.tasks.data.entity.TagData
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
-import org.tasks.makers.TagDataMaker.NAME
-import org.tasks.makers.TagDataMaker.newTagData
-import org.tasks.makers.TagMaker.TAGDATA
-import org.tasks.makers.TagMaker.TAGUID
-import org.tasks.makers.TagMaker.TASK
-import org.tasks.makers.TagMaker.newTag
 import org.tasks.makers.TaskMaker.ID
 import org.tasks.makers.TaskMaker.newTask
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class TagDataDaoTest : InjectingTestCase() {
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var tagDao: TagDao
     @Inject lateinit var tagDataDao: TagDataDao
 
     @Test
-    fun tagDataOrderedByNameIgnoresNullNames() {
-        tagDataDao.createNew(newTagData(with(NAME, null as String?)))
+    fun tagDataOrderedByNameIgnoresNullNames() = runBlocking {
+        tagDataDao.insert(TagData(name = null))
         assertTrue(tagDataDao.tagDataOrderedByName().isEmpty())
     }
 
     @Test
-    fun tagDataOrderedByNameIgnoresEmptyNames() {
-        tagDataDao.createNew(newTagData(with(NAME, "")))
+    fun tagDataOrderedByNameIgnoresEmptyNames() = runBlocking {
+        tagDataDao.insert(TagData(name = ""))
         assertTrue(tagDataDao.tagDataOrderedByName().isEmpty())
     }
 
     @Test
-    fun getTagWithCaseForMissingTag() {
+    fun getTagWithCaseForMissingTag() = runBlocking {
         assertEquals("derp", tagDataDao.getTagWithCase("derp"))
     }
 
     @Test
-    fun getTagWithCaseFixesCase() {
-        tagDataDao.createNew(newTagData(with(NAME, "Derp")))
+    fun getTagWithCaseFixesCase() = runBlocking {
+        tagDataDao.insert(TagData(name = "Derp"))
         assertEquals("Derp", tagDataDao.getTagWithCase("derp"))
     }
 
     @Test
-    fun getTagsByName() {
-        val tagData = newTagData(with(NAME, "Derp"))
-        tagDataDao.createNew(tagData)
+    fun getTagsByName() = runBlocking {
+        val tagData = TagData(name = "Derp").let { it.copy(id = tagDataDao.insert(it)) }
         assertEquals(listOf(tagData), tagDataDao.getTags(listOf("Derp")))
     }
 
     @Test
-    fun getTagsByNameCaseSensitive() {
-        tagDataDao.createNew(newTagData(with(NAME, "Derp")))
+    fun getTagsByNameCaseSensitive() = runBlocking {
+        tagDataDao.insert(TagData(name = "Derp"))
         assertTrue(tagDataDao.getTags(listOf("derp")).isEmpty())
     }
 
     @Test
-    fun getTagDataForTask() {
+    fun getTagDataForTask() = runBlocking {
         val taskOne = newTask()
         val taskTwo = newTask()
         taskDao.createNew(taskOne)
         taskDao.createNew(taskTwo)
-        val tagOne = newTagData(with(NAME, "one"))
-        val tagTwo = newTagData(with(NAME, "two"))
-        tagDataDao.createNew(tagOne)
-        tagDataDao.createNew(tagTwo)
-        tagDao.insert(newTag(with(TAGDATA, tagOne), with(TASK, taskOne)))
-        tagDao.insert(newTag(with(TAGDATA, tagTwo), with(TASK, taskTwo)))
+        val tagOne = TagData(name = "one").let { it.copy(id = tagDataDao.insert(it)) }
+        val tagTwo = TagData(name = "two").let { it.copy(id = tagDataDao.insert(it)) }
+        tagDao.insert(Tag(task = taskOne.id, taskUid = taskOne.uuid, tagUid = tagOne.remoteId))
+        tagDao.insert(Tag(task = taskTwo.id, taskUid = taskTwo.uuid, tagUid = tagTwo.remoteId))
         assertEquals(listOf(tagOne), tagDataDao.getTagDataForTask(taskOne.id))
     }
 
     @Test
-    fun getEmptyTagSelections() {
+    fun getEmptyTagSelections() = runBlocking {
         val selections = tagDataDao.getTagSelections(listOf(1L))
-        assertTrue(selections.first!!.isEmpty())
-        assertTrue(selections.second!!.isEmpty())
+        assertTrue(selections.first.isEmpty())
+        assertTrue(selections.second.isEmpty())
     }
 
     @Test
-    fun getPartialTagSelections() {
+    fun getPartialTagSelections() = runBlocking {
         newTag(1, "tag1", "tag2")
         newTag(2, "tag2", "tag3")
         assertEquals(
@@ -92,50 +86,48 @@ class TagDataDaoTest : InjectingTestCase() {
     }
 
     @Test
-    fun getEmptyPartialSelections() {
+    fun getEmptyPartialSelections() = runBlocking {
         newTag(1, "tag1")
         newTag(2, "tag1")
-        assertTrue(tagDataDao.getTagSelections(listOf(1L, 2L)).first!!.isEmpty())
+        assertTrue(tagDataDao.getTagSelections(listOf(1L, 2L)).first.isEmpty())
     }
 
     @Test
-    fun getCommonTagSelections() {
+    fun getCommonTagSelections() = runBlocking {
         newTag(1, "tag1", "tag2")
         newTag(2, "tag2", "tag3")
         assertEquals(setOf("tag2"), tagDataDao.getTagSelections(listOf(1L, 2L)).second)
     }
 
     @Test
-    fun getEmptyCommonSelections() {
+    fun getEmptyCommonSelections() = runBlocking {
         newTag(1, "tag1")
         newTag(2, "tag2")
-        assertTrue(tagDataDao.getTagSelections(listOf(1L, 2L)).second!!.isEmpty())
+        assertTrue(tagDataDao.getTagSelections(listOf(1L, 2L)).second.isEmpty())
     }
 
     @Test
-    fun getSelectionsWithNoTags() {
+    fun getSelectionsWithNoTags() = runBlocking {
         newTag(1)
         val selections = tagDataDao.getTagSelections(listOf(1L))
-        assertTrue(selections.first!!.isEmpty())
-        assertTrue(selections.second!!.isEmpty())
+        assertTrue(selections.first.isEmpty())
+        assertTrue(selections.second.isEmpty())
     }
 
     @Test
-    fun noCommonSelectionsWhenOneTaskHasNoTags() {
+    fun noCommonSelectionsWhenOneTaskHasNoTags() = runBlocking {
         newTag(1, "tag1")
         newTag(2)
         val selections = tagDataDao.getTagSelections(listOf(1L, 2L))
         assertEquals(setOf("tag1"), selections.first)
-        assertTrue(selections.second!!.isEmpty())
+        assertTrue(selections.second.isEmpty())
     }
 
-    private fun newTag(taskId: Long, vararg tags: String) {
+    private suspend fun newTag(taskId: Long, vararg tags: String) {
         val task = newTask(with(ID, taskId))
         taskDao.createNew(task)
         for (tag in tags) {
-            tagDao.insert(newTag(with(TASK, task), with(TAGUID, tag)))
+            tagDao.insert(Tag(task = task.id, taskUid = task.uuid, tagUid = tag))
         }
     }
-
-    override fun inject(component: TestComponent) = component.inject(this)
 }

app/src/androidTest/java/org/tasks/data/TaskDaoTests.kt

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2012 Todoroo Inc
+ *
+ * See the file "LICENSE" for the full license governing this code.
+ */
+package org.tasks.data
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import org.tasks.data.entity.Task
+import com.todoroo.astrid.service.TaskDeleter
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.tasks.data.dao.TaskDao
+import org.tasks.injection.InjectingTestCase
+import org.tasks.makers.TaskMaker.PARENT
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
+import javax.inject.Inject
+
+@HiltAndroidTest
+class TaskDaoTests : InjectingTestCase() {
+
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var taskDeleter: TaskDeleter
+
+    /** Test various task fetch conditions  */
+    @Test
+    fun testTaskConditions() = runBlocking {
+        // create normal task
+        var task = Task()
+        task.title = "normal"
+        taskDao.createNew(task)
+
+        // create blank task
+        task = Task()
+        task.title = ""
+        taskDao.createNew(task)
+
+        // create hidden task
+        task = Task()
+        task.title = "hidden"
+        task.hideUntil = currentTimeMillis() + 10000
+        taskDao.createNew(task)
+
+        // create task with deadlines
+        task = Task()
+        task.title = "deadlineInFuture"
+        task.dueDate = currentTimeMillis() + 10000
+        taskDao.createNew(task)
+        task = Task()
+        task.title = "deadlineInPast"
+        task.dueDate = currentTimeMillis() - 10000
+        taskDao.createNew(task)
+
+        // create completed task
+        task = Task()
+        task.title = "completed"
+        task.completionDate = currentTimeMillis() - 10000
+        taskDao.createNew(task)
+
+        // check is active
+        assertEquals(5, taskDao.getActiveTasks().size)
+
+        // check is visible
+        assertEquals(5, taskDao.getActiveTasks().size)
+    }
+
+    /** Test task deletion  */
+    @Test
+    fun testTDeletion() = runBlocking {
+        assertEquals(0, taskDao.getAll().size)
+
+        // create task "happy"
+        val task = Task()
+        task.title = "happy"
+        taskDao.createNew(task)
+        assertEquals(1, taskDao.getAll().size)
+
+        // delete
+        taskDeleter.delete(task)
+        assertEquals(0, taskDao.getAll().size)
+    }
+
+    /** Test passing invalid task indices to various things  */
+    @Test
+    fun testInvalidIndex() = runBlocking {
+        assertEquals(0, taskDao.getAll().size)
+        assertNull(taskDao.fetch(1))
+        taskDeleter.delete(listOf(1L))
+
+        // make sure db still works
+        assertEquals(0, taskDao.getAll().size)
+    }
+
+    @Test
+    fun findChildrenInList() = runBlocking {
+        val parent = taskDao.createNew(newTask())
+        val child = taskDao.createNew(newTask(with(PARENT, parent)))
+        assertEquals(listOf(child), taskDao.getChildren(listOf(parent, child)))
+    }
+
+    @Test
+    fun findRecursiveChildrenInList() = runBlocking {
+        val parent = taskDao.createNew(newTask())
+        val child = taskDao.createNew(newTask(with(PARENT, parent)))
+        val grandchild = taskDao.createNew(newTask(with(PARENT, child)))
+        assertEquals(
+                listOf(child, grandchild, grandchild),
+                taskDao.getChildren(listOf(parent, child, grandchild)))
+    }
+
+    @Test
+    fun findRecursiveChildrenInListAfterSkippingParent() = runBlocking {
+        val parent = taskDao.createNew(newTask())
+        val child = taskDao.createNew(newTask(with(PARENT, parent)))
+        val grandchild = taskDao.createNew(newTask(with(PARENT, child)))
+        assertEquals(listOf(child, grandchild), taskDao.getChildren(listOf(parent, grandchild)))
+    }
+
+    @Test
+    fun dontSetParentToSelf() = runBlocking {
+        val parent = taskDao.createNew(newTask())
+        val child = taskDao.createNew(newTask())
+
+        taskDao.setParent(parent, listOf(parent, child))
+
+        assertEquals(0, taskDao.fetch(parent)!!.parent)
+        assertEquals(parent, taskDao.fetch(child)!!.parent)
+    }
+}

app/src/androidTest/java/org/tasks/data/UpgraderDaoTests.kt

@@ -0,0 +1,62 @@
+package org.tasks.data
+
+import com.natpryce.makeiteasy.MakeItEasy
+import com.todoroo.astrid.dao.TaskDao
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.dao.UpgraderDao
+import org.tasks.data.entity.CaldavTask
+import org.tasks.data.entity.Tag
+import org.tasks.data.entity.TagData
+import org.tasks.injection.InjectingTestCase
+import org.tasks.makers.TaskMaker
+import javax.inject.Inject
+
+@HiltAndroidTest
+class UpgraderDaoTests : InjectingTestCase() {
+
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var tagDao: TagDao
+    @Inject lateinit var tagDataDao: TagDataDao
+    @Inject lateinit var caldavDao: CaldavDao
+    @Inject lateinit var upgraderDao: UpgraderDao
+
+    @Test
+    fun getCaldavTasksWithTags() = runBlocking {
+        val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.ID, 1L))
+        taskDao.createNew(task)
+        val one = TagData()
+        val two = TagData()
+        tagDataDao.insert(one)
+        tagDataDao.insert(two)
+        tagDao.insert(Tag(task = task.id, taskUid = task.uuid, tagUid = one.remoteId))
+        tagDao.insert(Tag(task = task.id, taskUid = task.uuid, tagUid = two.remoteId))
+        caldavDao.insert(CaldavTask(task = task.id, calendar = "calendar"))
+        assertEquals(listOf(task.id), upgraderDao.tasksWithTags())
+    }
+
+    @Test
+    fun ignoreNonCaldavTaskWithTags() = runBlocking {
+        val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.ID, 1L))
+        taskDao.createNew(task)
+        val tag = TagData()
+        tagDataDao.insert(tag)
+        tagDao.insert(Tag(task = task.id, taskUid = task.uuid, tagUid = tag.remoteId))
+        assertTrue(upgraderDao.tasksWithTags().isEmpty())
+    }
+
+    @Test
+    fun ignoreCaldavTaskWithoutTags() = runBlocking {
+        val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.ID, 1L))
+        taskDao.createNew(task)
+        tagDataDao.insert(TagData())
+        caldavDao.insert(CaldavTask(task = task.id, calendar = "calendar"))
+        assertTrue(upgraderDao.tasksWithTags().isEmpty())
+    }
+}

app/src/androidTest/java/org/tasks/gtasks/GoogleTaskSynchronizerTest.kt

@@ -2,7 +2,7 @@ package org.tasks.gtasks
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.natpryce.makeiteasy.MakeItEasy.with
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test

app/src/androidTest/java/org/tasks/injection/InjectingTestCase.kt

@@ -1,20 +1,24 @@
 package org.tasks.injection
 
 import android.content.Context
-import androidx.test.core.app.ApplicationProvider
+import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
 import org.junit.Before
-import timber.log.Timber
+import org.junit.Rule
 
 abstract class InjectingTestCase {
+    @get:Rule
+    var hiltRule = HiltAndroidRule(this)
+
     @Before
     open fun setUp() {
-        Thread.setDefaultUncaughtExceptionHandler { _, e: Throwable? -> Timber.e(e) }
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        val component = DaggerTestComponent.builder()
-                .applicationModule(ApplicationModule(context))
-                .testModule(TestModule()).build()
-        inject(component)
+        hiltRule.inject()
     }
 
-    protected abstract fun inject(component: TestComponent)
+    protected fun runOnMainSync(runnable: Runnable) =
+            InstrumentationRegistry.getInstrumentation().runOnMainSync(runnable)
+
+    protected val context: Context
+        get() = getApplicationContext()
 }

app/src/androidTest/java/org/tasks/injection/TestComponent.kt

@@ -1,51 +0,0 @@
-package org.tasks.injection
-
-import com.todoroo.astrid.adapter.*
-import com.todoroo.astrid.alarms.AlarmJobServiceTest
-import com.todoroo.astrid.dao.TaskDaoTests
-import com.todoroo.astrid.gtasks.GtasksListServiceTest
-import com.todoroo.astrid.gtasks.GtasksMetadataServiceTest
-import com.todoroo.astrid.model.TaskTest
-import com.todoroo.astrid.reminders.ReminderServiceTest
-import com.todoroo.astrid.repeats.RepeatTaskHelperTest
-import com.todoroo.astrid.service.QuickAddMarkupTest
-import com.todoroo.astrid.service.TaskMoverTest
-import com.todoroo.astrid.service.TitleParserTest
-import com.todoroo.astrid.subtasks.SubtasksHelperTest
-import com.todoroo.astrid.subtasks.SubtasksMovingTest
-import com.todoroo.astrid.sync.NewSyncTestCase
-import dagger.Component
-import org.tasks.data.*
-import org.tasks.jobs.BackupServiceTests
-
-@ApplicationScope
-@Component(modules = [TestModule::class])
-interface TestComponent : ApplicationComponent {
-    fun inject(tests: GtasksListServiceTest)
-    fun inject(tests: ReminderServiceTest)
-    fun inject(tests: TaskTest)
-    fun inject(tests: TaskDaoTests)
-    fun inject(tests: NewSyncTestCase)
-    fun inject(tests: SubtasksMovingTest)
-    fun inject(tests: SubtasksHelperTest)
-    fun inject(tests: QuickAddMarkupTest)
-    fun inject(tests: TitleParserTest)
-    fun inject(tests: BackupServiceTests)
-    fun inject(tests: AlarmJobServiceTest)
-    fun inject(tests: RepeatTaskHelperTest)
-    fun inject(tests: GtasksMetadataServiceTest)
-    fun inject(tests: DeletionDaoTests)
-    fun inject(tests: GoogleTaskDaoTests)
-    fun inject(tests: TagDataDaoTest)
-    fun inject(tests: CaldavDaoTests)
-    fun inject(tests: TaskMoverTest)
-    fun inject(tests: LocationDaoTest)
-    fun inject(tests: GoogleTaskListDaoTest)
-    fun inject(tests: CaldavTaskAdapterTest)
-    fun inject(tests: ManualGoogleTaskQueryTest)
-    fun inject(tests: CaldavDaoShiftTests)
-    fun inject(tests: CaldavManualSortTaskAdapterTest)
-    fun inject(tests: GoogleTaskManualSortAdapterTest)
-    fun inject(tests: OfflineSubtaskTest)
-    fun inject(tests: NonRecursiveQueryTest)
-}

app/src/androidTest/java/org/tasks/injection/TestModule.kt

@@ -2,31 +2,54 @@ package org.tasks.injection
 
 import android.content.Context
 import androidx.room.Room
-import com.todoroo.astrid.dao.Database
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import dagger.hilt.testing.TestInstallIn
+import org.mockito.Mockito.mock
 import org.tasks.TestUtilities
+import org.tasks.data.db.Database
+import org.tasks.jobs.WorkManager
+import org.tasks.location.LocationManager
+import org.tasks.location.MockLocationManager
 import org.tasks.preferences.PermissionChecker
 import org.tasks.preferences.PermissivePermissionChecker
 import org.tasks.preferences.Preferences
+import javax.inject.Singleton
 
-@Module(includes = [ApplicationModule::class])
+@Module
+@TestInstallIn(
+    components = [SingletonComponent::class],
+    replaces = [ProductionModule::class]
+)
 class TestModule {
     @Provides
-    @ApplicationScope
-    fun getDatabase(@ForApplication context: Context): Database {
-        return Room.inMemoryDatabaseBuilder(context, Database::class.java)
-                .fallbackToDestructiveMigration()
-                .build()
-    }
+    @Singleton
+    fun getDatabase(@ApplicationContext context: Context): Database =
+        Room
+            .inMemoryDatabaseBuilder(context, Database::class.java)
+            .fallbackToDestructiveMigration(dropAllTables = true)
+            .setDriver()
+            .build()
 
     @Provides
-    fun getPermissionChecker(@ForApplication context: Context): PermissionChecker {
+    fun getPermissionChecker(@ApplicationContext context: Context): PermissionChecker {
         return PermissivePermissionChecker(context)
     }
 
     @Provides
-    fun getPreferences(@ForApplication context: Context): Preferences {
+    fun getPreferences(@ApplicationContext context: Context): Preferences {
         return TestUtilities.newPreferences(context)
     }
+
+    @Provides
+    @Singleton
+    fun getMockLocationManager(): MockLocationManager = MockLocationManager()
+
+    @Provides
+    fun getLocationManager(locationManager: MockLocationManager): LocationManager = locationManager
+
+    @Provides
+    fun getWorkManager(): WorkManager = mock(WorkManager::class.java)
 }

app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.kt

@@ -7,56 +7,58 @@ package org.tasks.jobs
 
 import android.net.Uri
 import androidx.test.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.todoroo.astrid.dao.TaskDao
-import com.todoroo.astrid.data.Task
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
+import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.tasks.R
+import org.tasks.backup.BackupConstants.BACKUP_CLEANUP_MATCHER
 import org.tasks.backup.TasksJsonExporter
 import org.tasks.backup.TasksJsonExporter.ExportType
 import org.tasks.injection.InjectingTestCase
-import org.tasks.injection.TestComponent
 import org.tasks.preferences.Preferences
 import java.io.File
 import java.io.IOException
 import javax.inject.Inject
 
-@RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class BackupServiceTests : InjectingTestCase() {
     @Inject lateinit var jsonExporter: TasksJsonExporter
     @Inject lateinit var taskDao: TaskDao
     @Inject lateinit var preferences: Preferences
     private lateinit var temporaryDirectory: File
-    
+
+    @Before
     override fun setUp() {
-        super.setUp()
-        temporaryDirectory = try {
-            File.createTempFile("backup", System.nanoTime().toString())
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-        if (!temporaryDirectory.delete()) {
-            throw RuntimeException(
-                    "Could not delete temp file: " + temporaryDirectory.absolutePath)
-        }
-        if (!temporaryDirectory.mkdir()) {
-            throw RuntimeException(
-                    "Could not create temp directory: " + temporaryDirectory.absolutePath)
-        }
-        preferences.setUri(R.string.p_backup_dir, Uri.fromFile(temporaryDirectory))
+        runBlocking {
+            super.setUp()
+            temporaryDirectory = try {
+                File.createTempFile("backup", System.nanoTime().toString())
+            } catch (e: IOException) {
+                throw RuntimeException(e)
+            }
+            if (!temporaryDirectory.delete()) {
+                throw RuntimeException(
+                        "Could not delete temp file: " + temporaryDirectory.absolutePath)
+            }
+            if (!temporaryDirectory.mkdir()) {
+                throw RuntimeException(
+                        "Could not create temp directory: " + temporaryDirectory.absolutePath)
+            }
+            preferences.setUri(R.string.p_backup_dir, Uri.fromFile(temporaryDirectory))
 
-        // make a temporary task
-        val task = Task()
-        task.title = "helicopter"
-        taskDao.createNew(task)
+            // make a temporary task
+            val task = Task()
+            task.title = "helicopter"
+            taskDao.createNew(task)
+        }
     }
 
-    override fun inject(component: TestComponent) = component.inject(this)
-
     @After
     fun tearDown() {
         for (file in temporaryDirectory.listFiles()!!) {
@@ -66,13 +68,13 @@ class BackupServiceTests : InjectingTestCase() {
     }
 
     @Test
-    fun testBackup() {
+    fun testBackup() = runBlocking {
         assertEquals(0, temporaryDirectory.list()!!.size)
         jsonExporter.exportTasks(InstrumentationRegistry.getTargetContext(), ExportType.EXPORT_TYPE_SERVICE, null)
 
         // assert file created
         val files = temporaryDirectory.listFiles()
         assertEquals(1, files!!.size)
-        assertTrue(files[0].name.matches(Regex(BackupWork.BACKUP_FILE_NAME_REGEX)))
+        assertTrue(files[0].name.matches(BACKUP_CLEANUP_MATCHER))
     }
 }

app/src/androidTest/java/org/tasks/location/LocationServiceAndroidTest.kt

@@ -0,0 +1,73 @@
+package org.tasks.location
+
+import android.location.Location
+import android.location.LocationManager.GPS_PROVIDER
+import android.location.LocationManager.NETWORK_PROVIDER
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.tasks.injection.InjectingTestCase
+import org.tasks.time.DateTime
+import javax.inject.Inject
+
+@HiltAndroidTest
+class LocationServiceAndroidTest : InjectingTestCase() {
+    @Inject lateinit var service: LocationServiceAndroid
+    @Inject lateinit var locationManager: MockLocationManager
+
+    @Test
+    fun sortByAccuracy() = runBlocking {
+        newLocation(NETWORK_PROVIDER, 45.0, 46.0, 50f, DateTime(2021, 2, 4, 13, 35, 45, 121))
+        newLocation(GPS_PROVIDER, 45.1, 46.1, 30f, DateTime(2021, 2, 4, 13, 33, 45, 121))
+
+        assertEquals(MapPosition(45.1, 46.1), service.currentLocation())
+    }
+
+    @Test
+    fun sortWithStaleLocation() = runBlocking {
+        newLocation(GPS_PROVIDER, 45.1, 46.1, 30f, DateTime(2021, 2, 4, 13, 33, 44, 121))
+        newLocation(NETWORK_PROVIDER, 45.0, 46.0, 50f, DateTime(2021, 2, 4, 13, 35, 45, 121))
+
+        assertEquals(MapPosition(45.0, 46.0), service.currentLocation())
+    }
+
+    @Test
+    fun useNewerUpdateWhenAccuracySame() = runBlocking {
+        newLocation(GPS_PROVIDER, 45.1, 46.1, 50f, DateTime(2021, 2, 4, 13, 35, 45, 100))
+        newLocation(NETWORK_PROVIDER, 45.0, 46.0, 50f, DateTime(2021, 2, 4, 13, 35, 45, 121))
+
+        assertEquals(MapPosition(45.0, 46.0), service.currentLocation())
+    }
+
+    @Test
+    fun returnCachedLocation() = runBlocking {
+        newLocation(GPS_PROVIDER, 45.1, 46.1, 50f, DateTime(2021, 2, 4, 13, 35, 45, 100))
+
+        service.currentLocation()
+
+        locationManager.clearLocations()
+
+        assertEquals(MapPosition(45.1, 46.1), service.currentLocation())
+    }
+
+    @Test
+    fun nullWhenNoPosition() = runBlocking {
+        assertNull(service.currentLocation())
+    }
+
+    private fun newLocation(
+            provider: String,
+            latitude: Double,
+            longitude: Double,
+            accuracy: Float,
+            time: DateTime) {
+        locationManager.addLocations(Location(provider).apply {
+            this.latitude = latitude
+            this.longitude = longitude
+            this.accuracy = accuracy
+            this.time = time.millis
+        })
+    }
+}

app/src/androidTest/java/org/tasks/location/MockLocationManager.kt

@@ -0,0 +1,26 @@
+package org.tasks.location
+
+import android.app.PendingIntent
+import android.location.Location
+
+class MockLocationManager : LocationManager {
+    private val mockLocations = ArrayList<Location>()
+
+    fun addLocations(vararg locations: Location) {
+        mockLocations.addAll(locations)
+    }
+
+    fun clearLocations() = mockLocations.clear()
+
+    override val lastKnownLocations: List<Location>
+        get() = mockLocations
+
+    override fun addProximityAlert(
+            latitude: Double,
+            longitude: Double,
+            radius: Float,
+            intent: PendingIntent
+    ) {}
+
+    override fun removeProximityAlert(intent: PendingIntent) {}
+}

app/src/androidTest/java/org/tasks/makers

@@ -0,0 +1 @@
+../../../../test/java/org/tasks/makers

app/src/androidTest/java/org/tasks/notifications/ThrottleTest.kt

@@ -1,73 +0,0 @@
-package org.tasks.notifications
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mockito
-import org.tasks.Freeze
-import org.tasks.notifications.Throttle
-import org.tasks.time.DateTimeUtils
-
-@RunWith(AndroidJUnit4::class)
-class ThrottleTest {
-    private lateinit var sleeper: Throttle.Sleeper
-    private lateinit var throttle: Throttle
-
-    @Before
-    fun setUp() {
-        sleeper = Mockito.mock(Throttle.Sleeper::class.java)
-        throttle = Throttle(3, sleeper)
-    }
-
-    @After
-    fun tearDown() {
-        Mockito.verifyNoMoreInteractions(sleeper)
-    }
-
-    @Test
-    fun dontThrottle() {
-        val now = DateTimeUtils.currentTimeMillis()
-        runAt(now)
-        runAt(now)
-        runAt(now)
-        runAt(now + 1000)
-    }
-
-    @Test
-    fun throttleForOneMillisecond() {
-        val now = DateTimeUtils.currentTimeMillis()
-        runAt(now)
-        runAt(now)
-        runAt(now)
-        runAt(now + 999)
-        Mockito.verify(sleeper).sleep(1)
-    }
-
-    @Test
-    fun throttleForOneSecond() {
-        val now = DateTimeUtils.currentTimeMillis()
-        runAt(now)
-        runAt(now)
-        runAt(now)
-        runAt(now)
-        Mockito.verify(sleeper).sleep(1000)
-    }
-
-    @Test
-    fun throttleMultiple() {
-        val now = DateTimeUtils.currentTimeMillis()
-        runAt(now)
-        runAt(now + 200)
-        runAt(now + 600)
-        runAt(now + 700)
-        Mockito.verify(sleeper).sleep(300)
-        runAt(now + 750)
-        Mockito.verify(sleeper).sleep(450)
-    }
-
-    private fun runAt(millis: Long) {
-        Freeze.freezeAt(millis) { throttle.run {} }
-    }
-}

app/src/androidTest/java/org/tasks/opentasks/OpenTasksDueDateTests.kt

@@ -0,0 +1,237 @@
+package org.tasks.opentasks
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import org.tasks.data.entity.Task
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.tasks.TestUtilities.withTZ
+import org.tasks.makers.CaldavTaskMaker
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
+import org.tasks.makers.TaskMaker
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTime
+import java.util.*
+
+@HiltAndroidTest
+class OpenTasksDueDateTests : OpenTasksTest() {
+
+    @Test
+    fun readDueDatePositiveOffset() = runBlocking {
+        val (_, list) = withVtodo(ALL_DAY_DUE)
+
+        withTZ(BERLIN) {
+            synchronizer.sync()
+        }
+
+        val caldavTask = caldavDao.getTaskByRemoteId(list.uuid!!, "3863299529704302692")
+        val task = taskDao.fetch(caldavTask!!.task)
+        assertEquals(
+                DateTime(2021, 2, 1, 12, 0, 0, 0, BERLIN).millis,
+                task?.dueDate
+        )
+    }
+
+    @Test
+    fun writeDueDatePositiveOffset() = withTZ(BERLIN) {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask(
+                with(TaskMaker.DUE_DATE, DateTime(2021, 2, 1))
+        ))
+        caldavDao.insert(newCaldavTask(
+                with(CaldavTaskMaker.CALENDAR, list.uuid),
+                with(CaldavTaskMaker.REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, taskId)
+        ))
+
+        synchronizer.sync()
+
+        assertEquals(
+                1612137600000,
+                openTaskDao.getTask(listId, "1234")?.task?.due?.date?.time
+        )
+    }
+
+    @Test
+    fun readDueDateNoOffset() = runBlocking {
+        val (_, list) = withVtodo(ALL_DAY_DUE)
+
+        withTZ(LONDON) {
+            synchronizer.sync()
+        }
+
+        val caldavTask = caldavDao.getTaskByRemoteId(list.uuid!!, "3863299529704302692")
+        val task = taskDao.fetch(caldavTask!!.task)
+        assertEquals(
+                DateTime(2021, 2, 1, 12, 0, 0, 0, LONDON).millis,
+                task?.dueDate
+        )
+    }
+
+    @Test
+    fun writeDueDateNoOffset() = withTZ(LONDON) {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask(
+                with(TaskMaker.DUE_DATE, DateTime(2021, 2, 1))
+        ))
+        caldavDao.insert(newCaldavTask(
+                with(CaldavTaskMaker.CALENDAR, list.uuid),
+                with(CaldavTaskMaker.REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, taskId)
+        ))
+
+        synchronizer.sync()
+
+        assertEquals(
+                1612137600000,
+                openTaskDao.getTask(listId, "1234")?.task?.due?.date?.time
+        )
+    }
+
+    @Test
+    fun readDueDateNegativeOffset() = runBlocking {
+        val (_, list) = withVtodo(ALL_DAY_DUE)
+
+        withTZ(NEW_YORK) {
+            synchronizer.sync()
+        }
+
+        val caldavTask = caldavDao.getTaskByRemoteId(list.uuid!!, "3863299529704302692")
+        val task = taskDao.fetch(caldavTask!!.task)
+        assertEquals(
+                DateTime(2021, 2, 1, 12, 0, 0, 0, NEW_YORK).millis,
+                task?.dueDate
+        )
+    }
+
+    @Test
+    fun writeDueDateNegativeOffset() = withTZ(NEW_YORK) {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask(
+                with(TaskMaker.DUE_DATE, DateTime(2021, 2, 1))
+        ))
+        caldavDao.insert(newCaldavTask(
+                with(CaldavTaskMaker.CALENDAR, list.uuid),
+                with(CaldavTaskMaker.REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, taskId)
+        ))
+
+        synchronizer.sync()
+
+        assertEquals(
+                1612137600000,
+                openTaskDao.getTask(listId, "1234")?.task?.due?.date?.time
+        )
+    }
+
+    @Test
+    fun pushStartTimeBeforeDueTime() = withTZ(CHICAGO) {
+        val (listId, list) = openTaskDao.insertList()
+        val task = newTask(
+                with(TaskMaker.HIDE_TYPE, Task.HIDE_UNTIL_DUE_TIME),
+                with(TaskMaker.DUE_TIME, DateTime(2021, 2, 1, 16, 0))
+        )
+        taskDao.createNew(task)
+        caldavDao.insert(newCaldavTask(
+                with(CaldavTaskMaker.CALENDAR, list.uuid),
+                with(CaldavTaskMaker.REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, task.id)
+        ))
+
+        synchronizer.sync()
+
+        assertEquals(
+                1612216800000,
+                openTaskDao.getTask(listId, "1234")?.task?.dtStart?.date?.time
+        )
+        assertEquals(
+                1612216801000,
+                openTaskDao.getTask(listId, "1234")?.task?.due?.date?.time
+        )
+    }
+
+    @Test
+    fun startTimeEqualDueTime() = runBlocking {
+        val (_, list) = withVtodo(START_TIME_DUE_TIME)
+
+        withTZ(CHICAGO) {
+            synchronizer.sync()
+        }
+
+        val caldavTask = caldavDao.getTaskByRemoteId(list.uuid!!, "2009955511573185442")
+        val task = taskDao.fetch(caldavTask!!.task)!!
+        assertEquals(DateTime(2021, 2, 4, 8, 0, 1, 0, CHICAGO).millis, task.dueDate)
+        assertEquals(task.dueDate, task.hideUntil)
+    }
+
+    @Test
+    fun startTimeEqualDueTimeNoOffset() = runBlocking {
+        val (_, list) = withVtodo(START_TIME_DUE_TIME_NO_OFFSET)
+
+        withTZ(CHICAGO) {
+            synchronizer.sync()
+        }
+
+        val caldavTask = caldavDao.getTaskByRemoteId(list.uuid!!, "2009955511573185442")
+        val task = taskDao.fetch(caldavTask!!.task)!!
+        assertEquals(DateTime(2021, 2, 4, 8, 0, 1, 0, CHICAGO).millis, task.dueDate)
+        assertEquals(task.dueDate, task.hideUntil)
+    }
+
+    companion object {
+        private val BERLIN = TimeZone.getTimeZone("Europe/Berlin")
+        private val LONDON = TimeZone.getTimeZone("Europe/London")
+        private val NEW_YORK = TimeZone.getTimeZone("America/New_York")
+        private val CHICAGO = TimeZone.getTimeZone("America/Chicago")
+
+        private val ALL_DAY_DUE = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110304//EN
+            BEGIN:VTODO
+            DTSTAMP:20210129T155402Z
+            UID:3863299529704302692
+            CREATED:20210129T155318Z
+            LAST-MODIFIED:20210129T155329Z
+            SUMMARY:Due date
+            DUE;VALUE=DATE:20210201
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val START_TIME_DUE_TIME = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110305//EN
+            BEGIN:VTODO
+            DTSTAMP:20210203T164753Z
+            UID:2009955511573185442
+            CREATED:20210203T164728Z
+            LAST-MODIFIED:20210203T164750Z
+            SUMMARY:Start time
+            X-APPLE-SORT-ORDER:-5
+            DUE;TZID=America/Chicago:20210204T080001
+            DTSTART;TZID=America/Chicago:20210204T080000
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val START_TIME_DUE_TIME_NO_OFFSET = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110305//EN
+            BEGIN:VTODO
+            DTSTAMP:20210203T164753Z
+            UID:2009955511573185442
+            CREATED:20210203T164728Z
+            LAST-MODIFIED:20210203T164750Z
+            SUMMARY:Start time
+            X-APPLE-SORT-ORDER:-5
+            DUE;TZID=America/Chicago:20210204T080000
+            DTSTART;TZID=America/Chicago:20210204T080000
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/opentasks/OpenTasksPropertiesTests.kt

@@ -0,0 +1,389 @@
+package org.tasks.opentasks
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.SuspendFreeze.Companion.freezeAt
+import org.tasks.TestUtilities.withTZ
+import org.tasks.caldav.iCalendar.Companion.collapsed
+import org.tasks.caldav.iCalendar.Companion.order
+import org.tasks.caldav.iCalendar.Companion.parent
+import org.tasks.caldav.iCalendar.Companion.snooze
+import org.tasks.data.dao.AlarmDao
+import org.tasks.data.dao.TagDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.entity.Alarm
+import org.tasks.data.entity.Alarm.Companion.TYPE_SNOOZE
+import org.tasks.data.entity.Tag
+import org.tasks.data.entity.TagData
+import org.tasks.data.entity.Task
+import org.tasks.makers.CaldavTaskMaker
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
+import org.tasks.makers.TaskMaker
+import org.tasks.makers.TaskMaker.COLLAPSED
+import org.tasks.makers.TaskMaker.ORDER
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTime
+import java.util.TimeZone
+import javax.inject.Inject
+
+@HiltAndroidTest
+class OpenTasksPropertiesTests : OpenTasksTest() {
+
+    @Inject lateinit var tagDataDao: TagDataDao
+    @Inject lateinit var tagDao: TagDao
+    @Inject lateinit var alarmDao: AlarmDao
+
+    @Test
+    fun loadRemoteParentInfo() = runBlocking {
+        val (_, list) = withVtodo(SUBTASK)
+
+        synchronizer.sync()
+
+        val task = caldavDao.getTaskByRemoteId(list.uuid!!, "dfede1b0-435b-4bba-9708-2422e781747c")
+        assertEquals("7daa4a5c-cc76-4ddf-b4f8-b9d3a9cb00e7", task?.remoteParent)
+    }
+
+    @Test
+    fun pushParentInfo() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask(with(TaskMaker.PARENT, 594)))
+
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(CaldavTaskMaker.TASK, taskId),
+                with(REMOTE_ID, "abcd"),
+                with(CaldavTaskMaker.REMOTE_PARENT, "1234")
+        ))
+
+        synchronizer.sync()
+
+        assertEquals("1234", openTaskDao.getTask(listId, "abcd")?.task?.parent)
+    }
+
+    @Test
+    fun createNewTags() = runBlocking {
+        val (_, list) = withVtodo(TWO_TAGS)
+
+        synchronizer.sync()
+
+        assertEquals(
+                setOf("Tag1", "Tag2"),
+                caldavDao.getTaskByRemoteId(list.uuid!!, "3076145036806467726")
+                        ?.task
+                        ?.let { tagDao.getTagsForTask(it) }
+                        ?.map { it.name }
+                        ?.toSet()
+        )
+    }
+
+    @Test
+    fun matchExistingTag() = runBlocking {
+        val (_, list) = withVtodo(ONE_TAG)
+        val tag = TagData(name = "Tag1").let { it.copy(id = tagDataDao.insert(it)) }
+
+        synchronizer.sync()
+
+        assertEquals(
+                listOf(tag),
+                caldavDao.getTaskByRemoteId(list.uuid!!, "3076145036806467726")
+                        ?.task
+                        ?.let { tagDataDao.getTagDataForTask(it)}
+        )
+    }
+
+    @Test
+    fun uploadTags() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        val task = newTask().apply { taskDao.createNew(this) }
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, task.id)
+        ))
+        insertTag(task, "Tag1")
+        insertTag(task, "Tag2")
+
+        synchronizer.sync()
+
+        assertEquals(
+                setOf("Tag1", "Tag2"),
+                openTaskDao.getTask(listId, "1234")?.task?.categories?.toSet()
+        )
+    }
+
+    @Test
+    fun loadOrder() = runBlocking {
+        val (_, list) = withVtodo(ONE_TAG)
+
+        synchronizer.sync()
+
+        val task = caldavDao.getTaskByRemoteId(list.uuid!!, "3076145036806467726")!!.task
+        assertEquals(633734058L, taskDao.fetch(task)?.order)
+    }
+
+    @Test
+    fun pushOrder() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        val task = newTask(with(ORDER, 5678L))
+        taskDao.createNew(task)
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "1234"),
+                with(CaldavTaskMaker.TASK, task.id)
+        ))
+
+        synchronizer.sync()
+
+        assertEquals(
+                5678L,
+                openTaskDao.getTask(listId, "1234")?.task?.order
+        )
+    }
+
+    @Test
+    fun readCollapsedState() = runBlocking {
+        val (_, list) = withVtodo(HIDE_SUBTASKS)
+
+        synchronizer.sync()
+
+        val task = caldavDao
+                .getTaskByRemoteId(list.uuid!!, "2822976a-b71e-4962-92e4-db7297789c20")
+                ?.let { taskDao.fetch(it.task) }
+        assertTrue(task!!.isCollapsed)
+    }
+
+    @Test
+    fun pushCollapsedState() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask(with(COLLAPSED, true)))
+
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(CaldavTaskMaker.TASK, taskId),
+                with(REMOTE_ID, "abcd")
+        ))
+
+        synchronizer.sync()
+
+        assertTrue(openTaskDao.getTask(listId, "abcd")?.task!!.collapsed)
+    }
+
+    @Test
+    fun removeCollapsedState() = runBlocking {
+        val (listId, list) = withVtodo(HIDE_SUBTASKS)
+
+        synchronizer.sync()
+
+        val task = caldavDao.getTaskByRemoteId(list.uuid!!, "2822976a-b71e-4962-92e4-db7297789c20")
+
+        taskDao.setCollapsed(task!!.task, false)
+
+        synchronizer.sync()
+
+        assertFalse(
+                openTaskDao
+                        .getTask(listId, "2822976a-b71e-4962-92e4-db7297789c20")
+                        ?.task
+                        !!.collapsed
+        )
+    }
+
+    @Test
+    fun readSnoozeTime() = runBlocking {
+        val (_, list) = withVtodo(SNOOZED)
+
+        withTZ(CHICAGO) {
+            synchronizer.sync()
+        }
+
+        val task = caldavDao
+                .getTaskByRemoteId(list.uuid!!, "4CBBC669-70E3-474D-A0A3-0FC42A14A5A5")
+                ?.let { taskDao.fetch(it.task) }
+
+        assertEquals(
+            listOf(
+                Alarm(
+                    id = 1,
+                    task = task!!.id,
+                    time = 1612972355000,
+                    type = TYPE_SNOOZE
+                )
+            ),
+            alarmDao.getAlarms(task.id)
+        )
+    }
+
+    @Test
+    fun pushSnoozeTime() = withTZ(CHICAGO) {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask())
+        alarmDao.insert(
+            Alarm(
+                task = taskId,
+                time = DateTime(2021, 2, 4, 13, 30).millis,
+                type = TYPE_SNOOZE
+            )
+        )
+
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(CaldavTaskMaker.TASK, taskId),
+                with(REMOTE_ID, "abcd")
+        ))
+
+        freezeAt(DateTime(2021, 2, 4, 12, 30, 45, 125)) {
+            synchronizer.sync()
+        }
+
+        assertEquals(1612467000000, openTaskDao.getTask(listId, "abcd")?.task!!.snooze)
+    }
+
+    @Test
+    fun dontPushLapsedSnoozeTime() = withTZ(CHICAGO) {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask())
+        alarmDao.insert(
+            Alarm(
+                task = taskId,
+                time = DateTime(2021, 2, 4, 13, 30).millis,
+                type = TYPE_SNOOZE
+            )
+        )
+
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(CaldavTaskMaker.TASK, taskId),
+                with(REMOTE_ID, "abcd")
+        ))
+
+        freezeAt(DateTime(2021, 2, 4, 13, 30, 45, 125)) {
+            synchronizer.sync()
+        }
+
+        assertNull(openTaskDao.getTask(listId, "abcd")?.task!!.snooze)
+    }
+
+    @Test
+    fun removeSnoozeTime() = withTZ(CHICAGO) {
+        val (listId, list) = withVtodo(SNOOZED)
+
+        synchronizer.sync()
+
+        val task = caldavDao.getTaskByRemoteId(list.uuid!!, "4CBBC669-70E3-474D-A0A3-0FC42A14A5A5")
+            ?: throw IllegalStateException("Missing task")
+        assertEquals(
+            listOf(Alarm(1, task.id, DateTime(2021, 2, 10, 9, 52, 35).millis, TYPE_SNOOZE)),
+            alarmDao.getAlarms(1)
+        )
+        alarmDao.deleteSnoozed(listOf(1))
+        taskDao.touch(task.task)
+
+        synchronizer.sync()
+
+        assertNull(
+                openTaskDao
+                        .getTask(listId, "4CBBC669-70E3-474D-A0A3-0FC42A14A5A5")
+                        ?.task
+                !!.snooze
+        )
+    }
+
+    private suspend fun insertTag(task: Task, name: String) =
+        TagData(name = name)
+            .apply { tagDataDao.insert(this) }
+            .let { tagDao.insert(Tag(task = task.id, taskUid = task.uuid, tagUid = it.remoteId)) }
+
+    companion object {
+        private val CHICAGO = TimeZone.getTimeZone("America/Chicago")
+
+        private val SUBTASK = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:-//Nextcloud Tasks v0.13.6
+            BEGIN:VTODO
+            UID:dfede1b0-435b-4bba-9708-2422e781747c
+            CREATED:20210128T150333
+            LAST-MODIFIED:20210128T150338
+            DTSTAMP:20210128T150338
+            SUMMARY:Child
+            RELATED-TO:7daa4a5c-cc76-4ddf-b4f8-b9d3a9cb00e7
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val ONE_TAG = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110304//EN
+            BEGIN:VTODO
+            DTSTAMP:20210201T204211Z
+            UID:3076145036806467726
+            CREATED:20210201T204143Z
+            LAST-MODIFIED:20210201T204209Z
+            SUMMARY:Tags
+            CATEGORIES:Tag1
+            X-APPLE-SORT-ORDER:633734058
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val TWO_TAGS = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:+//IDN tasks.org//android-110304//EN
+            BEGIN:VTODO
+            DTSTAMP:20210201T204211Z
+            UID:3076145036806467726
+            CREATED:20210201T204143Z
+            LAST-MODIFIED:20210201T204209Z
+            SUMMARY:Tags
+            CATEGORIES:Tag1,Tag2
+            X-APPLE-SORT-ORDER:633734058
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val HIDE_SUBTASKS = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:-//Nextcloud Tasks v0.13.6
+            BEGIN:VTODO
+            UID:2822976a-b71e-4962-92e4-db7297789c20
+            CREATED:20210209T104536
+            LAST-MODIFIED:20210209T104548
+            DTSTAMP:20210209T104548
+            SUMMARY:Parent
+            X-OC-HIDESUBTASKS:1
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+
+        private val SNOOZED = """
+            BEGIN:VCALENDAR
+            PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+            VERSION:2.0
+            BEGIN:VTODO
+            CREATED:20210210T151826Z
+            LAST-MODIFIED:20210210T152235Z
+            DTSTAMP:20210210T152235Z
+            UID:4CBBC669-70E3-474D-A0A3-0FC42A14A5A5
+            SUMMARY:Test snooze
+            STATUS:NEEDS-ACTION
+            X-MOZ-LASTACK:20210210T152235Z
+            DTSTART;TZID=America/Chicago:20210210T091900
+            DUE;TZID=America/Chicago:20210210T091900
+            X-MOZ-SNOOZE-TIME:20210210T155235Z
+            X-MOZ-GENERATION:1
+            END:VTODO
+            END:VCALENDAR
+        """.trimIndent()
+    }
+}

app/src/androidTest/java/org/tasks/opentasks/OpenTasksSynchronizerTest.kt

@@ -0,0 +1,109 @@
+package org.tasks.opentasks
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.entity.CaldavAccount
+import org.tasks.data.entity.CaldavAccount.Companion.TYPE_OPENTASKS
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.makers.CaldavTaskMaker.CALENDAR
+import org.tasks.makers.CaldavTaskMaker.REMOTE_ID
+import org.tasks.makers.CaldavTaskMaker.TASK
+import org.tasks.makers.CaldavTaskMaker.newCaldavTask
+import org.tasks.makers.TaskMaker.RECUR
+import org.tasks.makers.TaskMaker.newTask
+
+@HiltAndroidTest
+class OpenTasksSynchronizerTest : OpenTasksTest() {
+
+    @Test
+    fun createNewAccounts() = runBlocking {
+        openTaskDao.insertList()
+
+        synchronizer.sync()
+
+        val accounts = caldavDao.getAccounts()
+        assertEquals(1, accounts.size)
+        with(accounts[0]) {
+            assertEquals("bitfire.at.davdroid:test_account", uuid)
+            assertEquals("test_account", name)
+            assertEquals(TYPE_OPENTASKS, accountType)
+        }
+    }
+
+    @Test
+    fun deleteRemovedAccounts() = runBlocking {
+        caldavDao.insert(
+            CaldavAccount(
+                uuid = "bitfire.at.davdroid:test_account",
+                accountType = TYPE_OPENTASKS,
+            )
+        )
+
+        synchronizer.sync()
+
+        assertTrue(caldavDao.getAccounts().isEmpty())
+    }
+
+    @Test
+    fun createNewLists() = runBlocking {
+        openTaskDao.insertList()
+
+        synchronizer.sync()
+
+        val lists = caldavDao.getCalendarsByAccount("bitfire.at.davdroid:test_account")
+        assertEquals(1, lists.size)
+        with(lists[0]) {
+            assertEquals(name, "default_list")
+        }
+    }
+
+    @Test
+    fun removeMissingLists() = runBlocking {
+        val (_, list) = openTaskDao.insertList(url = "url1")
+        caldavDao.insert(
+            CaldavCalendar(
+                account = list.account,
+                url = "url2",
+            )
+        )
+
+        synchronizer.sync()
+
+        assertEquals(listOf(list), caldavDao.getCalendars())
+    }
+
+    @Test
+    fun simplePushNewTask() = runBlocking {
+        val (listId, list) = openTaskDao.insertList()
+        val taskId = taskDao.createNew(newTask())
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(REMOTE_ID, "1234"),
+                with(TASK, taskId)
+        ))
+
+        synchronizer.sync()
+
+        assertNotNull(openTaskDao.getTask(listId.toLong(), "1234"))
+    }
+
+    @Test
+    fun sanitizeRecurrenceRule() = runBlocking {
+        val (_, list) = openTaskDao.insertList()
+        val taskId = taskDao.insert(newTask(with(RECUR, "RRULE:FREQ=WEEKLY;COUNT=-1")))
+        caldavDao.insert(newCaldavTask(
+                with(CALENDAR, list.uuid),
+                with(TASK, taskId)
+        ))
+
+        synchronizer.sync()
+
+        val task = openTaskDao.getTasks().first()
+        assertEquals("FREQ=WEEKLY", task.rRule?.value)
+    }
+}

app/src/androidTest/java/org/tasks/opentasks/OpenTasksTest.kt

@@ -0,0 +1,34 @@
+package org.tasks.opentasks
+
+import com.todoroo.astrid.dao.TaskDao
+import org.junit.Before
+import org.tasks.R
+import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.dao.CaldavDao
+import org.tasks.injection.InjectingTestCase
+import org.tasks.preferences.Preferences
+import javax.inject.Inject
+
+abstract class OpenTasksTest : InjectingTestCase() {
+    @Inject lateinit var openTaskDao: TestOpenTaskDao
+    @Inject lateinit var preferences: Preferences
+    @Inject lateinit var caldavDao: CaldavDao
+    @Inject lateinit var synchronizer: OpenTasksSynchronizer
+    @Inject lateinit var taskDao: TaskDao
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+
+        openTaskDao.reset()
+        preferences.setBoolean(R.string.p_debug_pro, true)
+    }
+
+    protected suspend fun withVtodo(vtodo: String): Pair<Long, CaldavCalendar> =
+            openTaskDao
+                    .insertList()
+                    .let { (listId, list) ->
+                        openTaskDao.insertTask(listId, vtodo)
+                        Pair(listId, list)
+                    }
+}

app/src/androidTest/java/org/tasks/opentasks/TestOpenTaskDao.kt

@@ -0,0 +1,98 @@
+package org.tasks.opentasks
+
+import android.content.ContentProviderResult
+import android.content.Context
+import at.bitfire.ical4android.BatchOperation
+import at.bitfire.ical4android.Task
+import dagger.hilt.android.qualifiers.ApplicationContext
+import org.dmfs.tasks.contract.TaskContract
+import org.dmfs.tasks.contract.TaskContract.TaskListColumns.ACCESS_LEVEL_OWNER
+import org.tasks.caldav.iCalendar
+import org.tasks.data.MyAndroidTask
+import org.tasks.data.OpenTaskDao
+import org.tasks.data.UUIDHelper
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.entity.CaldavCalendar
+import javax.inject.Inject
+
+class TestOpenTaskDao @Inject constructor(
+        @ApplicationContext context: Context,
+        private val caldavDao: CaldavDao
+) : OpenTaskDao(context, caldavDao) {
+    suspend fun insertList(
+        name: String = DEFAULT_LIST,
+        type: String = DEFAULT_TYPE,
+        account: String = DEFAULT_ACCOUNT,
+        url: String = UUIDHelper.newUUID(),
+        accessLevel: Int = ACCESS_LEVEL_OWNER,
+    ): Pair<Long, CaldavCalendar> {
+        val uri = taskLists.buildUpon()
+                .appendQueryParameter(TaskContract.CALLER_IS_SYNCADAPTER, "true")
+                .appendQueryParameter(TaskContract.TaskLists.ACCOUNT_NAME, account)
+                .appendQueryParameter(TaskContract.TaskLists.ACCOUNT_TYPE, type)
+                .build()
+        val result = applyOperation(
+                BatchOperation.CpoBuilder.newInsert(uri)
+                        .withValue(TaskContract.CommonSyncColumns._SYNC_ID, url)
+                        .withValue(TaskContract.TaskListColumns.LIST_NAME, name)
+                        .withValue(TaskContract.TaskLists.SYNC_ENABLED, "1")
+                        .withValue(TaskContract.TaskLists.ACCESS_LEVEL, accessLevel)
+        )
+        val calendar = CaldavCalendar(
+            uuid = UUIDHelper.newUUID(),
+            name = name,
+            account = "$type:$account",
+            url = url,
+        )
+        caldavDao.insert(calendar)
+        return Pair(result.uri!!.lastPathSegment!!.toLong(), calendar)
+    }
+
+    fun insertTask(listId: Long, vtodo: String) {
+        val ops = ArrayList<BatchOperation.CpoBuilder>()
+        val task = MyAndroidTask(iCalendar.fromVtodo(vtodo)!!)
+        ops.add(task.toBuilder(tasks).withValue(TaskContract.TaskColumns.LIST_ID, listId))
+        task.enqueueProperties(properties, ops, 0)
+        applyOperation(*ops.toTypedArray())
+    }
+
+    fun getTasks(): List<Task> {
+        val result = ArrayList<Task>()
+        cr.query(
+                tasks.buildUpon().appendQueryParameter(TaskContract.LOAD_PROPERTIES, "1").build(),
+                null,
+                null,
+                null,
+                null)?.use {
+            while (it.moveToNext()) {
+                MyAndroidTask(it).task?.let { task -> result.add(task) }
+            }
+        }
+        return result
+    }
+
+    fun reset(
+            type: String = DEFAULT_TYPE,
+            account: String = DEFAULT_ACCOUNT
+    ) {
+        cr.delete(
+                taskLists.buildUpon()
+                        .appendQueryParameter(TaskContract.CALLER_IS_SYNCADAPTER, "true")
+                        .appendQueryParameter(TaskContract.TaskLists.ACCOUNT_NAME, account)
+                        .appendQueryParameter(TaskContract.TaskLists.ACCOUNT_TYPE, type)
+                        .build(),
+                null,
+                null
+        )
+        cr.delete(tasks, null, null)
+    }
+
+    private fun applyOperation(vararg builders: BatchOperation.CpoBuilder): ContentProviderResult =
+            cr.applyBatch(authority, ArrayList(builders.asList().map { it.build() }))[0]
+
+    companion object {
+        const val DEFAULT_ACCOUNT = "test_account"
+        const val DEFAULT_TYPE = ACCOUNT_TYPE_DAVX5
+        const val DEFAULT_LIST = "default_list"
+    }
+}

app/src/androidTest/java/org/tasks/preferences/PermissivePermissionChecker.kt

@@ -1,14 +1,12 @@
 package org.tasks.preferences
 
 import android.content.Context
-import org.tasks.injection.ForApplication
+import dagger.hilt.android.qualifiers.ApplicationContext
 
-class PermissivePermissionChecker(@ForApplication context: Context) : PermissionChecker(context) {
+class PermissivePermissionChecker(@ApplicationContext context: Context) : PermissionChecker(context) {
     override fun canAccessCalendars() = true
 
-    override fun canAccessAccounts() = true
+    override fun canAccessForegroundLocation() = true
 
-    override fun canAccessLocation() = true
-
-    override fun canAccessMic() = true
+    override fun canAccessBackgroundLocation() = true
 }

app/src/androidTest/java/org/tasks/preferences/PreferenceTests.kt

@@ -3,6 +3,9 @@ package org.tasks.preferences
 import android.annotation.SuppressLint
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.tasks.data.entity.Task.Companion.NOTIFY_AFTER_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AT_DEADLINE
+import org.tasks.data.entity.Task.Companion.NOTIFY_AT_START
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
@@ -116,6 +119,16 @@ class PreferenceTests {
         assertEquals(dueDate, preferences.adjustForQuietHours(dueDate))
     }
 
+    @Test
+    fun testDefaultReminders() {
+        assertEquals(0, defaultReminders())
+        assertEquals(2, defaultReminders(NOTIFY_AT_DEADLINE))
+        assertEquals(4, defaultReminders(NOTIFY_AFTER_DEADLINE))
+        assertEquals(6, defaultReminders(NOTIFY_AT_DEADLINE, NOTIFY_AFTER_DEADLINE))
+        assertEquals(32, defaultReminders(NOTIFY_AT_START))
+        assertEquals(38, defaultReminders(NOTIFY_AT_START, NOTIFY_AT_DEADLINE, NOTIFY_AFTER_DEADLINE))
+    }
+
     private fun setQuietHoursStart(hour: Int) {
         preferences.setInt(R.string.p_rmd_quietStart, hour * MILLIS_PER_HOUR)
     }
@@ -124,6 +137,14 @@ class PreferenceTests {
         preferences.setInt(R.string.p_rmd_quietEnd, hour * MILLIS_PER_HOUR)
     }
 
+    private fun defaultReminders(vararg values: Int): Int {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            values.map { it.toString() }.toSet()
+        )
+        return preferences.defaultReminders
+    }
+
     companion object {
         @SuppressLint("NewApi")
         private val MILLIS_PER_HOUR = TimeUnit.HOURS.toMillis(1).toInt()

app/src/androidTest/java/org/tasks/repeats/RepeatRuleToStringTest.kt

@@ -1,16 +1,27 @@
 package org.tasks.repeats
 
-import androidx.test.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.ical.values.RRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.tasks.locale.Locale
+import org.tasks.Freeze
+import org.tasks.TestUtilities.withTZ
+import org.tasks.analytics.Firebase
+import org.tasks.injection.InjectingTestCase
+import org.tasks.time.DateTime
 import java.text.ParseException
+import java.util.Locale
+import java.util.TimeZone
+import javax.inject.Inject
+
+@HiltAndroidTest
+class RepeatRuleToStringTest : InjectingTestCase() {
+    @Inject lateinit var firebase: Firebase
+
+    @Test
+    fun daily() {
+        assertEquals("Repeats daily", toString("RRULE:FREQ=DAILY"))
+    }
 
-@RunWith(AndroidJUnit4::class)
-class RepeatRuleToStringTest {
     @Test
     fun weekly() {
         assertEquals("Repeats weekly", toString("RRULE:FREQ=WEEKLY;INTERVAL=1"))
@@ -38,21 +49,90 @@ class RepeatRuleToStringTest {
     @Test
     fun useLocaleForDays() {
         assertEquals(
-                "Wiederholt sich wöchentlich am Sa., So.",
+                "Wiederholt sich wöchentlich Sa., So.",
                 toString("de", "RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SA,SU"))
     }
 
-    private fun toString(rrule: String): String {
+    @Test
+    fun everyFifthTuesday() {
+        assertEquals(
+                "Repeats monthly on every fifth Tuesday",
+                toString("RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=5TU")
+        )
+    }
+
+    @Test
+    fun everyLastWednesday() {
+        assertEquals(
+                "Repeats monthly on every last Wednesday",
+                toString("RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE")
+        )
+    }
+
+    @Test
+    fun everyFirstThursday() {
+        assertEquals(
+                "Repeats every 2 months on every first Thursday",
+                toString("RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=1TH")
+        )
+    }
+
+    @Test
+    fun repeatUntilPositiveOffset() {
+        Freeze.freezeAt(DateTime(2021, 1, 4)) {
+            withTZ(BERLIN) {
+                assertEquals(
+                    "Repeats daily, ends on February 23",
+                    toString("RRULE:FREQ=DAILY;UNTIL=20210223;INTERVAL=1")
+                )
+            }
+        }
+    }
+
+    @Test
+    fun repeatUntilNoOffset() {
+        Freeze.freezeAt(DateTime(2021, 1, 4)) {
+            withTZ(LONDON) {
+                assertEquals(
+                    "Repeats daily, ends on February 23",
+                    toString("RRULE:FREQ=DAILY;UNTIL=20210223;INTERVAL=1")
+                )
+            }
+        }
+    }
+
+    @Test
+    fun repeatUntilNegativeOffset() {
+        Freeze.freezeAt(DateTime(2021, 1, 4)) {
+            withTZ(NEW_YORK) {
+                assertEquals(
+                    "Repeats daily, ends on February 23",
+                    toString("RRULE:FREQ=DAILY;UNTIL=20210223;INTERVAL=1")
+                )
+            }
+        }
+    }
+
+    private fun toString(rrule: String): String? {
         return toString(null, rrule)
     }
 
-    private fun toString(language: String?, rrule: String): String {
+    private fun toString(language: String?, rrule: String): String? {
         return try {
-            val locale = Locale(java.util.Locale.getDefault(), language)
-            RepeatRuleToString(locale.createConfigurationContext(InstrumentationRegistry.getTargetContext()), locale)
-                    .toString(RRule(rrule))
+            val locale = language?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()
+            val configuration = context.resources.configuration.apply {
+                setLocale(locale)
+            }
+            RepeatRuleToString(context.createConfigurationContext(configuration), locale, firebase)
+                    .toString(rrule)
         } catch (e: ParseException) {
             throw RuntimeException(e)
         }
     }
+
+    companion object {
+        private val BERLIN = TimeZone.getTimeZone("Europe/Berlin")
+        private val LONDON = TimeZone.getTimeZone("Europe/London")
+        private val NEW_YORK = TimeZone.getTimeZone("America/New_York")
+    }
 }

app/src/androidTest/java/org/tasks/ui/DescriptionControlSetTest.kt

@@ -1,30 +0,0 @@
-package org.tasks.ui
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class DescriptionControlSetTest {
-    @Test
-    fun replaceCRLF() {
-        assertEquals("aaa\nbbb", DescriptionControlSet.stripCarriageReturns("aaa\r\nbbb"))
-    }
-
-    @Test
-    fun replaceCR() {
-        assertEquals("aaa\nbbb", DescriptionControlSet.stripCarriageReturns("aaa\rbbb"))
-    }
-
-    @Test
-    fun dontReplaceLF() {
-        assertEquals("aaa\nbbb", DescriptionControlSet.stripCarriageReturns("aaa\nbbb"))
-    }
-
-    @Test
-    fun checkIfNull() {
-        assertNull(DescriptionControlSet.stripCarriageReturns(null))
-    }
-}

app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt

@@ -0,0 +1,95 @@
+package org.tasks.ui.editviewmodel
+
+import androidx.lifecycle.SavedStateHandle
+import com.todoroo.astrid.activity.TaskEditFragment
+import com.todoroo.astrid.alarms.AlarmService
+import com.todoroo.astrid.dao.TaskDao
+import com.todoroo.astrid.gcal.GCalHelper
+import com.todoroo.astrid.service.TaskCompleter
+import com.todoroo.astrid.service.TaskDeleter
+import com.todoroo.astrid.service.TaskMover
+import com.todoroo.astrid.timers.TimerPlugin
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.tasks.calendars.CalendarEventProvider
+import org.tasks.data.dao.AlarmDao
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.LocationDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.data.dao.UserActivityDao
+import org.tasks.data.db.Database
+import org.tasks.data.entity.Task
+import org.tasks.data.newLocalAccount
+import org.tasks.injection.InjectingTestCase
+import org.tasks.location.GeofenceApi
+import org.tasks.preferences.DefaultFilterProvider
+import org.tasks.preferences.PermissivePermissionChecker
+import org.tasks.preferences.Preferences
+import org.tasks.ui.TaskEditViewModel
+import javax.inject.Inject
+
+open class BaseTaskEditViewModelTest : InjectingTestCase() {
+    @Inject lateinit var db: Database
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var taskDeleter: TaskDeleter
+    @Inject lateinit var timerPlugin: TimerPlugin
+    @Inject lateinit var calendarEventProvider: CalendarEventProvider
+    @Inject lateinit var gCalHelper: GCalHelper
+    @Inject lateinit var taskMover: TaskMover
+    @Inject lateinit var geofenceApi: GeofenceApi
+    @Inject lateinit var preferences: Preferences
+    @Inject lateinit var taskCompleter: TaskCompleter
+    @Inject lateinit var alarmService: AlarmService
+    @Inject lateinit var defaultFilterProvider: DefaultFilterProvider
+    @Inject lateinit var locationDao: LocationDao
+    @Inject lateinit var tagDataDao: TagDataDao
+    @Inject lateinit var alarmDao: AlarmDao
+    @Inject lateinit var userActivityDao: UserActivityDao
+    @Inject lateinit var caldavDao: CaldavDao
+
+    protected lateinit var viewModel: TaskEditViewModel
+
+    @Before
+    override fun setUp() {
+        runBlocking {
+            super.setUp()
+            caldavDao.newLocalAccount()
+        }
+    }
+
+    protected fun setup(task: Task) = runBlocking {
+        viewModel = TaskEditViewModel(
+            context,
+            SavedStateHandle().apply {
+                set(TaskEditFragment.EXTRA_TASK, task)
+            },
+            taskDao,
+            taskDeleter,
+            timerPlugin,
+            PermissivePermissionChecker(context),
+            calendarEventProvider,
+            gCalHelper,
+            taskMover,
+            db.locationDao(),
+            geofenceApi,
+            db.tagDao(),
+            db.tagDataDao(),
+            preferences,
+            db.googleTaskDao(),
+            db.caldavDao(),
+            taskCompleter,
+            alarmService,
+            MutableSharedFlow(),
+            userActivityDao = userActivityDao,
+            taskAttachmentDao = db.taskAttachmentDao(),
+            alarmDao = db.alarmDao(),
+            defaultFilterProvider = defaultFilterProvider,
+        )
+    }
+
+    protected fun save(): Boolean = runBlocking(Dispatchers.Main) {
+        viewModel.save()
+    }
+}

app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt

@@ -0,0 +1,41 @@
+package org.tasks.ui.editviewmodel
+
+import com.natpryce.makeiteasy.MakeItEasy
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Assert
+import org.junit.Test
+import org.tasks.data.entity.Task
+import org.tasks.makers.TaskMaker
+
+@HiltAndroidTest
+class PriorityTests : BaseTaskEditViewModelTest() {
+    @Test
+    fun changePriorityCausesChange() {
+        setup(TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH)))
+
+        viewModel.setPriority(Task.Priority.MEDIUM)
+
+        Assert.assertTrue(viewModel.hasChanges())
+    }
+
+    @Test
+    fun applyPriorityChange() {
+        val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH))
+        setup(task)
+        viewModel.setPriority(Task.Priority.MEDIUM)
+
+        save()
+
+        Assert.assertEquals(Task.Priority.MEDIUM, task.priority)
+    }
+
+    @Test
+    fun noChangeWhenRevertingPriority() {
+        setup(TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH)))
+
+        viewModel.setPriority(Task.Priority.MEDIUM)
+        viewModel.setPriority(Task.Priority.HIGH)
+
+        Assert.assertFalse(viewModel.hasChanges())
+    }
+}

app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt

@@ -0,0 +1,192 @@
+package org.tasks.ui.editviewmodel
+
+import com.natpryce.makeiteasy.MakeItEasy.with
+import com.todoroo.astrid.service.TaskCreator.Companion.setDefaultReminders
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.R
+import org.tasks.data.createDueDate
+import org.tasks.data.entity.Alarm
+import org.tasks.data.entity.Alarm.Companion.whenDue
+import org.tasks.data.entity.Alarm.Companion.whenOverdue
+import org.tasks.data.entity.Alarm.Companion.whenStarted
+import org.tasks.data.entity.Task
+import org.tasks.makers.TaskMaker.DUE_TIME
+import org.tasks.makers.TaskMaker.START_DATE
+import org.tasks.makers.TaskMaker.newTask
+import org.tasks.time.DateTime
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
+
+@HiltAndroidTest
+class ReminderTests : BaseTaskEditViewModelTest() {
+    @Test
+    fun whenStartReminder() = runBlocking {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            hashSetOf(Task.NOTIFY_AT_START.toString())
+        )
+        val task = newTask(with(START_DATE, DateTime()))
+        task.setDefaultReminders(preferences)
+
+        setup(task)
+
+        assertEquals(
+            persistentSetOf(Alarm(type = Alarm.TYPE_REL_START)),
+            viewModel.viewState.value.alarms
+        )
+    }
+
+    @Test
+    fun whenDueReminder() = runBlocking {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            hashSetOf(Task.NOTIFY_AT_DEADLINE.toString())
+        )
+        val task = newTask(with(DUE_TIME, DateTime()))
+        task.setDefaultReminders(preferences)
+
+        setup(task)
+
+        assertEquals(
+            persistentSetOf(Alarm(type = Alarm.TYPE_REL_END)),
+            viewModel.viewState.value.alarms
+        )
+    }
+
+    @Test
+    fun whenOverDueReminder() = runBlocking {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            hashSetOf(Task.NOTIFY_AFTER_DEADLINE.toString())
+        )
+        val task = newTask(with(DUE_TIME, DateTime()))
+        task.setDefaultReminders(preferences)
+
+        setup(task)
+
+        assertEquals(
+            persistentSetOf(whenOverdue(0)),
+            viewModel.viewState.value.alarms
+        )
+    }
+
+    @Test
+    fun ringFiveTimes() = runBlocking {
+        val task = newTask()
+        setup(task)
+
+        viewModel.ringFiveTimes = true
+
+        save()
+
+        assertTrue(taskDao.fetch(task.id)!!.isNotifyModeFive)
+    }
+
+    @Test
+    fun ringNonstop() = runBlocking {
+        val task = newTask()
+        setup(task)
+
+        viewModel.ringNonstop = true
+
+        save()
+
+        assertTrue(taskDao.fetch(task.id)!!.isNotifyModeNonstop)
+    }
+
+    @Test
+    fun ringFiveTimesCantRingNonstop() = runBlocking {
+        val task = newTask()
+        setup(task)
+
+        viewModel.ringNonstop = true
+        viewModel.ringFiveTimes = true
+
+        save()
+
+        assertFalse(taskDao.fetch(task.id)!!.isNotifyModeNonstop)
+        assertTrue(taskDao.fetch(task.id)!!.isNotifyModeFive)
+    }
+
+    @Test
+    fun ringNonStopCantRingFiveTimes() = runBlocking {
+        val task = newTask()
+        setup(task)
+
+        viewModel.ringFiveTimes = true
+        viewModel.ringNonstop = true
+
+        save()
+
+        assertFalse(taskDao.fetch(task.id)!!.isNotifyModeFive)
+        assertTrue(taskDao.fetch(task.id)!!.isNotifyModeNonstop)
+    }
+
+    @Test
+    fun noDefaultRemindersWithNoDates() = runBlocking {
+        val task = newTask()
+        task.setDefaultReminders(preferences)
+
+        setup(task)
+
+        save()
+
+        assertTrue(alarmDao.getAlarms(task.id).isEmpty())
+    }
+
+    @Test
+    fun addDefaultRemindersWhenAddingDueDate() = runBlocking {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            hashSetOf(
+                Task.NOTIFY_AT_DEADLINE.toString(),
+                Task.NOTIFY_AFTER_DEADLINE.toString(),
+            )
+        )
+        val task = newTask()
+        setup(task)
+
+        viewModel.setDueDate(
+            createDueDate(
+                Task.URGENCY_SPECIFIC_DAY_TIME,
+                currentTimeMillis()
+            )
+        )
+
+        save()
+
+        assertEquals(
+            listOf(whenDue(1).copy(id = 1), whenOverdue(1).copy(id = 2)),
+            alarmDao.getAlarms(task.id)
+        )
+    }
+
+    @Test
+    fun addDefaultRemindersWhenAddingStartDate() = runBlocking {
+        preferences.setStringSet(
+            R.string.p_default_reminders_key,
+            hashSetOf(Task.NOTIFY_AT_START.toString())
+        )
+        val task = newTask()
+        setup(task)
+
+        viewModel.setStartDate(
+            createDueDate(
+                Task.URGENCY_SPECIFIC_DAY_TIME,
+                currentTimeMillis()
+            )
+        )
+
+        save()
+
+        assertEquals(
+            listOf(whenStarted(1).copy(id = 1)),
+            alarmDao.getAlarms(task.id)
+        )
+    }
+}

app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt

@@ -0,0 +1,39 @@
+package org.tasks.ui.editviewmodel
+
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.tasks.data.entity.Task
+import org.tasks.makers.TaskMaker.newTask
+
+@HiltAndroidTest
+class TaskEditViewModelTest : BaseTaskEditViewModelTest() {
+    @Test
+    fun noChangesForNewTask() {
+        setup(newTask())
+
+        assertFalse(viewModel.hasChanges())
+    }
+
+    @Test
+    fun dontSaveTaskWithoutChanges() = runBlocking {
+        setup(newTask())
+
+        assertFalse(save())
+
+        assertTrue(taskDao.getAll().isEmpty())
+    }
+
+    @Test
+    fun dontSaveTaskTwice() = runBlocking {
+        setup(newTask())
+
+        viewModel.setPriority(Task.Priority.HIGH)
+
+        assertTrue(save())
+
+        assertFalse(viewModel.save())
+    }
+}

app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskListViewModelTest.kt

@@ -0,0 +1,163 @@
+package org.tasks.ui.editviewmodel
+
+import com.todoroo.astrid.service.TaskDeleter
+import dagger.hilt.android.testing.HiltAndroidTest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.tasks.LocalBroadcastManager
+import org.tasks.analytics.Firebase
+import org.tasks.billing.Inventory
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.DeletionDao
+import org.tasks.data.dao.TaskDao
+import org.tasks.data.entity.Task
+import org.tasks.filters.MyTasksFilter
+import org.tasks.injection.InjectingTestCase
+import org.tasks.preferences.PermissivePermissionChecker
+import org.tasks.preferences.Preferences
+import org.tasks.time.DateTimeUtils2.currentTimeMillis
+import org.tasks.ui.TaskListViewModel
+import javax.inject.Inject
+
+@HiltAndroidTest
+class TaskListViewModelTest : InjectingTestCase() {
+    private lateinit var viewModel: TaskListViewModel
+    @Inject lateinit var preferences: Preferences
+    @Inject lateinit var taskDao: TaskDao
+    @Inject lateinit var taskDeleter: TaskDeleter
+    @Inject lateinit var deletionDao: DeletionDao
+    @Inject lateinit var localBroadcastManager: LocalBroadcastManager
+    @Inject lateinit var inventory: Inventory
+    @Inject lateinit var firebase: Firebase
+    @Inject lateinit var caldavDao: CaldavDao
+
+    @Before
+    override fun setUp() {
+        super.setUp()
+        viewModel = TaskListViewModel(
+            applicationContext = context,
+            preferences = preferences,
+            taskDao = taskDao,
+            deletionDao = deletionDao,
+            taskDeleter = taskDeleter,
+            localBroadcastManager = localBroadcastManager,
+            inventory = inventory,
+            firebase = firebase,
+            permissionChecker = PermissivePermissionChecker(context),
+            caldavDao = caldavDao,
+        )
+        viewModel.setFilter(runBlocking { MyTasksFilter.create() })
+    }
+
+    @Test
+    fun clearCompletedTask() = runBlocking {
+        val task = taskDao.createNew(
+            Task(completionDate = currentTimeMillis())
+        )
+
+        clearCompleted()
+
+        assertTrue(taskDao.fetch(task)!!.isDeleted)
+    }
+
+    @Test
+    fun dontDeleteTaskWithRecurringParent() = runBlocking {
+        val parent = taskDao.createNew(
+            Task(
+                recurrence = "RRULE:FREQ=DAILY;INTERVAL=1"
+            )
+        )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        clearCompleted()
+
+        assertFalse(taskDao.fetch(child)!!.isDeleted)
+    }
+
+    @Test
+    fun dontDeleteTaskWithRecurringGrandparent() = runBlocking {
+        val grandparent = taskDao.createNew(
+            Task(recurrence = "RRULE:FREQ=DAILY;INTERVAL=1")
+        )
+        val parent = taskDao.createNew(
+            Task(parent = grandparent)
+        )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        clearCompleted()
+
+        assertFalse(taskDao.fetch(child)!!.isDeleted)
+    }
+
+    @Test
+    fun clearGrandchildWithNoRecurringAncestors() = runBlocking {
+        val grandparent = taskDao.createNew(Task())
+        val parent = taskDao.createNew(
+            Task(parent = grandparent)
+        )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        clearCompleted()
+
+        assertTrue(taskDao.fetch(child)!!.isDeleted)
+    }
+
+    @Test
+    fun clearGrandchildWithCompletedRecurringAncestor() = runBlocking {
+        val grandparent = taskDao.createNew(
+            Task(
+                recurrence = "RRULE:FREQ=DAILY;INTERVAL=1",
+                completionDate = currentTimeMillis(),
+            )
+        )
+        val parent = taskDao.createNew(
+            Task(parent = grandparent)
+        )
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        clearCompleted()
+
+        assertTrue(taskDao.fetch(child)!!.isDeleted)
+    }
+
+    @Test
+    fun clearHiddenSubtask() = runBlocking {
+        preferences.showCompleted = false
+        val parent = taskDao.createNew(Task())
+        val child = taskDao.createNew(
+            Task(
+                parent = parent,
+                completionDate = currentTimeMillis(),
+            )
+        )
+
+        clearCompleted()
+
+        assertTrue(taskDao.fetch(child)!!.isDeleted)
+    }
+
+    private suspend fun clearCompleted() = viewModel.markDeleted(viewModel.getTasksToClear())
+}