Set the download path in a more correct way

1 files changed, 7 insertions, 34 deletions

diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt b/husky/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
index 5c6af93..a598284 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.kt
@@ -24,12 +24,10 @@ import android.Manifest
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.app.DownloadManager
-import android.content.BroadcastReceiver
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.Color
@@ -45,7 +43,6 @@ import android.view.View
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle
@@ -119,23 +116,10 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
     private var attachments: ArrayList<AttachmentViewData>? = null
     private val toolbarVisibilityListeners = mutableListOf<ToolbarVisibilityListener>()
     private var avatarUrl: String? = null
-    private var downloadId: Long = 0
 
     var isToolbarVisible = true
         private set
 
-    private val onDownloadComplete: BroadcastReceiver = object : BroadcastReceiver() {
-
-        override fun onReceive(context: Context?, intent: Intent) {
-            Timber.d("Intent [$intent]")
-            val id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            if (downloadId == id) {
-                Timber.d("Downloaded file")
-                // TODO: Run a job to move the file, avoiding being killed by the system
-            }
-        }
-    }
-
     fun addToolbarVisibilityListener(listener: ToolbarVisibilityListener): Function0<Boolean> {
         this.toolbarVisibilityListeners.add(listener)
         listener(isToolbarVisible)
@@ -146,13 +130,6 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        ContextCompat.registerReceiver(
-            this,
-            onDownloadComplete,
-            IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-            ContextCompat.RECEIVER_NOT_EXPORTED
-        )
-
         supportPostponeEnterTransition()
 
         // Gather the parameters.
@@ -211,12 +188,6 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
         })
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-
-        unregisterReceiver(onDownloadComplete)
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.view_media_toolbar, menu)
         return true
@@ -279,12 +250,14 @@ class ViewMediaActivity : BaseActivity(), ViewImageFragment.PhotoActionsListener
         ).show()
 
         val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request = DownloadManager.Request(Uri.parse(url))
-        request.setDestinationInExternalPublicDir(
-            Environment.DIRECTORY_PICTURES,
-            getString(R.string.app_name) + "/" + filename
+        downloadManager.enqueue(
+            DownloadManager.Request(Uri.parse(url)).apply {
+                setDestinationInExternalPublicDir(
+                    Environment.DIRECTORY_PICTURES,
+                    "${getString(R.string.app_name)}/$filename"
+                )
+            }
         )
-        downloadId = downloadManager.enqueue(request)
     }
 
     private fun requestDownloadMedia() {