From 9d602efbb3bd0ef0a839132d33c84685251fcf55 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Sun, 21 Mar 2021 13:03:58 +0100 Subject: [PATCH] Fix upload of edited images, and replace deprecated onactivityresult with resultcontracts --- .../postCreation/PostCreationActivity.kt | 148 ++++++++++-------- .../h/pixeldroid/posts/StatusViewHolder.kt | 24 ++- .../search/SearchPagingSource.kt | 4 +- app/src/main/res/values/strings.xml | 6 +- 4 files changed, 102 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt index 26267464..a3c17fd0 100644 --- a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt +++ b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt @@ -15,6 +15,9 @@ import android.view.View import android.view.View.INVISIBLE import android.view.View.VISIBLE import android.widget.Toast +import androidx.activity.result.ActivityResult +import androidx.activity.result.contract.ActivityResultContract +import androidx.activity.result.contract.ActivityResultContracts import androidx.core.net.toFile import androidx.core.net.toUri import androidx.lifecycle.lifecycleScope @@ -46,7 +49,6 @@ import kotlin.math.ceil import kotlin.properties.Delegates private const val TAG = "Post Creation Activity" -private const val MORE_PICTURES_REQUEST_CODE = 0xffff data class PhotoData( var imageUri: Uri, @@ -61,7 +63,6 @@ class PostCreationActivity : BaseActivity() { private lateinit var accessToken: String private lateinit var pixelfedAPI: PixelfedAPI - private var positionResult = 0 private var user: UserDatabaseEntity? = null private lateinit var instance: InstanceDatabaseEntity @@ -103,7 +104,7 @@ class PostCreationActivity : BaseActivity() { } carousel.maxEntries = instance.albumLimit carousel.addPhotoButtonCallback = { - addPhoto(applicationContext) + addPhoto() } carousel.updateDescriptionCallback = { position: Int, description: String -> photoData[position].imageDescription = description @@ -131,7 +132,7 @@ class PostCreationActivity : BaseActivity() { } binding.addPhotoButton.setOnClickListener { - addPhoto(it.context) + addPhoto() } binding.savePhotoButton.setOnClickListener { @@ -170,45 +171,66 @@ class PostCreationActivity : BaseActivity() { } for (i in 0 until count) { clipData.getItemAt(i).uri.let { - val size: Long = - if (it.toString().startsWith("content")) { - contentResolver.query(it, null, null, null, null) - ?.use { cursor -> - /* Get the column indexes of the data in the Cursor, - * move to the first row in the Cursor, get the data, - * and display it. - */ - val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE) - cursor.moveToFirst() - cursor.getLong(sizeIndex) - } ?: 0 - } else { - it.toFile().length() - } - val sizeInkBytes = ceil(size.toDouble() / 1000).toLong() - if(sizeInkBytes > instance.maxPhotoSize || sizeInkBytes > instance.maxVideoSize){ - val maxSize = when { - instance.maxPhotoSize != instance.maxVideoSize -> { - val type = contentResolver.getType(it) - if(type?.startsWith("video/") == true){ - instance.maxVideoSize - } else instance.maxPhotoSize - } - else -> instance.maxPhotoSize - } - AlertDialog.Builder(this).apply { - setMessage(getString(R.string.size_exceeds_instance_limit).format(photoData.size + 1, sizeInkBytes, maxSize)) - setNegativeButton(android.R.string.ok) { _, _ -> } - }.show() - } + val size = it.getSize() photoData.add(PhotoData(imageUri = it, size = size)) } } } - private fun addPhoto(context: Context){ - val intent = Intent(context, CameraActivity::class.java) - this@PostCreationActivity.startActivityForResult(intent, MORE_PICTURES_REQUEST_CODE) + /** + * Returns the size of the file of the Uri, and opens a dialog in case it is too big. + */ + private fun Uri.getSize(): Long { + val size: Long = + if (toString().startsWith("content")) { + contentResolver.query(this, null, null, null, null) + ?.use { cursor -> + /* Get the column indexes of the data in the Cursor, + * move to the first row in the Cursor, get the data, + * and display it. + */ + val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE) + cursor.moveToFirst() + cursor.getLong(sizeIndex) + } ?: 0 + } else { + toFile().length() + } + + val sizeInkBytes = ceil(size.toDouble() / 1000).toLong() + if (sizeInkBytes > instance.maxPhotoSize || sizeInkBytes > instance.maxVideoSize) { + val maxSize = when { + instance.maxPhotoSize != instance.maxVideoSize -> { + val type = contentResolver.getType(this) + if (type?.startsWith("video/") == true) { + instance.maxVideoSize + } else instance.maxPhotoSize + } + else -> instance.maxPhotoSize + } + AlertDialog.Builder(this@PostCreationActivity).apply { + setMessage(getString(R.string.size_exceeds_instance_limit, photoData.size + 1, sizeInkBytes, maxSize)) + setNegativeButton(android.R.string.ok) { _, _ -> } + }.show() + } + return size + } + + private val addPhotoResultContract = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == Activity.RESULT_OK && result.data?.clipData != null) { + result.data?.clipData?.let { + addPossibleImages(it) + } + binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) + } else if (result.resultCode != Activity.RESULT_CANCELED) { + Toast.makeText(applicationContext, "Error while adding images", Toast.LENGTH_SHORT).show() + } + } + + private fun addPhoto(){ + addPhotoResultContract.launch( + Intent(this, CameraActivity::class.java) + ) } private fun savePicture(button: View, currentPosition: Int) { @@ -334,7 +356,7 @@ class PostCreationActivity : BaseActivity() { binding.uploadError.visibility = View.VISIBLE if(e is HttpException){ binding.uploadErrorTextExplanation.text = - getString(R.string.upload_error).format(e.code()) + getString(R.string.upload_error, e.code()) binding.uploadErrorTextExplanation.visibility= VISIBLE } else { binding.uploadErrorTextExplanation.visibility= View.GONE @@ -398,39 +420,27 @@ class PostCreationActivity : BaseActivity() { } - private fun edit(position: Int) { - positionResult = position + private fun editResultContract(position: Int) = registerForActivityResult(ActivityResultContracts.StartActivityForResult()){ + result: ActivityResult? -> + if (result?.resultCode == Activity.RESULT_OK && result.data != null) { + photoData[position].apply { + imageUri = result.data!!.getStringExtra("result")!!.toUri() + size = imageUri.getSize() + } + binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) + + photoData[position].progress = null + photoData[position].uploadId = null + } else if(result?.resultCode != Activity.RESULT_CANCELED){ + Toast.makeText(applicationContext, "Error while editing", Toast.LENGTH_SHORT).show() + } + } + + private fun edit(position: Int) { val intent = Intent(this, PhotoEditActivity::class.java) .putExtra("picture_uri", photoData[position].imageUri) .putExtra("no upload", false) - startActivityForResult(intent, positionResult) - } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - if (requestCode == positionResult) { - if (resultCode == Activity.RESULT_OK && data != null) { - photoData[positionResult].imageUri = data.getStringExtra("result")!!.toUri() - - binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) - - photoData[positionResult].progress = null - photoData[positionResult].uploadId = null - } else if(resultCode != Activity.RESULT_CANCELED){ - Toast.makeText(applicationContext, "Error while editing", Toast.LENGTH_SHORT).show() - } - } else if (requestCode == MORE_PICTURES_REQUEST_CODE) { - - if (resultCode == Activity.RESULT_OK && data?.clipData != null) { - data.clipData?.let { - addPossibleImages(it) - } - - binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) - } else if(resultCode != Activity.RESULT_CANCELED){ - Toast.makeText(applicationContext, "Error while adding images", Toast.LENGTH_SHORT).show() - } - } + editResultContract(position).launch(intent) } } \ No newline at end of file diff --git a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt index f25a8160..5d7efa3d 100644 --- a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt +++ b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt @@ -280,12 +280,12 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold //Update shown share count binding.nshares.text = resp.getNShares(binding.root.context) binding.reblogger.isChecked = resp.reblogged!! - } catch (exception: IOException) { - Log.e("REBLOG ERROR", exception.toString()) - binding.reblogger.isChecked = false } catch (exception: HttpException) { Log.e("RESPONSE_CODE", exception.code().toString()) binding.reblogger.isChecked = false + } catch (exception: IOException) { + Log.e("REBLOG ERROR", exception.toString()) + binding.reblogger.isChecked = false } } } @@ -302,12 +302,12 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold //Update shown share count binding.nshares.text = resp.getNShares(binding.root.context) binding.reblogger.isChecked = resp.reblogged!! - } catch (exception: IOException) { - Log.e("REBLOG ERROR", exception.toString()) - binding.reblogger.isChecked = true } catch (exception: HttpException) { Log.e("RESPONSE_CODE", exception.code().toString()) binding.reblogger.isChecked = true + } catch (exception: IOException) { + Log.e("REBLOG ERROR", exception.toString()) + binding.reblogger.isChecked = true } } } @@ -397,8 +397,18 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold try { api.deleteStatus("Bearer ${user.accessToken}", id) binding.root.visibility = View.GONE - } catch (exception: IOException) { } catch (exception: HttpException) { + Toast.makeText( + binding.root.context, + binding.root.context.getString(R.string.delete_post_failed_error, exception.code()), + Toast.LENGTH_SHORT + ).show() + } catch (exception: IOException) { + Toast.makeText( + binding.root.context, + binding.root.context.getString(R.string.delete_post_failed_io_except), + Toast.LENGTH_SHORT + ).show() } } } diff --git a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt b/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt index 63c4f87f..f007cf35 100644 --- a/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt +++ b/app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/search/SearchPagingSource.kt @@ -39,10 +39,10 @@ class SearchPagingSource( prevKey = null, nextKey = if (repos.isEmpty()) null else (position ?: 0) + repos.size ) - } catch (exception: IOException) { - LoadResult.Error(exception) } catch (exception: HttpException) { LoadResult.Error(exception) + } catch (exception: IOException) { + LoadResult.Error(exception) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a6c71c87..7e6a5116 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,8 +66,8 @@ For more info about Pixelfed, you can check here: https://pixelfed.org" Save image description Add a media description here… You chose more images than the maximum your server allows (%1$s). Images beyond the limit have been ignored. - Size of image number %1$s in the album exceeds the maximum size allowed by the instance (%2$s kB but the limit is %3$s kB). You might not be able to upload it. - Error code returned by server: %1$s + Size of image number %1$d in the album exceeds the maximum size allowed by the instance (%2$d kB but the limit is %3$d kB). You might not be able to upload it. + Error code returned by server: %1$d @@ -200,4 +200,6 @@ Following" Help translate PixelDroid to your language: Report issues or contribute to the application: Image showing a red panda, Pixelfed\'s mascot, using a phone + Could not delete the post, error %1$d + Could not delete the post, check your connection? \ No newline at end of file