Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't display error message if user cancels picking an image (#3427) 

* Don't display error message if user cancels picking an image

* Update app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
This commit is contained in:
Nik Clayton 2023-03-13 10:17:41 +01:00 committed by GitHub
parent 9ec9d35100
commit 70dced795c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
View File

@ -34,6 +34,7 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.load.resource.bitmap.FitCenter import com.bumptech.glide.load.resource.bitmap.FitCenter
import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.canhub.cropper.CropImage
import com.canhub.cropper.CropImageContract import com.canhub.cropper.CropImageContract
import com.canhub.cropper.options import com.canhub.cropper.options
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
@ -80,14 +81,18 @@ class EditProfileActivity : BaseActivity(), Injectable {
} }
private val cropImage = registerForActivityResult(CropImageContract()) { result -> private val cropImage = registerForActivityResult(CropImageContract()) { result ->
if (result.isSuccessful) { if (result is CropImage.CancelledResult) {
if (result.uriContent == viewModel.getAvatarUri()) { return@registerForActivityResult
viewModel.newAvatarPicked() }
} else {
viewModel.newHeaderPicked() if (!result.isSuccessful) {
} return@registerForActivityResult onPickFailure(result.error)
}
if (result.uriContent == viewModel.getAvatarUri()) {
viewModel.newAvatarPicked()
} else { } else {
onPickFailure(result.error) viewModel.newHeaderPicked()
} }
} }