mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-30 14:23:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle the case where selectedImages is null

Browse source
This commit is contained in:
sonalyadav 2024-12-19 19:20:41 +05:30 • committed by Sonal Yadav
parent ad34160105
commit 6b7d484768
1 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
View file

@ -1,5 +1,7 @@
package fr.free.nrw.commons.customselector.ui.selector package fr.free.nrw.commons.customselector.ui.selector
import timber.log.Timber
import android.Manifest import android.Manifest
import android.app.Activity import android.app.Activity
import android.app.Dialog import android.app.Dialog
@ -158,9 +160,7 @@ class CustomSelectorActivity :
/** /**
* Waits for confirmation of delete folder * Waits for confirmation of delete folder
*/ */
private val startForFolderDeletionResult = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()){ private val startForFolderDeletionResult = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result -> onDeleteFolderResultReceived(result) }
result -> onDeleteFolderResultReceived(result)
}
private val startForResult = registerForActivityResult(StartActivityForResult()) { result -> private val startForResult = registerForActivityResult(StartActivityForResult()) { result ->
onFullScreenDataReceived(result) onFullScreenDataReceived(result)
@ -247,10 +247,14 @@ class CustomSelectorActivity :
*/ */
private fun onFullScreenDataReceived(result: ActivityResult) { private fun onFullScreenDataReceived(result: ActivityResult) {
if (result.resultCode == Activity.RESULT_OK) { if (result.resultCode == Activity.RESULT_OK) {
val selectedImages: ArrayList<Image> = result.data?.getParcelableArrayListExtra<Image>(CustomSelectorConstants.NEW_SELECTED_IMAGES)
result.data!! ?.let { selectedImages ->
.getParcelableArrayListExtra(CustomSelectorConstants.NEW_SELECTED_IMAGES)!! // Check if viewModel is not null before updating selectedImages
viewModel?.selectedImages?.value = selectedImages viewModel?.selectedImages?.value = selectedImages
} ?: run {
// Handle the case where selectedImages is null
Timber.e("No images selected or data is null")
}
} }
} }
@ -262,7 +266,6 @@ class CustomSelectorActivity :
} }
/** /**
* Show Custom Selector Welcome Dialog. * Show Custom Selector Welcome Dialog.
*/ */
@ -426,7 +429,8 @@ class CustomSelectorActivity :
R.plurals.custom_picker_images_selected_title_appendix, R.plurals.custom_picker_images_selected_title_appendix,
selectedImageCount, selectedImageCount,
selectedImageCount, selectedImageCount,
)})" )
})"
} }
if (titleText != null) { if (titleText != null) {
titleText.text = titleWithAppendedImageCount titleText.text = titleWithAppendedImageCount
@ -500,7 +504,6 @@ class CustomSelectorActivity :
} }
/** /**
* Navigates back to the main `FolderFragment`, refreshes the MediaStore, resets UI states, * Navigates back to the main `FolderFragment`, refreshes the MediaStore, resets UI states,
* and reloads folder data. * and reloads folder data.