Skip to content

Commit 30c51f1

Browse files
- Handled photo picker dialog closing behaviour
- Handled audio and doc media type related issue occrring post selecting camera-type option
1 parent 27ba25f commit 30c51f1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/src/main/java/com/lassi/app/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
121121
}
122122

123123
R.id.btnAudioPicker -> {
124-
val intent = lassi.setMediaType(MediaType.AUDIO).setMaxCount(4).setGridSize(2)
124+
val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMediaType(MediaType.AUDIO).setMaxCount(4).setGridSize(2)
125125
.setPlaceHolder(R.drawable.ic_audio_placeholder)
126126
.setErrorDrawable(R.drawable.ic_audio_placeholder)
127127
.setSelectionDrawable(R.drawable.ic_checked_media)
@@ -252,7 +252,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
252252
}
253253

254254
private fun launchDocPicker() {
255-
val intent = lassi.setMediaType(MediaType.DOC).setMaxCount(4).setGridSize(2)
255+
val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMediaType(MediaType.DOC).setMaxCount(4).setGridSize(2)
256256
.setPlaceHolder(R.drawable.ic_document_placeholder)
257257
.setErrorDrawable(R.drawable.ic_document_placeholder)
258258
.setSelectionDrawable(R.drawable.ic_checked_media)

lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
118118
ToastUtils.showToast(
119119
requireContext(), LassiConfig.getConfig().customLimitExceedingErrorMessage
120120
)
121-
activity?.finish()
122121
} else {
123122
if (uris.isNotEmpty()) {
124123
val mediaPaths = ArrayList(uris.mapNotNull { uri ->
@@ -130,6 +129,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
130129
Log.d("PhotoPicker", "!@# PHOTO-PICKER:: No media selected")
131130
}
132131
}
132+
activity?.finish() // To finish host activity when user closes photo picker dialog
133133
}
134134

135135
private fun setResultOk(selectedMedia: ArrayList<MiMedia>?) {

0 commit comments

Comments
 (0)