Address code review comments (#3669)

commons-app · Apr 17, 2020 · fcd2867 · fcd2867
1 parent ff310e4
commit fcd2867
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/DownloadUtils.kt
@@ -20,27 +20,22 @@ object DownloadUtils {
      */
     @JvmStatic
     fun downloadMedia(activity: Activity?, m: Media) {
-        val imageUrl = m.getImageUrl()
-        var fileName = m.getFilename()
-        if (imageUrl == null || fileName == null || activity == null
-        ) {
-            Timber.d(
-                "Skipping download media as either imageUrl %s or filename %s activity is null",
-                imageUrl, fileName
-            )
+        val imageUrl = m.imageUrl
+        var fileName = m.filename
+        if (imageUrl == null || fileName == null || activity == null) {
+            Timber.d("Skipping download media as either imageUrl $imageUrl or filename $fileName activity is null")
             return
         }
         // Strip 'File:' from beginning of filename, we really shouldn't store it
-        fileName = fileName.replaceFirst("^File:".toRegex(), "")
+        fileName = fileName.substringAfter("File:")
         val imageUri = Uri.parse(imageUrl)
-        val req = DownloadManager.Request(imageUri)
-        //These are not the image title and description fields, they are download descs for notifications
-        req.setDescription(activity.getString(R.string.app_name))
-        req.setTitle(m.displayTitle)
-        req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
-        // Modern Android updates the gallery automatically. Yay!
-        req.allowScanningByMediaScanner()
-        req.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+        val req = DownloadManager.Request(imageUri).apply {
+            setTitle(m.displayTitle)
+            setDescription(activity.getString(R.string.app_name))
+            setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName)
+            allowScanningByMediaScanner()
+            setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+        }
         PermissionUtils.checkPermissionsAndPerformAction(
             activity,
             permission.WRITE_EXTERNAL_STORAGE,