From 3f7ab572a256c1fb70cecd3bef2e94da3967c1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C3=87erri?=
 <64997243+deniscerri@users.noreply.github.com>
Date: Mon, 6 Mar 2023 09:06:00 +0100
Subject: [PATCH] random fixes

---
 .../ytdlnis/ui/downloads/HistoryFragment.kt   |  2 +-
 .../com/deniscerri/ytdlnis/util/FileUtil.kt   | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
index 313882a6..fb132bef 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
@@ -391,7 +391,7 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{
 
         type!!.text = item.type.toString().uppercase()
 
-        if (item.format.format_note == "?") formatNote!!.visibility = View.GONE
+        if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility = View.GONE
         else formatNote!!.text = item.format.format_note
 
         val codecText =
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
index fd175f84..7aac74d9 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/FileUtil.kt
@@ -3,13 +3,19 @@ package com.deniscerri.ytdlnis.util
 import android.content.Context
 import android.media.MediaScannerConnection
 import android.net.Uri
+import android.os.Build
 import android.provider.DocumentsContract
+import android.util.Log
 import android.webkit.MimeTypeMap
 import com.deniscerri.ytdlnis.R
 import okhttp3.internal.closeQuietly
+import okio.Path.Companion.toPath
 import java.io.File
 import java.net.URLDecoder
 import java.nio.charset.StandardCharsets
+import java.nio.file.CopyOption
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.text.DecimalFormat
 import java.util.*
 import kotlin.math.log10
@@ -61,7 +67,6 @@ class FileUtil() {
     }
 
     private fun scanMedia(destDir: String, context: Context) : String {
-        val file : File
         val path = File(formatPath(destDir))
 
         try {
@@ -96,6 +101,19 @@ class FileUtil() {
                 )
             }
 
+            val destFile = File(formatPath(destDir) + "/${it.name}")
+            Log.e("aa", destFile.absolutePath)
+            if (destFile.absolutePath.contains("/storage/emulated/0/Download")
+                || destFile.absolutePath.contains("/storage/emulated/0/Documents")
+            ){
+                if (Build.VERSION.SDK_INT >= 26 ){
+                    Files.move(it.toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+                }else{
+                    it.renameTo(destFile)
+                }
+                return@forEach
+            }
+
             val destUri = DocumentsContract.createDocument(
                 context.contentResolver,
                 dest,