X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fviews%2FNestedScrollWebView.kt;h=fa32cf0c1e6f0b03c1b32393d7afdf44b4e0f1a7;hb=70da2a558d6e35c38adb596479c36f7e451dc9a5;hp=518bc20e66ab00b1e8e48426de66f33deef9589d;hpb=0a9710c73112b4c0a2d6bf478ce2b12c7e914df2;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt index 518bc20e..fa32cf0c 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/views/NestedScrollWebView.kt @@ -24,6 +24,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap import android.graphics.drawable.BitmapDrawable +import android.graphics.drawable.Drawable import android.os.Bundle import android.util.AttributeSet import android.view.MotionEvent @@ -58,7 +59,7 @@ const val THIRD_PARTY_REQUESTS = 7 private const val ACCEPT_COOKIES = "A" private const val BLOCK_ALL_THIRD_PARTY_REQUESTS = "B" private const val CURRENT_DOMAIN_NAME = "C" -private const val CURRENT_URl = "D" +private const val CURRENT_URL = "D" private const val DOM_STORAGE_ENABLED = "E" private const val DOMAIN_SETTINGS_APPLIED = "F" private const val DOMAIN_SETTINGS_DATABASE_ID = "G" @@ -104,6 +105,8 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS var httpAuthHandler: HttpAuthHandler? = null var ignorePinnedDomainInformation = false var pinnedIpAddresses = "" + var previousFavoriteIconDrawable: Drawable? = null + var previousWebpageTitle = "" var sslErrorHandler: SslErrorHandler? = null var swipeToRefresh = false var ultraListEnabled = true @@ -398,7 +401,7 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS savedState.putBoolean(ACCEPT_COOKIES, acceptCookies) savedState.putBoolean(BLOCK_ALL_THIRD_PARTY_REQUESTS, blockAllThirdPartyRequests) savedState.putString(CURRENT_DOMAIN_NAME, currentDomainName) - savedState.putString(CURRENT_URl, currentUrl) + savedState.putString(CURRENT_URL, currentUrl) savedState.putBoolean(DOM_STORAGE_ENABLED, this.settings.domStorageEnabled) savedState.putBoolean(DOMAIN_SETTINGS_APPLIED, domainSettingsApplied) savedState.putInt(DOMAIN_SETTINGS_DATABASE_ID, domainSettingsDatabaseId) @@ -435,7 +438,7 @@ class NestedScrollWebView @JvmOverloads constructor(context: Context, attributeS acceptCookies = savedState.getBoolean(ACCEPT_COOKIES) blockAllThirdPartyRequests = savedState.getBoolean(BLOCK_ALL_THIRD_PARTY_REQUESTS) currentDomainName = savedState.getString(CURRENT_DOMAIN_NAME)!! - currentUrl = savedState.getString(CURRENT_URl)!! + currentUrl = savedState.getString(CURRENT_URL)!! this.settings.domStorageEnabled = savedState.getBoolean(DOM_STORAGE_ENABLED) domainSettingsApplied = savedState.getBoolean(DOMAIN_SETTINGS_APPLIED) domainSettingsDatabaseId = savedState.getInt(DOMAIN_SETTINGS_DATABASE_ID)