Merge remote-tracking branch 'etar/master'

mebitek · Apr 11, 2024 · 73dc2a5 · 73dc2a5
2 parents 137fc48 + d7f9615
commit 73dc2a5
Show file tree

Hide file tree

Showing 375 changed files with 3,260 additions and 1,259 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,45 +1,39 @@
 name: Android CI with Gradle
 
 on:
-  push:
-    branches:
-      - '*'
   pull_request:
-    branches: [ master ]
+  push:
+  workflow_dispatch:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: set up JDK 11
-        uses: actions/[email protected]
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: set up JDK 17
+        uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Restore Cache
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v4.0.2
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Checkout submodules # checkout rest
-        shell: bash
-        run: |
-          git submodule update --init
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
       - name: Build with Gradle
         run: |
           ./gradlew :app:assembleDebug
       - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Etar_apk
           path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/README.md b/README.md
@@ -37,8 +37,6 @@ Sync your calendar to a server:
   need yet another app, e. g. DAVx5. That’s necessary because a Caldav client
   isn't included in Etar.
 
-  The following [link](https://ownyourbits.com/2017/12/30/sync-nextcloud-tasks-calendars-and-contacts-on-your-android-device/) provides a tutorial how to use Nextcloud + DAVx5 + Etar.
-
 ### Technical explanation
 On Android there are "Calendar providers". These can be calendars that are
 synchronized with a cloud service or local calendars. Basically any app

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,13 +10,15 @@ editorconfig {
 }
 
 android {
-    compileSdk 33
+    namespace 'ws.xsoh.etar'
+    testNamespace 'com.android.calendar.tests'
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
-        versionCode 34
-        versionName "1.0.34"
+        targetSdk 34
+        versionCode 43
+        versionName "1.0.43"
         applicationId "ws.xsoh.etar"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
@@ -73,42 +75,52 @@ android {
     }
 
     lint {
-        checkReleaseBuilds false
-        // Or, if you prefer, you can continue to check for errors in release builds,
-        // but continue the build even when errors are found:
+        lintConfig = file("lint.xml")
+        // TODO: Resolve lint errors due to 363aa9c237a33e9e1a40bdfd9039dcaaa855a5a0
         abortOnError false
     }
 
     compileOptions {
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
+
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
+
+    androidResources {
+        generateLocaleConfig true
+    }
+
 }
 
 dependencies {
 
     // Core
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.11.0'
     testImplementation 'junit:junit:4.13.2'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     // Coroutines
-    def coroutines_version = "1.6.0"
+    def coroutines_version = "1.8.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
+    // https://mvnrepository.com/artifact/org.dmfs/lib-recur
+    implementation 'org.dmfs:lib-recur:0.16.0'
+
 }
 
 preBuild.dependsOn (":aarGen")
diff --git a/app/lint.xml b/app/lint.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="MissingTranslation" severity="ignore" />
+</lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,19 +30,18 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="org.dmfs.permission.READ_TASKS" />
     <uses-permission android:name="org.dmfs.permission.WRITE_TASKS" />
 
     <queries>
-        <package android:name="at.bitfire.davdroid" />
-        <package android:name="com.etesync.syncadapter" />
-        <package android:name="com.google.android.gm" />
-        <package android:name="org.birthdayadapter" />
-        <package android:name="org.decsync.cc" />
+        <intent>
+            <action android:name="android.content.SyncAdapter" />
+        </intent>
 
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -117,6 +116,7 @@
         </activity>
 
         <activity android:name="com.android.calendar.event.EditEventActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/Base.CalendarAppThemeWithActionBar">
         </activity>
 
@@ -272,7 +272,9 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="com.android.calendar.alerts.AlertService" />
+        <service android:name="com.android.calendar.alerts.AlertService"
+            android:exported="false"
+            android:foregroundServiceType="dataSync|systemExempted" />
 
         <service android:name="com.android.calendar.alerts.DismissAlarmsService" />