feat(doc-scan): Rename file from external scanner

Before, the filename from FairScan just was <unixTimestamp>.pdf. Now,
we are giving it our own timestamped name, just like we do for images and
videos captured via the camera intent.

This uses the same fileDisplayNameTransformer as PR #16298

Signed-off-by: Philipp Hasper <vcs@hasper.info>

Author: PhilLab

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -44,6 +44,7 @@ import android.view.inputmethod.InputMethodManager
 import androidx.activity.OnBackPressedCallback
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.widget.SearchView
+import androidx.core.content.FileProvider
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -155,10 +156,12 @@ import com.owncloud.android.utils.PermissionUtil.requestNotificationPermission
 import com.owncloud.android.utils.PermissionUtil.requestStoragePermissionIfNeeded
 import com.owncloud.android.utils.PushUtils
 import com.owncloud.android.utils.StringUtils
+import com.owncloud.android.utils.UriUtils
 import com.owncloud.android.utils.theme.CapabilityUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.apache.commons.io.FilenameUtils
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -970,10 +973,13 @@ class FileDisplayActivity :
      */
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (data != null &&
-            requestCode == REQUEST_CODE__SELECT_CONTENT_FROM_APPS &&
+            (
+                requestCode == REQUEST_CODE__SELECT_CONTENT_FROM_APPS ||
+                    requestCode == REQUEST_CODE__SELECT_CONTENT_FROM_APPS_AUTO_RENAME
+                ) &&
             (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)
         ) {
-            requestUploadOfContentFromApps(data, resultCode)
+            requestUploadOfContentFromApps(requestCode, resultCode, data)
         } else if (data != null &&
             requestCode == REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM &&
             (
@@ -1107,7 +1113,7 @@ class FileDisplayActivity :
         }
     }
 
-    private fun requestUploadOfContentFromApps(contentIntent: Intent, resultCode: Int) {
+    private fun requestUploadOfContentFromApps(requestCode: Int, resultCode: Int, contentIntent: Intent) {
         val streamsToUpload = ArrayList<Parcelable?>()
 
         if (contentIntent.clipData != null && (contentIntent.clipData?.itemCount ?: 0) > 0) {
@@ -1129,6 +1135,17 @@ class FileDisplayActivity :
 
         val currentDir = getCurrentDir()
         val remotePath = if (currentDir != null) currentDir.remotePath else OCFile.ROOT_PATH
+        var fileDisplayNameTransformer: androidx.core.util.Function<Uri, String?>? = null
+        if (requestCode == REQUEST_CODE__SELECT_CONTENT_FROM_APPS_AUTO_RENAME) {
+            fileDisplayNameTransformer = { uri: Uri ->
+                val displayName = UriUtils.getDisplayNameForUri(uri, applicationContext)
+                if (displayName != null && displayName.isNotEmpty()) {
+                    FileOperationsHelper.getTimestampedFileName("." + FilenameUtils.getExtension(displayName))
+                } else {
+                    null
+                }
+            }
+        }
 
         val uploader = UriUploader(
             this,
@@ -1139,7 +1156,8 @@ class FileDisplayActivity :
             ),
             behaviour,
             false, // Not show waiting dialog while file is being copied from private storage
-            null // Not needed copy temp task listener
+            null, // Not needed copy temp task listener
+            fileDisplayNameTransformer
         )
 
         uploader.uploadUris()
@@ -3139,6 +3157,9 @@ class FileDisplayActivity :
         @JvmField
         val REQUEST_CODE__UPLOAD_FROM_VIDEO_CAMERA: Int = REQUEST_CODE__LAST_SHARED + 6
 
+        @JvmField
+        val REQUEST_CODE__SELECT_CONTENT_FROM_APPS_AUTO_RENAME: Int = REQUEST_CODE__LAST_SHARED + 7
+
         protected val DELAY_TO_REQUEST_REFRESH_OPERATION_LATER: Long = DELAY_TO_REQUEST_OPERATIONS_LATER + 350
 
         private val TAG: String = FileDisplayActivity::class.java.getSimpleName()

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -584,7 +584,7 @@ public void scanDocUpload() {
     public void scanDocUploadFromApp() {
         requireActivity().startActivityForResult(
             mFairScanIntent,
-            FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS);
+            FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS_AUTO_RENAME);
     }
 
     @Override

app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt

@@ -13,6 +13,7 @@ package com.owncloud.android.ui.helpers
 import android.content.ContentResolver
 import android.net.Uri
 import android.os.Parcelable
+import androidx.core.util.Function
 import com.nextcloud.client.account.User
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.owncloud.android.R
@@ -42,14 +43,16 @@ import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
     "Detekt.SpreadOperator",
     "Detekt.TooGenericExceptionCaught"
 ) // legacy code
-class UriUploader(
+class UriUploader @JvmOverloads constructor(
     private val mActivity: FileActivity,
     private val mUrisToUpload: List<Parcelable?>,
     private val mUploadPath: String,
     private val user: User,
     private val mBehaviour: Int,
     private val mShowWaitingDialog: Boolean,
-    private val mCopyTmpTaskListener: OnCopyTmpFilesTaskListener?
+    private val mCopyTmpTaskListener: OnCopyTmpFilesTaskListener?,
+    /** If non-null, this function is called to determine the desired display name (i.e. filename) after upload**/
+    private val mFileDisplayNameTransformer: Function<Uri, String?>? = null
 ) {
 
     enum class UriUploaderResultCode {
@@ -113,7 +116,8 @@ class UriUploader(
     }
 
     private fun getRemotePathForUri(sourceUri: Uri): String {
-        val displayName = getDisplayNameForUri(sourceUri, mActivity)
+        val displayName = mFileDisplayNameTransformer?.apply(sourceUri)
+            ?: getDisplayNameForUri(sourceUri, mActivity)
         require(displayName != null) { "Display name cannot be null" }
         return mUploadPath + displayName
     }