X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fdialogs%2FUrlHistoryDialog.kt;h=23cdd5f20acdd373cd2e40e7ac2f0152e3ba5b23;hb=96fd2b4338ea6dd9520605b2ef290e38ef044f1f;hp=4061ef733143eabfd8701b5dad056a7374e68a8a;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;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 4061ef73..23cdd5f2 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 . + * Copyright 2016-2022 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -39,7 +39,7 @@ 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. @@ -115,7 +115,7 @@ class UrlHistoryDialog : DialogFragment() { val defaultFavoriteIcon = defaultFavoriteIconBitmapDrawable.bitmap // Create a history array list. - val historyArrayList = ArrayList() + val historyDataClassArrayList = ArrayList() // 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 +128,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. @@ -159,7 +159,7 @@ class UrlHistoryDialog : DialogFragment() { val alertDialog = dialogBuilder.create() // Get a handle for the shared preferences. - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext()) // Get the screenshot preference. val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false) @@ -174,7 +174,7 @@ class UrlHistoryDialog : DialogFragment() { alertDialog.show() // Instantiate a history array adapter. - val historyArrayAdapter = HistoryArrayAdapter(context, historyArrayList, currentPageId) + val historyArrayAdapter = HistoryArrayAdapter(requireContext(), historyDataClassArrayList, currentPageId) // Get a handle for the list view. val listView = alertDialog.findViewById(R.id.history_listview)!! @@ -206,4 +206,4 @@ class UrlHistoryDialog : DialogFragment() { // Return the alert dialog. return alertDialog } -} \ No newline at end of file +}