1
0
mirror of https://github.com/etesync/android synced 2025-04-24 11:09:17 +00:00

Compare commits

..

No commits in common. "master" and "v2.4.2" have entirely different histories.

6 changed files with 6 additions and 42 deletions

View File

@ -1,13 +1,6 @@
# Changelog # Changelog
*NOTE:* may be removed in the future in favor of the fastlane 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 ## Version 2.4.2
* Fix sync adapter crashes with Android 12 and 13 * Fix sync adapter crashes with Android 12 and 13

View File

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

View File

@ -48,25 +48,3 @@
# Spongcastle # Spongcastle
-dontwarn org.spongycastle.jce.provider.X509LDAPCertStoreSpi -dontwarn org.spongycastle.jce.provider.X509LDAPCertStoreSpi
-dontwarn org.spongycastle.x509.util.LDAPStoreHelper -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

View File

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

View File

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

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