High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: guard IS_FAVORITE column with SDK check (#20511)
shenlong8108f50c4e0e
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 d7073e7cfc..b2ceb8a9f2 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@@ -29,21 +29,24 @@ open class NativeSyncApiImplBase(context: Context) {MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO.toString())const val BUCKET_SELECTION = "(${MediaStore.Files.FileColumns.BUCKET_ID} = ?)"- val ASSET_PROJECTION = arrayOf(- MediaStore.MediaColumns._ID,- MediaStore.MediaColumns.DATA,- MediaStore.MediaColumns.DISPLAY_NAME,- MediaStore.MediaColumns.DATE_TAKEN,- MediaStore.MediaColumns.DATE_ADDED,- MediaStore.MediaColumns.DATE_MODIFIED,- MediaStore.Files.FileColumns.MEDIA_TYPE,- MediaStore.MediaColumns.BUCKET_ID,- MediaStore.MediaColumns.WIDTH,- MediaStore.MediaColumns.HEIGHT,- MediaStore.MediaColumns.DURATION,- MediaStore.MediaColumns.ORIENTATION,- MediaStore.MediaColumns.IS_FAVORITE,- )+ val ASSET_PROJECTION = buildList {+ add(MediaStore.MediaColumns._ID)+ add(MediaStore.MediaColumns.DATA)+ add(MediaStore.MediaColumns.DISPLAY_NAME)+ add(MediaStore.MediaColumns.DATE_TAKEN)+ add(MediaStore.MediaColumns.DATE_ADDED)+ add(MediaStore.MediaColumns.DATE_MODIFIED)+ add(MediaStore.Files.FileColumns.MEDIA_TYPE)+ add(MediaStore.MediaColumns.BUCKET_ID)+ add(MediaStore.MediaColumns.WIDTH)+ add(MediaStore.MediaColumns.HEIGHT)+ add(MediaStore.MediaColumns.DURATION)+ add(MediaStore.MediaColumns.ORIENTATION)+ // IS_FAVORITE is only available on Android 11 and above+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) {+ add(MediaStore.MediaColumns.IS_FAVORITE)+ }+ }.toTypedArray()const val HASH_BUFFER_SIZE = 2 * 1024 * 1024}@@ -78,7 +81,7 @@ open class NativeSyncApiImplBase(context: Context) {val durationColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.DURATION)val orientationColumn =c.getColumnIndexOrThrow(MediaStore.MediaColumns.ORIENTATION)- val favoriteColumn = c.getColumnIndexOrThrow(MediaStore.MediaColumns.IS_FAVORITE)+ val favoriteColumn = c.getColumnIndex(MediaStore.MediaColumns.IS_FAVORITE)while (c.moveToNext()) {val id = c.getLong(idColumn).toString()@@ -107,7 +110,7 @@ open class NativeSyncApiImplBase(context: Context) {else c.getLong(durationColumn) / 1000val bucketId = c.getString(bucketIdColumn)val orientation = c.getInt(orientationColumn)- val isFavorite = c.getInt(favoriteColumn) != 0;+ val isFavorite = if (favoriteColumn == -1) false else c.getInt(favoriteColumn) != 0val asset = PlatformAsset(id,