mirror of
https://github.com/immich-app/immich.git
synced 2025-07-09 03:04:16 -04:00
fix: handle null bucket name during android sync (#19685)
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
parent
a644cabab6
commit
14276f41d8
@ -5,6 +5,7 @@ import android.content.Context
|
|||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
import android.provider.MediaStore
|
import android.provider.MediaStore
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
|
import androidx.core.database.getStringOrNull
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.FileInputStream
|
import java.io.FileInputStream
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
@ -152,7 +153,8 @@ open class NativeSyncApiImplBase(context: Context) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
val name = cursor.getString(bucketNameColumn)
|
// MediaStore might return null for bucket name (commonly for the Root Directory), so default to "Internal Storage"
|
||||||
|
val name = cursor.getStringOrNull(bucketNameColumn) ?: "Internal Storage"
|
||||||
val updatedAt = cursor.getLong(dateModified)
|
val updatedAt = cursor.getLong(dateModified)
|
||||||
albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
|
albums.add(PlatformAlbum(id, name, updatedAt, false, 0))
|
||||||
albumsCount[id] = 1
|
albumsCount[id] = 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user