High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): android detect supported version for special format column (#26633)
Luis Nachtigall6deb97d5bcdb
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.ktindex 173d81613a..0cc642c862 100644--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt@@ -7,6 +7,7 @@ import android.database.Cursorimport androidx.exifinterface.media.ExifInterfaceimport android.os.Buildimport android.os.Bundle+import android.os.ext.SdkExtensionsimport android.provider.MediaStoreimport android.util.Base64import android.util.Log@@ -78,15 +79,22 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {add(MediaStore.MediaColumns.IS_FAVORITE)}- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {+ if (hasSpecialFormatColumn()) {add(SPECIAL_FORMAT_COLUMN)} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {// Fallback: read XMP from MediaStore to detect Motion Photos+ // only needed if SPECIAL_FORMAT column isn't availableadd(MediaStore.MediaColumns.XMP)}}.toTypedArray()const val HASH_BUFFER_SIZE = 2 * 1024 * 1024++ // _special_format requires S Extensions 21++ // https://developer.android.com/reference/android/provider/MediaStore.Files.FileColumns#SPECIAL_FORMAT+ private fun hasSpecialFormatColumn(): Boolean =+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&+ SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 21}protected fun getCursor(