show file name in the file delete dialog
diff --git a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
index 59b3b3d..01ace4e 100644
--- a/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
+++ b/app/src/main/java/app/grapheneos/camera/CapturedItems.kt
@@ -36,6 +36,15 @@
}
}
+ fun uiName(): String {
+ val prefix = if (type == ITEM_TYPE_IMAGE) IMAGE_NAME_PREFIX else {
+ check(type == ITEM_TYPE_VIDEO)
+ VIDEO_NAME_PREFIX
+ }
+
+ return "$prefix$dateString"
+ }
+
override fun writeToParcel(dest: Parcel, flags: Int) {
dest.writeByte(type.toByte())
dest.writeString(dateString)
diff --git a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
index 4c549f6..ba69a6c 100644
--- a/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
+++ b/app/src/main/java/app/grapheneos/camera/ui/activities/InAppGallery.kt
@@ -214,20 +214,19 @@
AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert)
.setTitle(R.string.delete_title)
- .setMessage(R.string.delete_description)
+ .setMessage(getString(R.string.delete_description, curItem.uiName()))
.setPositiveButton(R.string.delete) { _, _ ->
var res = false
val uri = curItem.uri
- if (uri.authority == MediaStore.AUTHORITY) {
- try {
- res = contentResolver.delete(uri, null, null) == 1
- } catch (e: Exception) {
- e.printStackTrace()
+ try {
+ if (uri.authority == MediaStore.AUTHORITY) {
+ res = contentResolver.delete(uri, null, null) > 0
+ } else {
+ res = DocumentsContract.deleteDocument(contentResolver, uri)
}
- } else {
- val doc = DocumentFile.fromSingleUri(this, uri)!!
- res = doc.delete()
+ } catch (e: Exception) {
+ e.printStackTrace()
}
if (res) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c60f0fd..73ec090 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -117,7 +117,7 @@
<string name="delete_title">Are you sure?</string>
<string name="deleted_successfully">File deleted successfully</string>
<string name="deleting_unexpected_error">An unexpected error occurred while deleting this file</string>
- <string name="delete_description">"Do you really want to delete this file?"</string>
+ <string name="delete_description">"Do you really want to delete this file (%s)?"</string>
<string name="cancel">Cancel</string>
<string name="no_image">Please capture a photo/video before trying to view them.</string>