Skip to content

Commit b7c7ea1

Browse files
committed
Fix photo picker crashes starting from API 33
1 parent a54e994 commit b7c7ea1

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

core/cropbundle/src/main/kotlin/com/w2sv/cropbundle/CropBundle.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package com.w2sv.cropbundle
22

33
import android.content.ContentResolver
4-
import android.content.Context
54
import android.graphics.Bitmap
65
import android.net.Uri
76
import android.os.Parcelable
87
import android.provider.MediaStore
9-
import androidx.core.database.getLongOrNull
10-
import com.w2sv.cropbundle.cropping.model.CropEdges
118
import com.w2sv.cropbundle.cropping.CropSensitivity
129
import com.w2sv.cropbundle.cropping.crop
1310
import com.w2sv.cropbundle.cropping.cropped
11+
import com.w2sv.cropbundle.cropping.model.CropEdges
1412
import com.w2sv.cropbundle.io.ImageMimeType
1513
import com.w2sv.cropbundle.io.extensions.loadBitmap
1614
import com.w2sv.cropbundle.io.extensions.queryMediaStoreData
@@ -106,16 +104,14 @@ data class Screenshot(
106104
MediaStore.Images.Media.SIZE,
107105
MediaStore.Images.Media.DISPLAY_NAME,
108106
MediaStore.Images.Media.MIME_TYPE,
109-
MediaStore.Images.Media._ID
110107
),
111108
onCursor = {
112109
val fileName = it.getString(it.getColumnIndexOrThrow(MediaStore.Images.Media.DISPLAY_NAME))
113110
MediaStoreData(
114111
diskUsage = it.getLong(it.getColumnIndexOrThrow(MediaStore.Images.Media.SIZE)),
115112
fileName = fileName,
116113
mimeType = ImageMimeType.parse(it.getString(it.getColumnIndexOrThrow(MediaStore.Images.Media.MIME_TYPE))),
117-
id = it.getLongOrNull(it.getColumnIndexOrThrow(MediaStore.Images.Media._ID))
118-
?: fileName.substringBeforeLast(".").toLong() // TODO: probably still unreliable
114+
id = fileName.substringBeforeLast(".").toLong() // TODO: probably still unreliable
119115
)
120116
.also { i { it.toString() } }
121117
}

0 commit comments

Comments
 (0)