Pixelfed/PixelDroid-App-Android
1
0
Fork 0
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid synced 2024-12-25 14:34:12 +01:00
Code Issues Releases Wiki Activity

Fix thumbnail on newer android versions

Browse Source
This commit is contained in:
Matthieu 2020-11-01 00:07:28 +01:00
parent afeae16c31
commit 5be0f1f773
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
View File

@ -3,6 +3,7 @@ package com.h.pixeldroid.fragments
import android.Manifest import android.Manifest
import android.app.Activity import android.app.Activity
import android.content.ClipData import android.content.ClipData
import android.content.ContentUris
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.content.res.Configuration import android.content.res.Configuration
@ -31,7 +32,6 @@ import androidx.lifecycle.lifecycleScope
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.RequestOptions
import com.h.pixeldroid.PostCreationActivity import com.h.pixeldroid.PostCreationActivity
import com.h.pixeldroid.CameraActivity
import com.h.pixeldroid.R import com.h.pixeldroid.R
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -121,7 +121,7 @@ class CameraFragment : Fragment() {
return inflater.inflate(R.layout.fragment_camera, container, false) return inflater.inflate(R.layout.fragment_camera, container, false)
} }
private fun setGalleryThumbnail(uri: String) { private fun setGalleryThumbnail(uri: Uri) {
// Reference of the view that holds the gallery thumbnail // Reference of the view that holds the gallery thumbnail
val thumbnail = container.findViewById<ImageButton>(R.id.photo_view_button) val thumbnail = container.findViewById<ImageButton>(R.id.photo_view_button)
@ -263,19 +263,22 @@ class CameraFragment : Fragment() {
// Find the last picture // Find the last picture
val projection = arrayOf( val projection = arrayOf(
MediaStore.Images.ImageColumns._ID, MediaStore.Images.ImageColumns._ID,
MediaStore.Images.ImageColumns.DATA, if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) MediaStore.Images.ImageColumns.DATE_TAKEN
MediaStore.Images.ImageColumns.BUCKET_DISPLAY_NAME, else MediaStore.Images.ImageColumns.DATE_MODIFIED,
MediaStore.Images.ImageColumns.DATE_TAKEN,
MediaStore.Images.ImageColumns.MIME_TYPE
) )
val cursor = requireContext().contentResolver val cursor = requireContext().contentResolver
.query( .query(
MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection, null, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection, null,
null, MediaStore.Images.ImageColumns.DATE_TAKEN + " DESC" null,
(if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) MediaStore.Images.ImageColumns.DATE_TAKEN
else MediaStore.Images.ImageColumns.DATE_MODIFIED) + " DESC"
) )
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
val uri = Uri.parse(cursor.getString(1)).path ?: "" val url = ContentUris.withAppendedId(
setGalleryThumbnail(uri) MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
cursor.getLong(0)
)
setGalleryThumbnail(url)
cursor.close() cursor.close()
} }
} }