Skip to content

fixed crash when process uri #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feature/v2.2
Choose a base branch
from
+40 −5
Open

fixed crash when process uri #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/ImagePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,9 @@ class ImagePickerActivity : AppCompatActivity() {
mCompressionProvider = CompressionProvider(this)

// Retrieve Image Provider
val provider: ImageProvider? =
intent?.getSerializableExtra(ImagePicker.EXTRA_IMAGE_PROVIDER) as ImageProvider?

// Create Gallery/Camera Provider
when (provider) {
when (intent?.getSerializableExtra(ImagePicker.EXTRA_IMAGE_PROVIDER)) {
ImageProvider.GALLERY -> {
mGalleryProvider = GalleryProvider(this)
// Pick Gallery Image
Expand Down Expand Up @@ -200,4 +198,16 @@ class ImagePickerActivity : AppCompatActivity() {
setResult(ImagePicker.RESULT_ERROR, intent)
finish()
}

/**
* @param data Intent that store data
* @param message Error message
*/
fun setErrorResult(data: Intent?, message: String) {
val intent = Intent()
intent.data = data?.data
intent.putExtra(ImagePicker.EXTRA_ERROR, message)
setResult(ImagePicker.RESULT_ERROR, intent)
finish()
}
}
9 changes: 7 additions & 2 deletions imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/provider/GalleryProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.provider.DocumentsContract
import com.github.dhaval2404.imagepicker.ImagePicker
import com.github.dhaval2404.imagepicker.ImagePickerActivity
import com.github.dhaval2404.imagepicker.R
Expand Down Expand Up @@ -71,8 +72,12 @@ class GalleryProvider(activity: ImagePickerActivity) :
private fun handleResult(data: Intent?) {
val uri = data?.data
if (uri != null) {
takePersistableUriPermission(uri)
activity.setImage(uri)
try {
takePersistableUriPermission(uri)
activity.setImage(uri)
} catch (e: Exception) {
activity.setErrorResult(data, e.message ?: "Unsupported file")
}
} else {
setError(R.string.error_failed_pick_gallery_image)
}
Expand Down