ChangeLog.md

@@ -1,16 +1,6 @@
 # Changelog
 *NOTE:* may be removed in the future in favor of the fastlane changelog.
 
-## Version 2.4.4
-* Fix error when importing from file in Android 13+
-
-## Version 2.4.3
-* Fix task sync adapter issues when no tasks are found
-* Add required notifications permissions to app manifest
-
-## Version 2.4.2
-* Fix sync adapter crashes with Android 12 and 13
-
 ## Version 2.4.1
 * Fix sync with Tasks.org and OpenTasks - many thanks to @Sch1nken!
 

app/build.gradle

@@ -19,8 +19,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
 
-        versionCode 20404
-        versionName "2.4.4"
+        versionCode 20401
+        versionName "2.4.1"
 
         buildConfigField "boolean", "customCerts", "true"
     }

app/proguard-rules.txt

@@ -48,25 +48,3 @@
 # Spongcastle
 -dontwarn org.spongycastle.jce.provider.X509LDAPCertStoreSpi
 -dontwarn org.spongycastle.x509.util.LDAPStoreHelper
-
-# Android stuff automatically generated by the Android Gradle plugin.
--dontwarn com.android.org.conscrypt.SSLParametersImpl
--dontwarn groovy.lang.GroovyObject
--dontwarn groovy.lang.MetaClass
--dontwarn groovy.transform.Generated
--dontwarn groovy.transform.Internal
--dontwarn groovy.util.AbstractFactory
--dontwarn groovy.util.FactoryBuilderSupport
--dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.codehaus.groovy.reflection.ClassInfo
--dontwarn org.codehaus.groovy.runtime.ScriptBytecodeAdapter
--dontwarn org.codehaus.groovy.runtime.callsite.CallSite
--dontwarn org.codehaus.groovy.runtime.callsite.CallSiteArray
--dontwarn org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation
--dontwarn org.codehaus.groovy.runtime.typehandling.ShortTypeHandling
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE

app/src/main/AndroidManifest.xml

@@ -23,7 +23,6 @@
     <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <!-- account management permissions not required for own accounts since API level 22 -->
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:maxSdkVersion="22"/>
@@ -36,9 +35,8 @@
     -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18"/>
 
-	<!-- Used for external log and vcf import. Permissions changed for SDK >= 33. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <!-- Used for external log and vcf import. -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <!-- other permissions -->
     <!-- android.permission-group.CONTACTS -->

app/src/main/java/com/etesync/syncadapter/log/Logger.kt

@@ -95,7 +95,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener {
                         .setCategory(NotificationCompat.CATEGORY_STATUS)
                         .setPriority(NotificationCompat.PRIORITY_HIGH)
                         .setSubText(context.getString(R.string.logging_to_external_storage_warning))
-                        .setContentIntent(PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
+                        .setContentIntent(PendingIntent.getActivity(context, 0, prefIntent, PendingIntent.FLAG_UPDATE_CURRENT))
                         .setStyle(NotificationCompat.BigTextStyle()
                                 .bigText(context.getString(R.string.logging_to_external_storage, logDir.path)))
                         .setOngoing(true)

app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt

@@ -170,7 +170,7 @@ abstract class SyncAdapterService : Service() {
                     .setLargeIcon(App.getLauncherBitmap(context))
                     .setContentTitle(context.getString(R.string.sync_error_permissions))
                     .setContentText(context.getString(R.string.sync_error_permissions_text))
-                    .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
+                    .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))
                     .setCategory(NotificationCompat.CATEGORY_ERROR)
                     .build()
             val nm = NotificationManagerCompat.from(context)

app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt

@@ -105,7 +105,7 @@ class SyncNotification(internal val context: Context, internal val notificationT
                 .setAutoCancel(true)
                 .setCategory(category)
                 .setSmallIcon(icon)
-                .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE))
+                .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))
 
         if (bigText != null)
             builder.setStyle(NotificationCompat.BigTextStyle()

app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt

@@ -10,7 +10,6 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.provider.ContactsContract
@@ -64,11 +63,7 @@ class ImportFragment : DialogFragment() {
 
     @TargetApi(Build.VERSION_CODES.M)
     private fun requestPermissions() {
-        if (SDK_INT <= 32) {
-            requestPermissions(kotlin.arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE), 0)
-        } else {
-            requestPermissions(arrayOf(Manifest.permission.READ_MEDIA_IMAGES), 0)
-        }
+        requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 0)
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {

cert4android

@@ -1 +1 @@
-Subproject commit 94df228f8bb8f8f50e26b3f4a3a9a53f0b83a4d2
+Subproject commit d01a3455bdb7fb49362e3e7acef043d34b7124f6

ical4android

@@ -1 +1 @@
-Subproject commit ecd2ab875dc6807a051577670443defb83608904
+Subproject commit b62dfc46f61aa310a65383e7b99f66a99959da2b