X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FUrlHistoryDialog.kt;h=81c06e951f1a11133f3b7c529cb5b0a695567c97;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=e9de8b31eda4fc20223234fa35fec70c4d8ca0fd;hpb=b0f0322c62a5cd25e587f1760a33fcf60c279954;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt
index e9de8b31..81c06e95 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/UrlHistoryDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2016-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -39,32 +39,14 @@ import androidx.preference.PreferenceManager
 import com.stoutner.privacybrowser.R
 import com.stoutner.privacybrowser.activities.MainWebViewActivity
 import com.stoutner.privacybrowser.adapters.HistoryArrayAdapter
-import com.stoutner.privacybrowser.dataclasses.History
+import com.stoutner.privacybrowser.dataclasses.HistoryDataClass
 import com.stoutner.privacybrowser.views.NestedScrollWebView
 
 // Define the class constants.
 private const val WEBVIEW_FRAGMENT_ID = "webview_fragment_id"
 
 class UrlHistoryDialog : DialogFragment() {
-    // Declare the class variables.
-    private lateinit var navigateHistoryListener: NavigateHistoryListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface NavigateHistoryListener {
-        fun navigateHistory(url: String, steps: Int)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the listener from the launching context.
-        navigateHistoryListener = context as NavigateHistoryListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun loadBackForwardList(webViewFragmentId: Long): UrlHistoryDialog {
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
@@ -83,15 +65,31 @@ class UrlHistoryDialog : DialogFragment() {
         }
     }
 
+    // Declare the class variables.
+    private lateinit var navigateHistoryListener: NavigateHistoryListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface NavigateHistoryListener {
+        fun navigateHistory(url: String, steps: Int)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the listener from the launching context.
+        navigateHistoryListener = context as NavigateHistoryListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the WebView fragment ID from the arguments.
         val webViewFragmentId = requireArguments().getLong(WEBVIEW_FRAGMENT_ID)
 
         // Get the current position of this WebView fragment.
-        val webViewPosition = MainWebViewActivity.webViewPagerAdapter.getPositionForId(webViewFragmentId)
+        val webViewPosition = MainWebViewActivity.webViewPagerAdapter!!.getPositionForId(webViewFragmentId)
 
         // Get the WebView tab fragment.
-        val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter.getPageFragment(webViewPosition)
+        val webViewTabFragment = MainWebViewActivity.webViewPagerAdapter!!.getPageFragment(webViewPosition)
 
         // Get the fragment view.
         val fragmentView = webViewTabFragment.requireView()
@@ -115,7 +113,7 @@ class UrlHistoryDialog : DialogFragment() {
         val defaultFavoriteIcon = defaultFavoriteIconBitmapDrawable.bitmap
 
         // Create a history array list.
-        val historyArrayList = ArrayList<History>()
+        val historyDataClassArrayList = ArrayList<HistoryDataClass>()
 
         // Populate the history array list, descending from the end of the list so that the newest entries are at the top.  `-1` is needed because the history array list is zero-based.
         for (i in webBackForwardList.size - 1 downTo 0) {
@@ -128,10 +126,10 @@ class UrlHistoryDialog : DialogFragment() {
             }
 
             // Store the favorite icon and the URL in history entry.
-            val historyEntry = History(favoriteIconBitmap!!, webBackForwardList.getItemAtIndex(i).url)
+            val historyDataClassEntry = HistoryDataClass(favoriteIconBitmap!!, webBackForwardList.getItemAtIndex(i).url)
 
             // Add this history entry to the history array list.
-            historyArrayList.add(historyEntry)
+            historyDataClassArrayList.add(historyDataClassEntry)
         }
 
         // Subtract the original current page ID from the array size because the order of the array is reversed so that the newest entries are at the top.  `-1` is needed because the array is zero-based.
@@ -174,7 +172,7 @@ class UrlHistoryDialog : DialogFragment() {
         alertDialog.show()
 
         // Instantiate a history array adapter.
-        val historyArrayAdapter = HistoryArrayAdapter(requireContext(), historyArrayList, currentPageId)
+        val historyArrayAdapter = HistoryArrayAdapter(requireContext(), historyDataClassArrayList, currentPageId)
 
         // Get a handle for the list view.
         val listView = alertDialog.findViewById<ListView>(R.id.history_listview)!!
@@ -206,4 +204,4 @@ class UrlHistoryDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}