Migrate the remaining classes to Kotlin. https://redmine.stoutner.com/issues/989

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / dialogs / SaveDialog.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
index 63a6eaa301c0d8f76a41e0ab3b589b2c97d0719e..12a1d44050bacb45dfb1332a05c5d69867c408e0 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/SaveDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2019-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -35,16 +35,14 @@ import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
 import com.stoutner.privacybrowser.R
-import com.stoutner.privacybrowser.helpers.GetUrlSizeHelper
+import com.stoutner.privacybrowser.helpers.UrlHelper
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-import java.net.URL
-
-// Define the class constants.
+// Define the private class constants.
 private const val URL_STRING = "url_string"
 private const val FILE_SIZE_STRING = "file_size_string"
 private const val FILE_NAME_STRING = "file_name_string"
@@ -52,33 +50,15 @@ private const val USER_AGENT_STRING = "user_agent_string"
 private const val COOKIES_ENABLED = "cookies_enabled"
 
 class SaveDialog : DialogFragment() {
-    // Declare the class variables.
-    private lateinit var saveListener: SaveListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface SaveListener {
-        fun onSaveUrl(originalUrlString: String, fileNameString: String, dialogFragment: DialogFragment)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the save webpage listener from the launching context.
-        saveListener = context as SaveListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
-        fun saveUrl(urlString: String, fileSizeString: String, fileNameString: String, userAgentString: String, cookiesEnabled: Boolean): SaveDialog {
+        fun saveUrl(urlString: String, fileNameString: String, fileSizeString: String, userAgentString: String, cookiesEnabled: Boolean): SaveDialog {
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
 
             // Store the arguments in the bundle.
             argumentsBundle.putString(URL_STRING, urlString)
-            argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString)
             argumentsBundle.putString(FILE_NAME_STRING, fileNameString)
+            argumentsBundle.putString(FILE_SIZE_STRING, fileSizeString)
             argumentsBundle.putString(USER_AGENT_STRING, userAgentString)
             argumentsBundle.putBoolean(COOKIES_ENABLED, cookiesEnabled)
 
@@ -93,11 +73,27 @@ class SaveDialog : DialogFragment() {
         }
     }
 
+    // Declare the class variables.
+    private lateinit var saveListener: SaveListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface SaveListener {
+        fun onSaveUrl(originalUrlString: String, fileNameString: String, dialogFragment: DialogFragment)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the save webpage listener from the launching context.
+        saveListener = context as SaveListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments from the bundle.
         val originalUrlString = requireArguments().getString(URL_STRING)!!
+        var fileNameString = requireArguments().getString(FILE_NAME_STRING)!!
         val fileSizeString = requireArguments().getString(FILE_SIZE_STRING)!!
-        val fileNameString = requireArguments().getString(FILE_NAME_STRING)!!
         val userAgentString = requireArguments().getString(USER_AGENT_STRING)!!
         val cookiesEnabled = requireArguments().getBoolean(COOKIES_ENABLED)
 
@@ -181,16 +177,19 @@ class SaveDialog : DialogFragment() {
 
                 CoroutineScope(Dispatchers.Main).launch {
                     // Create a URL size string.
-                    var urlSize: String
+                    var fileNameAndSize: Pair<String, String>
 
                     // Get the URL size on the IO thread.
                     withContext(Dispatchers.IO) {
-                        // Get the URL size.
-                        urlSize = GetUrlSizeHelper.getUrl(requireContext(), URL(urlToSave), userAgentString, cookiesEnabled)
+                        // Get the updated file name and size.
+                        fileNameAndSize = UrlHelper.getNameAndSize(requireContext(), urlToSave, userAgentString, cookiesEnabled)
+
+                        // Save the updated file name.
+                        fileNameString = fileNameAndSize.first
                     }
 
                     // Display the updated URL.
-                    fileSizeTextView.text = urlSize
+                    fileSizeTextView.text = fileNameAndSize.second
                 }
             }
         })