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:
parent
9ec9d35100
commit
70dced795c
1 changed files with 12 additions and 7 deletions
|
@ -34,6 +34,7 @@ import com.bumptech.glide.Glide
|
|||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||
import com.bumptech.glide.load.resource.bitmap.FitCenter
|
||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
|
||||
import com.canhub.cropper.CropImage
|
||||
import com.canhub.cropper.CropImageContract
|
||||
import com.canhub.cropper.options
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
|
@ -80,15 +81,19 @@ class EditProfileActivity : BaseActivity(), Injectable {
|
|||
}
|
||||
|
||||
private val cropImage = registerForActivityResult(CropImageContract()) { result ->
|
||||
if (result.isSuccessful) {
|
||||
if (result is CropImage.CancelledResult) {
|
||||
return@registerForActivityResult
|
||||
}
|
||||
|
||||
if (!result.isSuccessful) {
|
||||
return@registerForActivityResult onPickFailure(result.error)
|
||||
}
|
||||
|
||||
if (result.uriContent == viewModel.getAvatarUri()) {
|
||||
viewModel.newAvatarPicked()
|
||||
} else {
|
||||
viewModel.newHeaderPicked()
|
||||
}
|
||||
} else {
|
||||
onPickFailure(result.error)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
|
|
Loading…
Reference in a new issue