Feedback form temporary files

WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormAttachment.kt

@@ -1,11 +1,9 @@
 package org.wordpress.android.ui.main.feedbackform
 
 import android.net.Uri
-import java.io.File
 
 data class FeedbackFormAttachment(
     val uri: Uri,
-    val tempFile: File,
     val mimeType: String,
     val attachmentType: FeedbackFormAttachmentType,
     val size: Long,

WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormScreen.kt

@@ -44,11 +44,10 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.wordpress.android.R
+import org.wordpress.android.ui.compose.components.MediaUriPager
 import org.wordpress.android.ui.compose.components.ProgressDialog
 import org.wordpress.android.ui.compose.components.ProgressDialogState
-import org.wordpress.android.ui.compose.components.MediaUriPager
 import org.wordpress.android.ui.compose.theme.M3Theme
-import java.io.File
 
 @Composable
 fun FeedbackFormScreen(
@@ -243,14 +242,12 @@ private fun FeedbackFormScreenPreview() {
         attachmentType = FeedbackFormAttachmentType.IMAGE,
         size = 123456789,
         mimeType = "image/jpeg",
-        tempFile = File("/tmp/attachment.jpg")
     )
     val attachment2 = FeedbackFormAttachment(
         uri = Uri.parse("https://via.placeholder.com/150"),
         attachmentType = FeedbackFormAttachmentType.VIDEO,
         size = 123456789,
         mimeType = "video/mp4",
-        tempFile = File("/tmp/attachment.mp4")
     )
     val attachments = MutableStateFlow(listOf(attachment1, attachment2))
     val messageText = MutableStateFlow("I love this app!")

WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormViewModel.kt

@@ -32,6 +32,7 @@ import org.wordpress.android.util.extensions.copyToTempFile
 import org.wordpress.android.util.extensions.fileSize
 import org.wordpress.android.util.extensions.mimeType
 import org.wordpress.android.viewmodel.ScopedViewModel
+import java.io.File
 import java.io.IOException
 import javax.inject.Inject
 import javax.inject.Named
@@ -76,26 +77,58 @@ class FeedbackFormViewModel @Inject constructor(
         if (_attachments.value.isNotEmpty()) {
             showProgressDialog(R.string.uploading)
             launch {
-                val files = _attachments.value.map { it.tempFile }
+                val tempFiles = createAttachmentTempFiles(context)
                 try {
-                    val tokens = zendeskUploadHelper.uploadFileAttachments(files)
-                    withContext(Dispatchers.Main) {
-                        createZendeskFeedbackRequest(
-                            context = context,
-                            attachmentTokens = tokens
-                        )
+                    try {
+                        val tokens = zendeskUploadHelper.uploadFileAttachments(tempFiles)
+                        withContext(Dispatchers.Main) {
+                            createZendeskFeedbackRequest(
+                                context = context,
+                                attachmentTokens = tokens
+                            )
+                        }
+                    } catch (e: IOException) {
+                        hideProgressDialog()
+                        onFailure(context, e.message)
+                        return@launch
                     }
-                } catch (e: IOException) {
-                    hideProgressDialog()
-                    onFailure(context, e.message)
-                    return@launch
+                } finally {
+                    deleteTempFiles(tempFiles)
                 }
             }
         } else {
             createZendeskFeedbackRequest(context)
         }
     }
 
+    /**
+     * Creates temporary files for each attachment and returns a list of their paths
+     */
+    private fun createAttachmentTempFiles(context: Context): List<File> {
+        val tempFiles = ArrayList<File>()
+        val uris = _attachments.value.map { it.uri }
+        for (uri in uris) {
+            uri.copyToTempFile(context)?.let {
+                tempFiles.add(it)
+            } ?: appLogWrapper.e(T.SUPPORT, "Failed to copy attachment to temp file: $uri")
+        }
+        return tempFiles
+    }
+
+    private fun deleteTempFiles(files: List<File>) {
+        for (file in files) {
+            try {
+                if (file.exists()) {
+                    file.delete()
+                }
+            } catch (e: SecurityException) {
+                appLogWrapper.e(T.SUPPORT, "Failed to delete temp file")
+            } catch (e: IOException) {
+                appLogWrapper.e(T.SUPPORT, "Failed to delete temp file")
+            }
+        }
+    }
+
     private fun createZendeskFeedbackRequest(
         context: Context,
         attachmentTokens: List<String> = emptyList()
@@ -226,12 +259,6 @@ class FeedbackFormViewModel @Inject constructor(
             return false
         }
 
-        val file = uri.copyToTempFile(context)
-        if (file == null) {
-            showToast(R.string.feedback_form_unable_to_create_tempfile)
-            return false
-        }
-
         val attachmentType = if (mimeType.startsWith("video")) {
             FeedbackFormAttachmentType.VIDEO
         } else {
@@ -240,7 +267,6 @@ class FeedbackFormViewModel @Inject constructor(
         list.add(
             FeedbackFormAttachment(
                 uri = uri,
-                tempFile = file,
                 size = fileSize,
                 mimeType = mimeType,
                 attachmentType = attachmentType