From dd11a0fcf58a64448df7ccd16e37aef6cd0c4cdb Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@gmail.com>
Date: Fri, 17 Apr 2020 01:28:23 -0700
Subject: [PATCH] Address code review comments

---
 .../free/nrw/commons/utils/DownloadUtils.kt   | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 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
index 9241668f5c..d7d5ae3aa8 100644
--- 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,