From: Soren Stoutner Date: Tue, 27 Feb 2024 21:19:15 +0000 (-0700) Subject: Bump the minimum API to 26. https://redmine.stoutner.com/issues/1163 X-Git-Tag: v3.18~12 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=e065315a36c804626a7dba38d3edad05e9fdb473;p=PrivacyBrowserAndroid.git Bump the minimum API to 26. https://redmine.stoutner.com/issues/1163 --- diff --git a/app/build.gradle b/app/build.gradle index 9dc56232..0a8c3a72 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,7 @@ android { compileSdk 34 defaultConfig { - minSdk 24 + minSdk 26 targetSdk 34 versionCode 73 versionName "3.17" diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 73f95de5..7374c44d 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -35,20 +35,19 @@

3.17 (Version Code 73)

12. Februar 2024 - Mindest-API 24, Ziel-API 34

Expand the download provider options to be Privacy Browser, Androidâs download manager, and an external app.
Remove wasted space between the navigation drawer icon and the URL bar.
Add a scroll to bottom/top entry in the navigation menu.
Add an option to display under camera cutouts in full-screen browsing mode.
Fix a crash caused by a tab sometimes being created without a corresponding page.
Fix a rare problem caused by the incorrect page being set as active after the creation of a new tab.
Fix the updating of favorite icons when navigating history.
Change the default for scrolling the app bar to false on new installs.
Make several small - user - interface - improvements.

12. Februar 2024 - Mindest-API 24, Ziel-API 34

Optionen fÃ¼r die Download Provider erweitert, sodass nun Privacy Browser, Androids Download Manager oder eine externe App gewÃ¤hlt werden kann.
Verschwendeter Platz zwischen dem Navigations-MenÃ¼-Icon und der URL-Leiste entfernt.
Neuer Eintrag fÃ¼r "Nach oben/unten scrollen" im Navigations-MenÃ¼ hinzugefÃ¼gt.
Option fÃ¼r Anzeige unter Kamera-Ausschnitt im Vollbild-Modus hinzugefÃ¼gt.
Fehler behoben, durch den gelegentlich Tabs ohne entsprechende Seiten geÃ¶ffnet wurden.
Selten auftretender Fehler behoben, durch welchen nach der Erstellung neuer Tabs falsche Seiten als aktiv gesetzt wurden.
Fehler beim Aktualisieren von Favoriten-Icons beim Navigieren im Verlauf behoben.
Vorgabe fÃ¼r das Scrollen der App-Leiste bei Neu-Installation deaktiviert.
Diverse kleine + Verbesserungen + an der Benutzer-OberflÃ¤che.
Aktualisierte deutsche Ãbersetzung von Bernhard G. Keller.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (version code 73)

12 February 2024 - minimum API 24, target API 34

Expand the download provider options to be Privacy Browser, Androidâs download manager, and an external app.
Remove wasted space between the navigation drawer icon and the URL bar.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (cÃ³digo de versiÃ³n 73)

12 de febrero de 2024 - API mÃnimo 24, API objetivo 34

Ampliar las opciones del proveedor de descargas para que sean Navegador Privado, el gestor de descargas de Android, y una app externa.
Eliminar el espacio desperdiciado entre el icono del cajÃ³n de navegaciÃ³n y la barra URL.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (version du code 73)

12 FÃ©vrier 2024 - API minimale : 24, API optimale : 34

Ãtendre les options du fournisseur de tÃ©lÃ©chargement pour inclure Privacy Browser, le gestionnaire de tÃ©lÃ©chargement d'Android et une application externe.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (versione codice 73)

12 Febbraio 2024 - minima API 24, target API 34

Ampliamento delle opzioni per il provider dei download che puÃ² essere Privacy Browser, il download manager di Android o una app esterna.
Rimozione di spazio sprecato tra l'icona del cassetto di navigazione e la barra delle URL.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (cÃ³digo de versÃ£o 73)

12 de fevereiro de 2024 - minimum API 24, target API 34

Expand the download provider options to be Privacy Browser, Androidâs download manager, and an external app.
Remove wasted space between the navigation drawer icon and the URL bar.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 73)

ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð²ÑÐ±Ð¾ÑÐ° ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð²Ð°ÑÐ¸Ð°Ð½ÑÐ¾Ð² Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²: Privacy Browser, Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð·Ð°Ð³ÑÑÐ·Ð¾Ðº Android Ð¸ Ð²Ð½ÐµÑÐ½ÐµÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ.
Ð£Ð±ÑÐ°Ð½Ð¾ Ð½ÐµÐ½ÑÐ¶Ð½Ð¾Ðµ Ð¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÐ²Ð¾ Ð¼ÐµÐ¶Ð´Ñ Ð·Ð½Ð°ÑÐºÐ¾Ð¼ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸ ÑÑÑÐ¾ÐºÐ¾Ð¹ URL.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (version code 73)

12 Åubat 2024 - minimum API 24, target API 34

Expand the download provider options to be Privacy Browser, Androidâs download manager, and an external app.
Remove wasted space between the navigation drawer icon and the URL bar.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

3.17 (version code 73)

12 February 2024 - æä½æ¯æAPI 24, æé«æ¯æAPI 34

Expand the download provider options to be Privacy Browser, Androidâs download manager, and an external app.
Remove wasted space between the navigation drawer icon and the URL bar.

sort.

style.

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

thumbs_up_down.

(R.id.javascript_spinner) val cookiesSpinner = view.findViewById(R.id.cookies_spinner) val domStorageSpinner = view.findViewById(R.id.dom_storage_spinner) - val formDataSpinner = view.findViewById(R.id.form_data_spinner) // Form data can be removed once the minimum API >= 26. val userAgentSpinner = view.findViewById(R.id.user_agent_spinner) val customUserAgentEditText = view.findViewById(R.id.custom_user_agent_edittext) val easyListSpinner = view.findViewById(R.id.easylist_spinner) @@ -720,7 +719,6 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI val javaScriptInt = javaScriptSpinner.selectedItemPosition val cookiesInt = cookiesSpinner.selectedItemPosition val domStorageInt = domStorageSpinner.selectedItemPosition - val formDataInt = formDataSpinner.selectedItemPosition // Form data can be removed once the minimum API >= 26. val userAgentSwitchPosition = userAgentSpinner.selectedItemPosition val easyListInt = easyListSpinner.selectedItemPosition val easyPrivacyInt = easyPrivacySpinner.selectedItemPosition @@ -762,7 +760,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI fontSizeInt = customFontSizeEditText.text.toString().toInt() // Save the domain settings. - domainsDatabaseHelper.updateDomain(currentDomainDatabaseId, domainNameString, javaScriptInt, cookiesInt, domStorageInt, formDataInt, userAgentName, easyListInt, easyPrivacyInt, fanboysAnnoyanceInt, + domainsDatabaseHelper.updateDomain(currentDomainDatabaseId, domainNameString, javaScriptInt, cookiesInt, domStorageInt, userAgentName, easyListInt, easyPrivacyInt, fanboysAnnoyanceInt, fanboysSocialBlockingInt, ultraListInt, ultraPrivacyInt, blockAllThirdPartyRequestsInt, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt, displayWebpageImagesInt, pinnedSslCertificate, pinnedIpAddress) diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt index 8294caef..4005443a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 Soren Stoutner . + * Copyright 2019-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -87,23 +87,17 @@ class LogcatActivity : AppCompatActivity() { } } - // Initialize the file name string from the file URI last path segment. - var fileNameString = fileUri.lastPathSegment + // Get a cursor from the content resolver. + val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! + // Move to the fist row. + contentResolverCursor.moveToFirst() - // Move to the fist row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } + // Close the cursor. + contentResolverCursor.close() // Display a snackbar with the saved logcat information. Snackbar.make(logcatTextView, getString(R.string.saved, fileNameString), Snackbar.LENGTH_SHORT).show() diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt index 782116a9..204023e3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt @@ -76,7 +76,6 @@ import android.webkit.WebSettings import android.webkit.WebStorage import android.webkit.WebView import android.webkit.WebViewClient -import android.webkit.WebViewDatabase import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.CheckBox @@ -152,7 +151,6 @@ import com.stoutner.privacybrowser.helpers.ENABLE_EASYLIST import com.stoutner.privacybrowser.helpers.ENABLE_EASYPRIVACY import com.stoutner.privacybrowser.helpers.ENABLE_FANBOYS_ANNOYANCE_LIST import com.stoutner.privacybrowser.helpers.ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST -import com.stoutner.privacybrowser.helpers.ENABLE_FORM_DATA import com.stoutner.privacybrowser.helpers.ENABLE_JAVASCRIPT import com.stoutner.privacybrowser.helpers.ENABLE_ULTRAPRIVACY import com.stoutner.privacybrowser.helpers.ENABLED @@ -290,7 +288,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook private lateinit var optionsClearCookiesMenuItem: MenuItem private lateinit var optionsClearDataMenuItem: MenuItem private lateinit var optionsClearDomStorageMenuItem: MenuItem - private lateinit var optionsClearFormDataMenuItem: MenuItem private lateinit var optionsCookiesMenuItem: MenuItem private lateinit var optionsDarkWebViewMenuItem: MenuItem private lateinit var optionsDisplayImagesMenuItem: MenuItem @@ -308,7 +305,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook private lateinit var optionsProxyNoneMenuItem: MenuItem private lateinit var optionsProxyTorMenuItem: MenuItem private lateinit var optionsRefreshMenuItem: MenuItem - private lateinit var optionsSaveFormDataMenuItem: MenuItem private lateinit var optionsSwipeToRefreshMenuItem: MenuItem private lateinit var optionsUltraListMenuItem: MenuItem private lateinit var optionsUltraPrivacyMenuItem: MenuItem @@ -363,7 +359,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook private var defaultEasyPrivacy = true private var defaultFanboysAnnoyanceList = true private var defaultFanboysSocialBlockingList = true - private var defaultFormData = false // Form data can be removed once the minimum API >= 26. private var defaultProgressViewEndOffset = 0 private var defaultProgressViewStartOffset = 0 private var defaultJavaScript = false @@ -421,23 +416,17 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook private val saveWebpageArchiveActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("multipart/related")) { fileUri -> // Only save the webpage archive if the file URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { - // Initialize the file name string from the file URI last path segment. - var fileNameString = fileUri.lastPathSegment + // Get a cursor from the content resolver. + val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! + // Move to the fist row. + contentResolverCursor.moveToFirst() - // Move to the fist row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } + // Close the cursor. + contentResolverCursor.close() // Use a coroutine to save the file. CoroutineScope(Dispatchers.Main).launch { @@ -1049,11 +1038,9 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook val optionsBookmarksMenuItem = menu.findItem(R.id.bookmarks) optionsCookiesMenuItem = menu.findItem(R.id.cookies) optionsDomStorageMenuItem = menu.findItem(R.id.dom_storage) - optionsSaveFormDataMenuItem = menu.findItem(R.id.save_form_data) // Form data can be removed once the minimum API >= 26. optionsClearDataMenuItem = menu.findItem(R.id.clear_data) optionsClearCookiesMenuItem = menu.findItem(R.id.clear_cookies) optionsClearDomStorageMenuItem = menu.findItem(R.id.clear_dom_storage) - optionsClearFormDataMenuItem = menu.findItem(R.id.clear_form_data) // Form data can be removed once the minimum API >= 26. optionsEasyListMenuItem = menu.findItem(R.id.easylist) optionsEasyPrivacyMenuItem = menu.findItem(R.id.easyprivacy) optionsFanboysAnnoyanceListMenuItem = menu.findItem(R.id.fanboys_annoyance_list) @@ -1091,13 +1078,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Set the initial status of the privacy icons. `false` does not call `invalidateOptionsMenu` as the last step. updatePrivacyIcons(false) - // Only display the form data menu items if the API < 26. - optionsSaveFormDataMenuItem.isVisible = Build.VERSION.SDK_INT < 26 - optionsClearFormDataMenuItem.isVisible = Build.VERSION.SDK_INT < 26 - - // Disable the clear form data menu item if the API >= 26 so that the status of the main Clear Data is calculated correctly. - optionsClearFormDataMenuItem.isEnabled = Build.VERSION.SDK_INT < 26 - // Set the status of the additional app bar icons. Setting the refresh menu item to `SHOW_AS_ACTION_ALWAYS` makes it appear even on small devices like phones. if (displayAdditionalAppBarIcons) { // Display the additional icons. optionsRefreshMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) @@ -1114,7 +1094,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Set the title. optionsRefreshMenuItem.setTitle(R.string.stop) - // Set the icon if it is displayed in the app bar. Once the minimum API is >= 26, the blue and black icons can be combined with a tint list. + // Set the icon if it is displayed in the app bar. if (displayAdditionalAppBarIcons) optionsRefreshMenuItem.setIcon(R.drawable.close_blue) } @@ -1147,8 +1127,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Set the status of the menu item checkboxes. optionsDomStorageMenuItem.isChecked = currentWebView!!.settings.domStorageEnabled - @Suppress("DEPRECATION") - optionsSaveFormDataMenuItem.isChecked = currentWebView!!.settings.saveFormData // Form data can be removed once the minimum API >= 26. optionsEasyListMenuItem.isChecked = currentWebView!!.easyListEnabled optionsEasyPrivacyMenuItem.isChecked = currentWebView!!.easyPrivacyEnabled optionsFanboysAnnoyanceListMenuItem.isChecked = currentWebView!!.fanboysAnnoyanceListEnabled @@ -1218,18 +1196,8 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Enable Clear DOM Storage if there is any. optionsClearDomStorageMenuItem.isEnabled = localStorageDirectoryNumberOfFiles > 0 || indexedDBDirectoryNumberOfFiles > 0 - // Enable Clear Form Data is there is any. This can be removed once the minimum API >= 26. - if (Build.VERSION.SDK_INT < 26) { - // Get the WebView database. - val webViewDatabase = WebViewDatabase.getInstance(this) - - // Enable the clear form data menu item if there is anything to clear. - @Suppress("DEPRECATION") - optionsClearFormDataMenuItem.isEnabled = webViewDatabase.hasFormData() - } - // Enable Clear Data if any of the submenu items are enabled. - optionsClearDataMenuItem.isEnabled = (optionsClearCookiesMenuItem.isEnabled || optionsClearDomStorageMenuItem.isEnabled || optionsClearFormDataMenuItem.isEnabled) + optionsClearDataMenuItem.isEnabled = (optionsClearCookiesMenuItem.isEnabled || optionsClearDomStorageMenuItem.isEnabled) // Disable Fanboy's Social Blocking List menu item if Fanboy's Annoyance List is checked. optionsFanboysSocialBlockingListMenuItem.isEnabled = !optionsFanboysAnnoyanceListMenuItem.isChecked @@ -1473,32 +1441,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook true } - R.id.save_form_data -> { // Form data. This can be removed once the minimum API >= 26. - // Switch the status of saveFormDataEnabled. - @Suppress("DEPRECATION") - currentWebView!!.settings.saveFormData = !currentWebView!!.settings.saveFormData - - // Update the menu checkbox. - @Suppress("DEPRECATION") - menuItem.isChecked = currentWebView!!.settings.saveFormData - - // Display a snackbar. - @Suppress("DEPRECATION") - if (currentWebView!!.settings.saveFormData) - Snackbar.make(webViewViewPager2, R.string.form_data_enabled, Snackbar.LENGTH_SHORT).show() - else - Snackbar.make(webViewViewPager2, R.string.form_data_disabled, Snackbar.LENGTH_SHORT).show() - - // Update the privacy icon. - updatePrivacyIcons(true) - - // Reload the current WebView. - currentWebView!!.reload() - - // Consume the event. - true - } - R.id.clear_cookies -> { // Clear cookies. // Create a snackbar. Snackbar.make(webViewViewPager2, R.string.cookies_deleted, Snackbar.LENGTH_LONG) @@ -1574,28 +1516,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook true } - R.id.clear_form_data -> { // Clear form data. This can be remove once the minimum API >= 26. - // Create a snackbar. - Snackbar.make(webViewViewPager2, R.string.form_data_deleted, Snackbar.LENGTH_LONG) - .setAction(R.string.undo) {} // Everything will be handled by `onDismissed()` below. - .addCallback(object : Snackbar.Callback() { - override fun onDismissed(snackbar: Snackbar, event: Int) { - if (event != DISMISS_EVENT_ACTION) { // The snackbar was dismissed without the undo button being pushed. - // Get a handle for the webView database. - val webViewDatabase = WebViewDatabase.getInstance(applicationContext) - - // Delete the form data. - @Suppress("DEPRECATION") - webViewDatabase.clearFormData() - } - } - }) - .show() - - // Consume the event. - true - } - R.id.easylist -> { // EasyList. // Toggle the EasyList status. currentWebView!!.easyListEnabled = !currentWebView!!.easyListEnabled @@ -2167,19 +2087,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook val wideViewportInt = calculateSettingsInt(currentWebView!!.settings.useWideViewPort, sharedPreferences.getBoolean(getString(R.string.wide_viewport_key), true)) val displayImagesInt = calculateSettingsInt(currentWebView!!.settings.loadsImagesAutomatically, sharedPreferences.getBoolean(getString(R.string.display_webpage_images_key), true)) - // Initialize the form data int. - var formDataInt = SYSTEM_DEFAULT - - // Set the form data int, which can be removed once the minimum API >= 26. - @Suppress("DEPRECATION") - if (Build.VERSION.SDK_INT < 26) { - // Get the form data status. - val formDataEnabled = currentWebView!!.settings.saveFormData - - // Calculate the form data Int. - formDataInt = calculateSettingsInt(formDataEnabled, sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false)) - } - // Get the current user agent string. val currentUserAgentString = currentWebView!!.settings.userAgentString @@ -2261,7 +2168,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook LIGHT_THEME // Create the domain and store the database ID. - val newDomainDatabaseId = domainsDatabaseHelper!!.addDomain(currentDomain, javaScriptInt, cookiesInt, domStorageInt, formDataInt, userAgentName, easyListInt, easyPrivacyInt, + val newDomainDatabaseId = domainsDatabaseHelper!!.addDomain(currentDomain, javaScriptInt, cookiesInt, domStorageInt, userAgentName, easyListInt, easyPrivacyInt, fanboysAnnoyanceListInt, fanboysSocialBlockingListInt, ultraListInt, ultraPrivacyInt, blockAllThirdPartyRequestsInt, fontSizeInt, swipeToRefreshInt, webViewThemeInt, wideViewportInt, displayImagesInt) @@ -3072,7 +2979,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook defaultJavaScript = sharedPreferences.getBoolean(getString(R.string.javascript_key), false) defaultCookies = sharedPreferences.getBoolean(getString(R.string.cookies_key), false) defaultDomStorage = sharedPreferences.getBoolean(getString(R.string.dom_storage_key), false) - defaultFormData = sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false) // Form data can be removed once the minimum API >= 26. defaultEasyList = sharedPreferences.getBoolean(getString(R.string.easylist_key), true) defaultEasyPrivacy = sharedPreferences.getBoolean(getString(R.string.easyprivacy_key), true) defaultFanboysAnnoyanceList = sharedPreferences.getBoolean(getString(R.string.fanboys_annoyance_list_key), true) @@ -3339,7 +3245,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook val javaScriptInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT)) val cookiesInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(COOKIES)) val domStorageInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE)) - val formDataInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA)) // Form data can be removed once the minimum API >= 26. val easyListInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_EASYLIST)) val easyPrivacyInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY)) val fanboysAnnoyanceListInt = currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST)) @@ -3392,17 +3297,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook DISABLED -> nestedScrollWebView.settings.domStorageEnabled = false } - // Apply the form data setting if the API < 26. - @Suppress("DEPRECATION") - if (Build.VERSION.SDK_INT < 26) { - // Set the form data status. - when (formDataInt) { - SYSTEM_DEFAULT -> nestedScrollWebView.settings.saveFormData = defaultFormData - ENABLED -> nestedScrollWebView.settings.saveFormData = true - DISABLED -> nestedScrollWebView.settings.saveFormData = false - } - } - // Set the EasyList status. when (easyListInt) { SYSTEM_DEFAULT -> nestedScrollWebView.easyListEnabled = defaultEasyList @@ -3607,11 +3501,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Apply the default cookie setting. cookieManager.setAcceptCookie(nestedScrollWebView.acceptCookies) - // Apply the form data setting if the API < 26. - if (Build.VERSION.SDK_INT < 26) - @Suppress("DEPRECATION") - nestedScrollWebView.settings.saveFormData = defaultFormData - // Apply the default font size setting. try { // Try to set the font size from the value in the app settings. @@ -3922,26 +3811,6 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook } } - // Clear form data if the API < 26. - if (Build.VERSION.SDK_INT < 26 && (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true))) { - // Ask the WebView database to clear the form data. - @Suppress("DEPRECATION") - WebViewDatabase.getInstance(this).clearFormData() - - // Manually delete the form data database, as the WebView database sometimes will not flush its changes to disk before system exit is run. - try { - // A string array must be used because the database contains a space and `Runtime.exec` will not otherwise escape the string correctly. - val deleteWebDataProcess = runtime.exec(arrayOf("rm", "-f", "$privateDataDirectoryString/app_webview/Web Data")) - val deleteWebDataJournalProcess = runtime.exec(arrayOf("rm", "-f", "$privateDataDirectoryString/app_webview/Web Data-journal")) - - // Wait until the processes have finished. - deleteWebDataProcess.waitFor() - deleteWebDataJournalProcess.waitFor() - } catch (exception: Exception) { - // Do nothing if an error is thrown. - } - } - // Clear the logcat. if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) { try { diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt index 3b6bb26f..b18365a5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Soren Stoutner . + * Copyright 2017-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -104,23 +104,17 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener private val saveTextActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { fileUri -> // Only save the file if the URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { - // Initialize the file name string from the file URI last path segment. - var fileNameString = fileUri.lastPathSegment + // Get a cursor from the content resolver. + val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = contentResolver.query(fileUri, null, null, null)!! + // Move to the first row. + contentResolverCursor.moveToFirst() - // Move to the first row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } + // Close the cursor. + contentResolverCursor.close() try { // Get the about version string. diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveAboutVersionImageCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveAboutVersionImageCoroutine.kt index 8fdd9d07..3aa847de 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveAboutVersionImageCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveAboutVersionImageCoroutine.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Soren Stoutner . + * Copyright 2020-2022, 2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -23,7 +23,6 @@ import android.app.Activity import android.graphics.Bitmap import android.graphics.Canvas import android.net.Uri -import android.os.Build import android.provider.OpenableColumns import android.widget.LinearLayout @@ -53,26 +52,20 @@ object SaveAboutVersionImageCoroutine { // Instantiate a file name string. val fileNameString: String - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { // The API >= 26. - // Get a cursor from the content resolver. - val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null) + // Get a cursor from the content resolver. + val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null) - // Get the file display name if the content resolve cursor is not null. - if (contentResolverCursor != null) { // The content resolve cursor is not null. - // Move to the first row. - contentResolverCursor.moveToFirst() + // Get the file display name if the content resolve cursor is not null. + if (contentResolverCursor != null) { // The content resolve cursor is not null. + // Move to the first row. + contentResolverCursor.moveToFirst() - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) + // Get the file name from the cursor. + fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Close the cursor. - contentResolverCursor.close() - } else { // The content resolve cursor is null. - // Use the URI last path segment as the file name string. - fileNameString = fileUri.lastPathSegment.toString() - } - } else { // The API is < 26. + // Close the cursor. + contentResolverCursor.close() + } else { // The content resolve cursor is null. // Use the URI last path segment as the file name string. fileNameString = fileUri.lastPathSegment.toString() } @@ -86,16 +79,15 @@ object SaveAboutVersionImageCoroutine { savingImageSnackbar.show() } - // Create the about version bitmap. This can be replaced by PixelCopy once the minimum API >= 26. - // Once the Minimum API >= 26 Bitmap.Config.RBGA_F16 can be used instead of ARGB_8888. The linear layout commands must be run on the UI thread. - val aboutVersionBitmap = Bitmap.createBitmap(aboutVersionLinearLayout.width, aboutVersionLinearLayout.height, Bitmap.Config.ARGB_8888) + // Create an empty bitmap with the dimensions of the linear layout. Once the minimum API >= 33 Bitmap.Config.RGBA_1010102 can be used instead of RBGA_F16. + val aboutVersionBitmap = Bitmap.createBitmap(aboutVersionLinearLayout.width, aboutVersionLinearLayout.height, Bitmap.Config.RGBA_F16) // Create a canvas. val aboutVersionCanvas = Canvas(aboutVersionBitmap) // Use the main thread to interact with the linear layout. withContext(Dispatchers.Main) { - // Draw the current about version onto the bitmap. + // Draw the current about version onto the bitmap. It might be possible to do this with PixelCopy, but I am not sure that would be any better. aboutVersionLinearLayout.draw(aboutVersionCanvas) } @@ -103,7 +95,7 @@ object SaveAboutVersionImageCoroutine { val aboutVersionByteArrayOutputStream = ByteArrayOutputStream() // Convert the bitmap to a PNG. `0` is for lossless compression (the only option for a PNG). This compression takes a long time. - // Once the minimum API >= 30 this could be replaced with WEBP_LOSSLESS. + // Once the minimum API >= 30 this can be replaced with WEBP_LOSSLESS. aboutVersionBitmap.compress(Bitmap.CompressFormat.PNG, 0, aboutVersionByteArrayOutputStream) // Create a file creation disposition string. diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt index 7ce88146..f8adc5b0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveUrlCoroutine.kt @@ -22,7 +22,6 @@ package com.stoutner.privacybrowser.coroutines import android.app.Activity import android.content.Context import android.net.Uri -import android.os.Build import android.provider.OpenableColumns import android.util.Base64 import android.webkit.CookieManager @@ -53,26 +52,17 @@ class SaveUrlCoroutine { // Use a coroutine to save the URL. CoroutineScope(Dispatchers.Main).launch { - // Create a file name string. - val fileNameString: String + // Get a cursor from the content resolver. + val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null)!! + // Move to the first row. + contentResolverCursor.moveToFirst() - // Move to the first row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } else { - // Use the file URI last path segment as the file name string. - fileNameString = fileUri.lastPathSegment!! - } + // Close the cursor. + contentResolverCursor.close() // Get a handle for the no swipe view pager. val webViewViewPager2 = activity.findViewById(R.id.webview_viewpager2) @@ -155,9 +145,9 @@ class SaveUrlCoroutine { val inputStream: InputStream = BufferedInputStream(httpUrlConnection.inputStream) // Initialize the conversion buffer byte array. - // This is set to a 100,000 bytes so that frequent updating of the snackbar doesn't freeze the interface on download, although `inputStream.read` currently used 8,000 as an upper limit. + // This is set to a 50,000 bytes so that frequent updating of the snackbar doesn't freeze the interface on download, although `inputStream.read` currently uses 8,000 as an upper limit. // - val conversionBufferByteArray = ByteArray(100_000) + val conversionBufferByteArray = ByteArray(50_000) // Initialize the longs. var downloadedBytesCounterLong: Long = 0 @@ -242,4 +232,4 @@ class SaveUrlCoroutine { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveWebpageImageCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveWebpageImageCoroutine.kt index 1c3a2c03..d6c98462 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveWebpageImageCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/SaveWebpageImageCoroutine.kt @@ -1,5 +1,5 @@ /* - * Copyright0 2019-2023 Soren Stoutner . + * Copyright0 2019-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -23,7 +23,6 @@ import android.app.Activity import android.graphics.Bitmap import android.graphics.Canvas import android.net.Uri -import android.os.Build import android.provider.OpenableColumns import com.google.android.material.snackbar.Snackbar @@ -42,26 +41,17 @@ class SaveWebpageImageCoroutine { fun save(activity: Activity, fileUri: Uri, nestedScrollWebView: NestedScrollWebView) { // Use a coroutine to save the webpage image. CoroutineScope(Dispatchers.Main).launch { - // Create a file name string. - val fileNameString: String + // Get a cursor from the content resolver. + val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null) - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = activity.contentResolver.query(fileUri, null, null, null) + // Move to the first row. + contentResolverCursor!!.moveToFirst() - // Move to the first row. - contentResolverCursor!!.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } else { - // Use the file URI last path segment as the file name string. - fileNameString = fileUri.lastPathSegment!! - } + // Close the cursor. + contentResolverCursor.close() // Create a saving image snackbar. val savingImageSnackbar = Snackbar.make(nestedScrollWebView, activity.getString(R.string.processing_image, fileNameString), Snackbar.LENGTH_INDEFINITE) @@ -69,7 +59,8 @@ class SaveWebpageImageCoroutine { // Display the saving image snackbar. savingImageSnackbar.show() - // Create a webpage bitmap. Once the Minimum API >= 26 Bitmap.Config.RBGA_F16 can be used instead of ARGB_8888. The nested scroll WebView commands must be run on the UI thread. + // Create a webpage bitmap. Once the Minimum API >= 33 Bitmap.Config.RGBA_1010102 can be used instead of ARGB_8888. + // RGBA_F16 can't be used because it produces black output for the part of page not currently visible on the screen. val webpageBitmap = Bitmap.createBitmap(nestedScrollWebView.getHorizontalScrollRange(), nestedScrollWebView.getVerticalScrollRange(), Bitmap.Config.ARGB_8888) // Create a canvas. @@ -115,8 +106,7 @@ class SaveWebpageImageCoroutine { Snackbar.make(nestedScrollWebView, activity.getString(R.string.error_saving_file, fileNameString, exception), Snackbar.LENGTH_INDEFINITE).show() } } - } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt index aba43353..841456e3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt @@ -1,5 +1,5 @@ /* - * Copyright Â© 2015-2023 Soren Stoutner . + * Copyright Â© 2015-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -50,9 +50,9 @@ import com.stoutner.privacybrowser.R import java.io.ByteArrayOutputStream // Define the private class constants. -private const val SHORTCUT_NAME = "shortcut_name" -private const val URL_STRING = "url_string" -private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array" +private const val SHORTCUT_NAME = "A" +private const val URL_STRING = "B" +private const val FAVORITE_ICON_BYTE_ARRAY = "C" class CreateHomeScreenShortcutDialog : DialogFragment() { companion object { @@ -239,7 +239,7 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { val shortcutName = shortcutNameEditText.text.toString() val urlString = urlEditText.text.toString() - // Convert the favorite icon bitmap to an icon. `IconCompat` must be used until the minimum API >= 26. + // Convert the favorite icon bitmap to an icon. val favoriteIcon = IconCompat.createWithBitmap(favoriteIconBitmap) // Create a shortcut intent. @@ -262,7 +262,7 @@ class CreateHomeScreenShortcutDialog : DialogFragment() { shortcutInfoBuilder.setIntent(shortcutIntent) shortcutInfoBuilder.setShortLabel(shortcutName) - // Add the shortcut to the home screen. `ShortcutManagerCompat` can be switched to `ShortcutManager` once the minimum API >= 26. + // Add the shortcut to the home screen. ShortcutManagerCompat.requestPinShortcut(requireContext(), shortcutInfoBuilder.build(), null) } } \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt index eeaae384..163e41d1 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutVersionFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Soren Stoutner . + * Copyright 2016-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -41,11 +41,11 @@ import android.view.MenuInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup +import android.webkit.WebView import android.widget.TextView import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.Fragment -import androidx.webkit.WebViewCompat import com.google.android.material.snackbar.Snackbar @@ -162,23 +162,17 @@ class AboutVersionFragment : Fragment() { private val saveAboutVersionTextActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { fileUri -> // Only save the file if the URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { - // Initialize the file name string from the file URI last path segment. - var fileNameString = fileUri.lastPathSegment + // Get a cursor from the content resolver. + val contentResolverCursor = requireActivity().contentResolver.query(fileUri, null, null, null)!! - // Query the exact file name if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) { - // Get a cursor from the content resolver. - val contentResolverCursor = requireActivity().contentResolver.query(fileUri, null, null, null)!! + // Move to the first row. + contentResolverCursor.moveToFirst() - // Move to the first row. - contentResolverCursor.moveToFirst() + // Get the file name from the cursor. + val fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - // Get the file name from the cursor. - fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) - - // Close the cursor. - contentResolverCursor.close() - } + // Close the cursor. + contentResolverCursor.close() try { // Get the about version string. @@ -307,8 +301,8 @@ class AboutVersionFragment : Fragment() { val serialNumberLabel = getString(R.string.serial_number) val signatureAlgorithmLabel = getString(R.string.signature_algorithm) - // Get the current WebView package info. This can be replaced by the direct call once the minimum API >= 26. - val webViewPackageInfo = WebViewCompat.getCurrentWebViewPackage(requireContext())!! + // Get the current WebView package info. + val webViewPackageInfo = WebView.getCurrentWebViewPackage()!! // Get the device's information and store it in strings. val brand = Build.BRAND diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt index e5a99590..00c3447e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Soren Stoutner . + * Copyright 2017-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -22,7 +22,6 @@ package com.stoutner.privacybrowser.fragments import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration -import android.os.Build import android.os.Bundle import android.text.Editable import android.text.SpannableStringBuilder @@ -73,7 +72,6 @@ import com.stoutner.privacybrowser.helpers.ENABLE_EASYLIST import com.stoutner.privacybrowser.helpers.ENABLE_EASYPRIVACY import com.stoutner.privacybrowser.helpers.ENABLE_FANBOYS_ANNOYANCE_LIST import com.stoutner.privacybrowser.helpers.ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST -import com.stoutner.privacybrowser.helpers.ENABLE_FORM_DATA import com.stoutner.privacybrowser.helpers.ENABLE_JAVASCRIPT import com.stoutner.privacybrowser.helpers.ENABLE_ULTRAPRIVACY import com.stoutner.privacybrowser.helpers.FONT_SIZE @@ -142,7 +140,6 @@ class DomainSettingsFragment : Fragment() { val javaScriptDefault = sharedPreferences.getBoolean(getString(R.string.javascript_key), false) val cookiesDefault = sharedPreferences.getBoolean(getString(R.string.cookies_key), false) val domStorageDefault = sharedPreferences.getBoolean(getString(R.string.dom_storage_key), false) - val formDataDefault = sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false) // The form data views can be remove once the minimum API >= 26. val userAgentDefault = sharedPreferences.getString(getString(R.string.user_agent_key), getString(R.string.user_agent_default_value)) val customUserAgentStringDefault = sharedPreferences.getString(getString(R.string.custom_user_agent_key), getString(R.string.custom_user_agent_default_value)) val easyListDefault = sharedPreferences.getBoolean(getString(R.string.easylist_key), true) @@ -173,10 +170,6 @@ class DomainSettingsFragment : Fragment() { val domStorageImageView = domainSettingsView.findViewById(R.id.dom_storage_imageview) val domStorageSpinner = domainSettingsView.findViewById(R.id.dom_storage_spinner) val domStorageTextView = domainSettingsView.findViewById(R.id.dom_storage_textview) - val formDataLinearLayout = domainSettingsView.findViewById(R.id.form_data_linearlayout) // The form data views can be remove once the minimum API >= 26. - val formDataImageView = domainSettingsView.findViewById(R.id.form_data_imageview) // The form data views can be remove once the minimum API >= 26. - val formDataSpinner = domainSettingsView.findViewById(R.id.form_data_spinner) // The form data views can be remove once the minimum API >= 26. - val formDataTextView = domainSettingsView.findViewById(R.id.form_data_textview) // The form data views can be remove once the minimum API >= 26. val userAgentLinearLayout = domainSettingsView.findViewById(R.id.user_agent_linearlayout) val userAgentSpinner = domainSettingsView.findViewById(R.id.user_agent_spinner) val userAgentTextView = domainSettingsView.findViewById(R.id.user_agent_textview) @@ -265,10 +258,6 @@ class DomainSettingsFragment : Fragment() { val currentIpAddressesRadioButton = domainSettingsView.findViewById(R.id.current_ip_addresses_radiobutton) val currentIpAddressesTextView = domainSettingsView.findViewById(R.id.current_ip_addresses_textview) - // Hide the form data linear layout if the API >= 26. - if (Build.VERSION.SDK_INT >= 26) - formDataLinearLayout.visibility = View.GONE - // Initialize the database handler. val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext()) @@ -283,7 +272,6 @@ class DomainSettingsFragment : Fragment() { val javaScriptInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT)) val cookiesInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(COOKIES)) val domStorageInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE)) - val formDataInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA)) // Form data can be remove once the minimum API >= 26. val currentUserAgentName = domainCursor.getString(domainCursor.getColumnIndexOrThrow(USER_AGENT)) val easyListInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(ENABLE_EASYLIST)) val easyPrivacyInt = domainCursor.getInt(domainCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY)) @@ -316,7 +304,6 @@ class DomainSettingsFragment : Fragment() { val javaScriptArrayAdapter = ArrayAdapter.createFromResource(context, R.array.javascript_array, R.layout.spinner_item) val cookiesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.cookies_array, R.layout.spinner_item) val domStorageArrayAdapter = ArrayAdapter.createFromResource(context, R.array.dom_storage_array, R.layout.spinner_item) - val formDataArrayAdapter = ArrayAdapter.createFromResource(context, R.array.form_data_array, R.layout.spinner_item) // Form data can be remove once the minimum API >= 26. val translatedUserAgentArrayAdapter = ArrayAdapter.createFromResource(context, R.array.translated_domain_settings_user_agent_names, R.layout.spinner_item) val easyListArrayAdapter = ArrayAdapter.createFromResource(context, R.array.easylist_array, R.layout.spinner_item) val easyPrivacyArrayAdapter = ArrayAdapter.createFromResource(context, R.array.easyprivacy_array, R.layout.spinner_item) @@ -335,7 +322,6 @@ class DomainSettingsFragment : Fragment() { javaScriptArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) cookiesArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) domStorageArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) - formDataArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) // Form data can be remove once the minimum API >= 26. translatedUserAgentArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) easyListArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) easyPrivacyArrayAdapter.setDropDownViewResource(R.layout.domain_settings_spinner_dropdown_items) @@ -354,7 +340,6 @@ class DomainSettingsFragment : Fragment() { javaScriptSpinner.adapter = javaScriptArrayAdapter cookiesSpinner.adapter = cookiesArrayAdapter domStorageSpinner.adapter = domStorageArrayAdapter - formDataSpinner.adapter = formDataArrayAdapter // Form data can be remove once the minimum API >= 26. userAgentSpinner.adapter = translatedUserAgentArrayAdapter easyListSpinner.adapter = easyListArrayAdapter easyPrivacySpinner.adapter = easyPrivacyArrayAdapter @@ -373,7 +358,6 @@ class DomainSettingsFragment : Fragment() { javaScriptTextView.setOnClickListener { javaScriptSpinner.performClick() } cookiesTextView.setOnClickListener { cookiesSpinner.performClick() } domStorageTextView.setOnClickListener { domStorageSpinner.performClick() } - formDataTextView.setOnClickListener { formDataSpinner.performClick() } // Form data can be remove once the minimum API >= 26. userAgentTextView.setOnClickListener { userAgentSpinner.performClick() } easyListTextView.setOnClickListener { easyListSpinner.performClick() } easyPrivacyTextView.setOnClickListener { easyPrivacySpinner.performClick() } @@ -392,7 +376,6 @@ class DomainSettingsFragment : Fragment() { javaScriptSpinner.setSelection(javaScriptInt) cookiesSpinner.setSelection(cookiesInt) domStorageSpinner.setSelection(domStorageInt) - formDataSpinner.setSelection(formDataInt) easyListSpinner.setSelection(easyListInt) easyPrivacySpinner.setSelection(easyPrivacyInt) fanboysAnnoyanceListSpinner.setSelection(fanboysAnnoyanceListInt) @@ -409,7 +392,6 @@ class DomainSettingsFragment : Fragment() { populateTextView(javaScriptDefault, javaScriptArrayAdapter, javaScriptTextView) populateTextView(cookiesDefault, cookiesArrayAdapter, cookiesTextView) populateTextView(domStorageDefault, domStorageArrayAdapter, domStorageTextView) - populateTextView(formDataDefault, formDataArrayAdapter, formDataTextView) populateTextView(easyListDefault, easyListArrayAdapter, easyListTextView) populateTextView(easyPrivacyDefault, easyPrivacyArrayAdapter, easyPrivacyTextView) populateTextView(fanboysAnnoyanceListDefault, fanboysAnnoyanceListArrayAdapter, fanboysAnnoyanceListTextView) @@ -424,7 +406,6 @@ class DomainSettingsFragment : Fragment() { // Set the icon and text view settings. Non-standard items are handled individually below. setIconAndTextViewSettings(cookiesInt, cookiesDefault, cookiesLinearLayout, cookiesImageView, cookiesTextView) setIconAndTextViewSettings(domStorageInt, domStorageDefault, domStorageLinearLayout, domStorageImageView, domStorageTextView) - setIconAndTextViewSettings(formDataInt, formDataDefault, formDataLinearLayout, formDataImageView, formDataTextView) setIconAndTextViewSettings(easyListInt, easyListDefault, easyListLinearLayout, easyListImageView, easyListTextView) setIconAndTextViewSettings(easyPrivacyInt, easyPrivacyDefault, easyPrivacyLinearLayout, easyPrivacyImageView, easyListTextView) setIconAndTextViewSettings(fanboysAnnoyanceListInt, fanboysAnnoyanceListDefault, fanboysAnnoyanceListLinearLayout, fanboysAnnoyanceListImageView, fanboysAnnoyanceListTextView) @@ -1059,20 +1040,6 @@ class DomainSettingsFragment : Fragment() { } } - // Set the form data spinner listener. It can be removed once the minimum API >= 26. - if (Build.VERSION.SDK_INT < 26) { - formDataSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { - // Update the icon and the text view settings. - setIconAndTextViewSettings(position, formDataDefault, formDataLinearLayout, formDataImageView, formDataTextView) - } - - override fun onNothingSelected(parent: AdapterView<*>?) { - // Do nothing. - } - } - } - // Set the user agent spinner listener. userAgentSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt index 10a4532d..b5d14b44 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.kt @@ -33,7 +33,6 @@ import android.widget.ArrayAdapter import androidx.appcompat.app.AppCompatDelegate import androidx.preference.Preference -import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat import com.stoutner.privacybrowser.R @@ -65,7 +64,6 @@ class SettingsFragment : PreferenceFragmentCompat() { private lateinit var clearCookiesPreference: Preference private lateinit var clearDomStoragePreference: Preference private lateinit var clearEverythingPreference: Preference - private lateinit var clearFormDataPreference: Preference // The clear form data preference can be removed once the minimum API >= 26. private lateinit var clearLogcatPreference: Preference private lateinit var cookiesPreference: Preference private lateinit var customUserAgentPreference: Preference @@ -80,7 +78,6 @@ class SettingsFragment : PreferenceFragmentCompat() { private lateinit var fanboyAnnoyanceListPreference: Preference private lateinit var fanboySocialBlockingListPreference: Preference private lateinit var fontSizePreference: Preference - private lateinit var formDataPreference: Preference // The form data preference can be removed once the minimum API >= 26. private lateinit var fullScreenBrowsingModePreference: Preference private lateinit var hideAppBarPreference: Preference private lateinit var displayUnderCutoutsPreference: Preference @@ -127,7 +124,6 @@ class SettingsFragment : PreferenceFragmentCompat() { javaScriptPreference = findPreference(getString(R.string.javascript_key))!! cookiesPreference = findPreference(getString(R.string.cookies_key))!! domStoragePreference = findPreference(getString(R.string.dom_storage_key))!! - formDataPreference = findPreference(getString(R.string.save_form_data_key))!! // The form data preference can be removed once the minimum API >= 26. userAgentPreference = findPreference(getString(R.string.user_agent_key))!! customUserAgentPreference = findPreference(getString(R.string.custom_user_agent_key))!! incognitoModePreference = findPreference(getString(R.string.incognito_mode_key))!! @@ -151,7 +147,6 @@ class SettingsFragment : PreferenceFragmentCompat() { clearEverythingPreference = findPreference(getString(R.string.clear_everything_key))!! clearCookiesPreference = findPreference(getString(R.string.clear_cookies_key))!! clearDomStoragePreference = findPreference(getString(R.string.clear_dom_storage_key))!! - clearFormDataPreference = findPreference(getString(R.string.clear_form_data_key))!! // The clear form data preference can be removed once the minimum API >= 26. clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key))!! clearCachePreference = findPreference(getString(R.string.clear_cache_key))!! homepagePreference = findPreference(getString(R.string.homepage_key))!! @@ -184,17 +179,6 @@ class SettingsFragment : PreferenceFragmentCompat() { val fullScreenBrowsingMode = sharedPreferences.getBoolean(getString(R.string.full_screen_browsing_mode_key), false) val clearEverything = sharedPreferences.getBoolean(getString(R.string.clear_everything_key), true) - // Remove the form data preferences if the API is >= 26 as they no longer do anything. - if (Build.VERSION.SDK_INT >= 26) { - // Get handles for the categories. - val privacyCategory = findPreference(getString(R.string.privacy_category_key))!! - val clearAndExitCategory = findPreference(getString(R.string.clear_and_exit_category_key))!! - - // Remove the form data preferences. - privacyCategory.removePreference(formDataPreference) - clearAndExitCategory.removePreference(clearFormDataPreference) - } - // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled. fanboySocialBlockingListPreference.isEnabled = !fanboyAnnoyanceListEnabled @@ -271,7 +255,6 @@ class SettingsFragment : PreferenceFragmentCompat() { // Set the status of the clear and exit preferences. clearCookiesPreference.isEnabled = !clearEverything clearDomStoragePreference.isEnabled = !clearEverything - clearFormDataPreference.isEnabled = !clearEverything // Clear form data can be removed once the minimum API is >= 26. clearLogcatPreference.isEnabled = !clearEverything clearCachePreference.isEnabled = !clearEverything @@ -344,14 +327,6 @@ class SettingsFragment : PreferenceFragmentCompat() { domStoragePreference.setIcon(R.drawable.dom_storage_ghosted) } - // Set the save form data icon if API < 26. Save form data has no effect on API >= 26. - if (Build.VERSION.SDK_INT < 26) { - if (sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false)) - formDataPreference.setIcon(R.drawable.form_data_enabled) - else - formDataPreference.setIcon(R.drawable.form_data_disabled) - } - // Set the custom user agent icon. if (customUserAgentPreference.isEnabled) customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled) @@ -495,14 +470,6 @@ class SettingsFragment : PreferenceFragmentCompat() { else clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) - // Set the clear form data icon if the API < 26. It has no effect on newer versions of Android. - if (Build.VERSION.SDK_INT < 26) { - if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - // Set the clear logcat icon. if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) clearLogcatPreference.setIcon(R.drawable.clear_logcat_enabled) @@ -679,14 +646,6 @@ class SettingsFragment : PreferenceFragmentCompat() { domStoragePreference.setIcon(R.drawable.dom_storage_disabled) } - getString(R.string.save_form_data_key) -> { // Saved form data can be removed once the minimum API >= 26. - // Update the icon. - if (sharedPreferences.getBoolean(getString(R.string.save_form_data_key), false)) - formDataPreference.setIcon(R.drawable.form_data_enabled) - else - formDataPreference.setIcon(R.drawable.form_data_disabled) - } - getString(R.string.user_agent_key) -> { // Get the new user agent name. val newUserAgentName = sharedPreferences.getString(getString(R.string.user_agent_key), getString(R.string.user_agent_default_value)) @@ -965,7 +924,6 @@ class SettingsFragment : PreferenceFragmentCompat() { // Update the status of the clear and exit preferences. clearCookiesPreference.isEnabled = !newClearEverythingBoolean clearDomStoragePreference.isEnabled = !newClearEverythingBoolean - clearFormDataPreference.isEnabled = !newClearEverythingBoolean // Clear form data can be removed once the minimum API >= 26. clearLogcatPreference.isEnabled = !newClearEverythingBoolean clearCachePreference.isEnabled = !newClearEverythingBoolean @@ -987,14 +945,6 @@ class SettingsFragment : PreferenceFragmentCompat() { else clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) - // Update the clear form data preference icon if the API < 26. - if (Build.VERSION.SDK_INT < 26) { - if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - // Update the clear logcat preference icon. if (newClearEverythingBoolean || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) clearLogcatPreference.setIcon(R.drawable.clear_logcat_enabled) @@ -1024,14 +974,6 @@ class SettingsFragment : PreferenceFragmentCompat() { clearDomStoragePreference.setIcon(R.drawable.clear_dom_storage_disabled) } - getString(R.string.clear_form_data_key) -> { - // Update the icon. - if (sharedPreferences.getBoolean(getString(R.string.clear_form_data_key), true)) - clearFormDataPreference.setIcon(R.drawable.clear_form_data_enabled) - else - clearFormDataPreference.setIcon(R.drawable.clear_form_data_disabled) - } - getString(R.string.clear_logcat_key) -> { // Update the icon. if (sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt index dea4c75f..22ee1a25 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt @@ -31,7 +31,7 @@ import androidx.preference.PreferenceManager import com.stoutner.privacybrowser.R // Define the class constants. -private const val SCHEMA_VERSION = 16 +private const val SCHEMA_VERSION = 17 // Define the public database constants. const val DOMAINS_DATABASE = "domains.db" @@ -54,7 +54,6 @@ const val ENABLE_EASYLIST = "enableeasylist" const val ENABLE_EASYPRIVACY = "enableeasyprivacy" const val ENABLE_FANBOYS_ANNOYANCE_LIST = "enablefanboysannoyancelist" const val ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST = "enablefanboyssocialblockinglist" -const val ENABLE_FORM_DATA = "enableformdata" // Form data can be removed once the minimum API >= 26. const val ENABLE_JAVASCRIPT = "enablejavascript" const val ENABLE_ULTRAPRIVACY = "enableultraprivacy" const val FONT_SIZE = "fontsize" @@ -83,7 +82,6 @@ const val CREATE_DOMAINS_TABLE = "CREATE TABLE $DOMAINS_TABLE (" + "$ENABLE_JAVASCRIPT INTEGER, " + "$COOKIES INTEGER, " + "$ENABLE_DOM_STORAGE INTEGER, " + - "$ENABLE_FORM_DATA INTEGER, " + "$USER_AGENT TEXT, " + "$ENABLE_EASYLIST INTEGER, " + "$ENABLE_EASYPRIVACY INTEGER, " + @@ -269,7 +267,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( val javaScriptDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.javascript_key), false) val cookiesDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.cookies_key), false) val domStorageDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.dom_storage_key), false) - val formDataDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.save_form_data_key), false) val easyListDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.easylist_key), true) val easyPrivacyDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.easyprivacy_key), true) val fanboysAnnoyanceListDefaultValue = sharedPreferences.getBoolean(appContext.getString(R.string.fanboys_annoyance_list_key), true) @@ -285,7 +282,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( val javaScriptColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT) val cookiesColumnIndex = domainsCursor.getColumnIndexOrThrow(COOKIES) val domStorageColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE) - val formDataColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA) val easyListColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_EASYLIST) val easyPrivacyColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY) val fanboysAnnoyanceListColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST) @@ -303,7 +299,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( val javaScriptDomainCurrentValue = domainsCursor.getInt(javaScriptColumnIndex) val cookiesDomainCurrentValue = domainsCursor.getInt(cookiesColumnIndex) val domStorageDomainCurrentValue = domainsCursor.getInt(domStorageColumnIndex) - val formDataDomainCurrentValue = domainsCursor.getInt(formDataColumnIndex) val easyListDomainCurrentValue = domainsCursor.getInt(easyListColumnIndex) val easyPrivacyDomainCurrentValue = domainsCursor.getInt(easyPrivacyColumnIndex) val fanboysAnnoyanceListCurrentValue = domainsCursor.getInt(fanboysAnnoyanceListColumnIndex) @@ -319,7 +314,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( domainContentValues.put(ENABLE_JAVASCRIPT, convertFromSwitchToSpinner(javaScriptDefaultValue, javaScriptDomainCurrentValue)) domainContentValues.put(COOKIES, convertFromSwitchToSpinner(cookiesDefaultValue, cookiesDomainCurrentValue)) domainContentValues.put(ENABLE_DOM_STORAGE, convertFromSwitchToSpinner(domStorageDefaultValue, domStorageDomainCurrentValue)) - domainContentValues.put(ENABLE_FORM_DATA, convertFromSwitchToSpinner(formDataDefaultValue, formDataDomainCurrentValue)) domainContentValues.put(ENABLE_EASYLIST, convertFromSwitchToSpinner(easyListDefaultValue, easyListDomainCurrentValue)) domainContentValues.put(ENABLE_EASYPRIVACY, convertFromSwitchToSpinner(easyPrivacyDefaultValue, easyPrivacyDomainCurrentValue)) domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, convertFromSwitchToSpinner(fanboysAnnoyanceListDefaultValue, fanboysAnnoyanceListCurrentValue)) @@ -335,6 +329,12 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( domainsDatabase.update(DOMAINS_TABLE, domainContentValues, "$ID = $currentDatabaseId", null) } + // Upgrade from schema version 16, first used in Privacy Browser 3.15, to schema version 17, first used in Privacy Browser 3.18. + // This upgrade removed `enableformdata`. + // SQLite amazingly only added a command to drop a column in version 3.35.0. + // That will not be supported in Android until the minimum API >= 34. + // Although a new table could be created and all the data copied to it, I think I will just leave the `enableformdata` column. It will be wiped out the next time an import is run. + // Close the cursor. domainsCursor.close() } @@ -410,11 +410,11 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( fun addDomain(domainName: String): Int { // Add the domain with default settings. - return addDomain(domainName, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, appContext.getString(R.string.system_default_user_agent), SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, + return addDomain(domainName, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, appContext.getString(R.string.system_default_user_agent), SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT) } - fun addDomain(domainName: String, javaScriptInt: Int, cookiesInt: Int, domStorageInt: Int, formDataInt: Int, userAgentName: String, easyListInt: Int, easyPrivacyInt: Int, fanboysAnnoyanceListInt: Int, + fun addDomain(domainName: String, javaScriptInt: Int, cookiesInt: Int, domStorageInt: Int, userAgentName: String, easyListInt: Int, easyPrivacyInt: Int, fanboysAnnoyanceListInt: Int, fanboysSocialBlockingListInt: Int, ultraListInt: Int, ultraPrivacyInt: Int, blockAllThirdPartyRequestsInt: Int, fontSizeInt: Int, swipeToRefreshInt: Int, webViewThemeInt: Int, wideViewportInt: Int, displayImagesInt: Int): Int { // Instantiate a content values. @@ -425,7 +425,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( domainContentValues.put(ENABLE_JAVASCRIPT, javaScriptInt) domainContentValues.put(COOKIES, cookiesInt) domainContentValues.put(ENABLE_DOM_STORAGE, domStorageInt) - domainContentValues.put(ENABLE_FORM_DATA, formDataInt) // Form data can be removed once the minimum API >= 26. domainContentValues.put(USER_AGENT, userAgentName) domainContentValues.put(ENABLE_EASYLIST, easyListInt) domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacyInt) @@ -453,7 +452,7 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( return newDomainDatabaseId } - fun updateDomain(databaseId: Int, domainName: String, javaScript: Int, cookies: Int, domStorage: Int, formData: Int, userAgent: String, easyList: Int, easyPrivacy: Int, fanboysAnnoyance: Int, + fun updateDomain(databaseId: Int, domainName: String, javaScript: Int, cookies: Int, domStorage: Int, userAgent: String, easyList: Int, easyPrivacy: Int, fanboysAnnoyance: Int, fanboysSocialBlocking: Int, ultraList: Int, ultraPrivacy: Int, blockAllThirdPartyRequests: Int, fontSize: Int, swipeToRefresh: Int, webViewTheme: Int, wideViewport: Int, displayImages: Int, pinnedSslCertificate: Boolean, pinnedIpAddresses: Boolean) { @@ -465,7 +464,6 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( domainContentValues.put(ENABLE_JAVASCRIPT, javaScript) domainContentValues.put(COOKIES, cookies) domainContentValues.put(ENABLE_DOM_STORAGE, domStorage) - domainContentValues.put(ENABLE_FORM_DATA, formData) // Form data can be removed once the minimum API >= 26. domainContentValues.put(USER_AGENT, userAgent) domainContentValues.put(ENABLE_EASYLIST, easyList) domainContentValues.put(ENABLE_EASYPRIVACY, easyPrivacy) diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.kt index 8f1b93c0..0b040748 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/ImportExportDatabaseHelper.kt @@ -38,7 +38,7 @@ import java.io.OutputStream import java.util.Date // Define the public constants. -const val IMPORT_EXPORT_SCHEMA_VERSION = 18 +const val IMPORT_EXPORT_SCHEMA_VERSION = 19 const val EXPORT_SUCCESSFUL = "A" const val IMPORT_SUCCESSFUL = "B" @@ -51,7 +51,6 @@ private const val CLEAR_CACHE = "clear_cache" private const val CLEAR_COOKIES = "clear_cookies" private const val CLEAR_DOM_STORAGE = "clear_dom_storage" private const val CLEAR_EVERYTHING = "clear_everything" -private const val CLEAR_FORM_DATA = "clear_form_data" // Clear form data can be removed once the minimum API >= 26. private const val CLEAR_LOGCAT = "clear_logcat" private const val CUSTOM_USER_AGENT = "custom_user_agent" private const val DISPLAY_ADDITIONAL_APP_BAR_ICONS = "display_additional_app_bar_icons" @@ -75,7 +74,6 @@ private const val PREFERENCES_TABLE = "preferences" private const val PREFERENCES_USER_AGENT = "user_agent" private const val PROXY = "proxy" private const val PROXY_CUSTOM_URL = "proxy_custom_url" -private const val SAVE_FORM_DATA = "save_form_data" private const val SEARCH = "search" private const val SEARCH_CUSTOM_URL = "search_custom_url" private const val SCROLL_APP_BAR = "scroll_app_bar" @@ -401,11 +399,14 @@ class ImportExportDatabaseHelper { } // Upgrade from schema version 15, first used in Privacy Browser 3.11, to schema version 16, first used in Privacy Browser 3.12. - // This upgrade removed the `x_requested_with_header` from the domains and preferences tables. + // This upgrade removed `x_requested_with_header` from the domains and preferences tables. // There is no need to delete the columns as they will simply be ignored by the import. // Upgrade from schema version 16, first used in Privacy Browser 3.12, to schema version 17, first used in Privacy Browser 3.15. if (importDatabaseVersion < 17) { + // This upgrade removed `parentfolder` from the Bookmarks table. + // There is no need to delete the column as they will simply be ignored by the import. + // Add the folder ID column. importDatabase.execSQL("ALTER TABLE $BOOKMARKS_TABLE ADD COLUMN $FOLDER_ID INTEGER") @@ -490,10 +491,74 @@ class ImportExportDatabaseHelper { // Close the bookmarks cursor. bookmarksCursor.close() - // This upgrade removed the old `parentfolder` string column. - // SQLite amazingly only added a command to drop a column in version 3.35.0. - // It will be a while before that is supported in Android. - // Although a new table could be created and all the data copied to it, I think I will just leave the old parent folder column. It will be wiped out the next time an import is run. + // Get the current switch default values. + val javaScriptDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.javascript_key), false) + val cookiesDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.cookies_key), false) + val domStorageDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.dom_storage_key), false) + val easyListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.easylist_key), true) + val easyPrivacyDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.easyprivacy_key), true) + val fanboysAnnoyanceListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.fanboys_annoyance_list_key), true) + val fanboysSocialBlockingListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.fanboys_social_blocking_list), true) + val ultraListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.ultralist_key), true) + val ultraPrivacyDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.ultraprivacy_key), true) + val blockAllThirdPartyRequestsDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.block_all_third_party_requests_key), false) + + // Get a domains cursor. + val importDomainsConversionCursor = importDatabase.rawQuery("SELECT * FROM $DOMAINS_TABLE", null) + + // Get the domains column indexes. + val javaScriptColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT) + val cookiesColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(COOKIES) + val domStorageColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE) + val easyListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_EASYLIST) + val easyPrivacyColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY) + val fanboysAnnoyanceListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST) + val fanboysSocialBlockingListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST) + val ultraListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ULTRALIST) + val ultraPrivacyColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_ULTRAPRIVACY) + val blockAllThirdPartyRequestsColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(BLOCK_ALL_THIRD_PARTY_REQUESTS) + + // Convert the domain from the switch booleans to the spinner integers. + for (i in 0 until importDomainsConversionCursor.count) { + // Move to the current record. + importDomainsConversionCursor.moveToPosition(i) + + // Get the domain current values. + val javaScriptDomainCurrentValue = importDomainsConversionCursor.getInt(javaScriptColumnIndex) + val cookiesDomainCurrentValue = importDomainsConversionCursor.getInt(cookiesColumnIndex) + val domStorageDomainCurrentValue = importDomainsConversionCursor.getInt(domStorageColumnIndex) + val easyListDomainCurrentValue = importDomainsConversionCursor.getInt(easyListColumnIndex) + val easyPrivacyDomainCurrentValue = importDomainsConversionCursor.getInt(easyPrivacyColumnIndex) + val fanboysAnnoyanceListCurrentValue = importDomainsConversionCursor.getInt(fanboysAnnoyanceListColumnIndex) + val fanboysSocialBlockingListCurrentValue = importDomainsConversionCursor.getInt(fanboysSocialBlockingListColumnIndex) + val ultraListCurrentValue = importDomainsConversionCursor.getInt(ultraListColumnIndex) + val ultraPrivacyCurrentValue = importDomainsConversionCursor.getInt(ultraPrivacyColumnIndex) + val blockAllThirdPartyRequestsCurrentValue = importDomainsConversionCursor.getInt(blockAllThirdPartyRequestsColumnIndex) + + // Instantiate a domain content values. + val domainContentValues = ContentValues() + + // Populate the domain content values. + domainContentValues.put(ENABLE_JAVASCRIPT, convertFromSwitchToSpinner(javaScriptDefaultValue, javaScriptDomainCurrentValue)) + domainContentValues.put(COOKIES, convertFromSwitchToSpinner(cookiesDefaultValue, cookiesDomainCurrentValue)) + domainContentValues.put(ENABLE_DOM_STORAGE, convertFromSwitchToSpinner(domStorageDefaultValue, domStorageDomainCurrentValue)) + domainContentValues.put(ENABLE_EASYLIST, convertFromSwitchToSpinner(easyListDefaultValue, easyListDomainCurrentValue)) + domainContentValues.put(ENABLE_EASYPRIVACY, convertFromSwitchToSpinner(easyPrivacyDefaultValue, easyPrivacyDomainCurrentValue)) + domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, convertFromSwitchToSpinner(fanboysAnnoyanceListDefaultValue, fanboysAnnoyanceListCurrentValue)) + domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, convertFromSwitchToSpinner(fanboysSocialBlockingListDefaultValue, fanboysSocialBlockingListCurrentValue)) + domainContentValues.put(ULTRALIST, convertFromSwitchToSpinner(ultraListDefaultValue, ultraListCurrentValue)) + domainContentValues.put(ENABLE_ULTRAPRIVACY, convertFromSwitchToSpinner(ultraPrivacyDefaultValue, ultraPrivacyCurrentValue)) + domainContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, convertFromSwitchToSpinner(blockAllThirdPartyRequestsDefaultValue, blockAllThirdPartyRequestsCurrentValue)) + + // Get the current database ID. + val currentDatabaseId = importDomainsConversionCursor.getInt(importDomainsConversionCursor.getColumnIndexOrThrow(ID)) + + // Update the row for the specified database ID. + importDatabase.update(DOMAINS_TABLE, domainContentValues, "$ID = $currentDatabaseId", null) + } + + // Close the cursor. + importDomainsConversionCursor.close() } // Upgrade from schema version 17, first used in Privacy Browser 3.15, to schema version 18, first used in Privacy Browser 3.17. @@ -506,7 +571,7 @@ class ImportExportDatabaseHelper { val displayUnderCutouts = sharedPreferences.getBoolean(DISPLAY_UNDER_CUTOUTS, false) // Populate the preferences table with the current display under cutouts value. - // This can switch to using the variables directly once the API >= 30. + // This can switch to using the variables directly once the minimum API >= 30. // if (displayUnderCutouts) importDatabase.execSQL("UPDATE $PREFERENCES_TABLE SET $DISPLAY_UNDER_CUTOUTS = 1") @@ -535,6 +600,11 @@ class ImportExportDatabaseHelper { importDatabase.execSQL("UPDATE $PREFERENCES_TABLE SET $DOWNLOAD_PROVIDER = '${downloadProviderEntryValuesStringArray[0]}'") } + // Upgrade from schema version 18, first used in Privacy Browser 3.17, to schema version 19, first used in Privacy Browser 3.18. + // This upgrade removed `enableformdata` from the Domains table and `save_form_data` and `clear_form_data` from the Preferences table. + // There is no need to delete the columns as they will simply be ignored by the import. + + /* End of database upgrade logic. */ @@ -580,82 +650,6 @@ class ImportExportDatabaseHelper { importBookmarksCursor.moveToNext() } - // Upgrade from schema version 16, first used in Privacy Browser 3.12, to schema version 17, first used in Privacy Browser 3.15. - if (importDatabaseVersion < 16) { - // Get the current switch default values. - val javaScriptDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.javascript_key), false) - val cookiesDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.cookies_key), false) - val domStorageDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.dom_storage_key), false) - val formDataDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.save_form_data_key), false) - val easyListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.easylist_key), true) - val easyPrivacyDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.easyprivacy_key), true) - val fanboysAnnoyanceListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.fanboys_annoyance_list_key), true) - val fanboysSocialBlockingListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.fanboys_social_blocking_list), true) - val ultraListDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.ultralist_key), true) - val ultraPrivacyDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.ultraprivacy_key), true) - val blockAllThirdPartyRequestsDefaultValue = sharedPreferences.getBoolean(context.getString(R.string.block_all_third_party_requests_key), false) - - // Get a domains cursor. - val importDomainsConversionCursor = importDatabase.rawQuery("SELECT * FROM $DOMAINS_TABLE", null) - - // Get the domains column indexes. - val javaScriptColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT) - val cookiesColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(COOKIES) - val domStorageColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE) - val formDataColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA) - val easyListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_EASYLIST) - val easyPrivacyColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY) - val fanboysAnnoyanceListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST) - val fanboysSocialBlockingListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST) - val ultraListColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ULTRALIST) - val ultraPrivacyColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(ENABLE_ULTRAPRIVACY) - val blockAllThirdPartyRequestsColumnIndex = importDomainsConversionCursor.getColumnIndexOrThrow(BLOCK_ALL_THIRD_PARTY_REQUESTS) - - // Convert the domain from the switch booleans to the spinner integers. - for (i in 0 until importDomainsConversionCursor.count) { - // Move to the current record. - importDomainsConversionCursor.moveToPosition(i) - - // Get the domain current values. - val javaScriptDomainCurrentValue = importDomainsConversionCursor.getInt(javaScriptColumnIndex) - val cookiesDomainCurrentValue = importDomainsConversionCursor.getInt(cookiesColumnIndex) - val domStorageDomainCurrentValue = importDomainsConversionCursor.getInt(domStorageColumnIndex) - val formDataDomainCurrentValue = importDomainsConversionCursor.getInt(formDataColumnIndex) - val easyListDomainCurrentValue = importDomainsConversionCursor.getInt(easyListColumnIndex) - val easyPrivacyDomainCurrentValue = importDomainsConversionCursor.getInt(easyPrivacyColumnIndex) - val fanboysAnnoyanceListCurrentValue = importDomainsConversionCursor.getInt(fanboysAnnoyanceListColumnIndex) - val fanboysSocialBlockingListCurrentValue = importDomainsConversionCursor.getInt(fanboysSocialBlockingListColumnIndex) - val ultraListCurrentValue = importDomainsConversionCursor.getInt(ultraListColumnIndex) - val ultraPrivacyCurrentValue = importDomainsConversionCursor.getInt(ultraPrivacyColumnIndex) - val blockAllThirdPartyRequestsCurrentValue = importDomainsConversionCursor.getInt(blockAllThirdPartyRequestsColumnIndex) - - // Instantiate a domain content values. - val domainContentValues = ContentValues() - - // Populate the domain content values. - domainContentValues.put(ENABLE_JAVASCRIPT, convertFromSwitchToSpinner(javaScriptDefaultValue, javaScriptDomainCurrentValue)) - domainContentValues.put(COOKIES, convertFromSwitchToSpinner(cookiesDefaultValue, cookiesDomainCurrentValue)) - domainContentValues.put(ENABLE_DOM_STORAGE, convertFromSwitchToSpinner(domStorageDefaultValue, domStorageDomainCurrentValue)) - domainContentValues.put(ENABLE_FORM_DATA, convertFromSwitchToSpinner(formDataDefaultValue, formDataDomainCurrentValue)) - domainContentValues.put(ENABLE_EASYLIST, convertFromSwitchToSpinner(easyListDefaultValue, easyListDomainCurrentValue)) - domainContentValues.put(ENABLE_EASYPRIVACY, convertFromSwitchToSpinner(easyPrivacyDefaultValue, easyPrivacyDomainCurrentValue)) - domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, convertFromSwitchToSpinner(fanboysAnnoyanceListDefaultValue, fanboysAnnoyanceListCurrentValue)) - domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, convertFromSwitchToSpinner(fanboysSocialBlockingListDefaultValue, fanboysSocialBlockingListCurrentValue)) - domainContentValues.put(ULTRALIST, convertFromSwitchToSpinner(ultraListDefaultValue, ultraListCurrentValue)) - domainContentValues.put(ENABLE_ULTRAPRIVACY, convertFromSwitchToSpinner(ultraPrivacyDefaultValue, ultraPrivacyCurrentValue)) - domainContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, convertFromSwitchToSpinner(blockAllThirdPartyRequestsDefaultValue, blockAllThirdPartyRequestsCurrentValue)) - - // Get the current database ID. - val currentDatabaseId = importDomainsConversionCursor.getInt(importDomainsConversionCursor.getColumnIndexOrThrow(ID)) - - // Update the row for the specified database ID. - importDatabase.update(DOMAINS_TABLE, domainContentValues, "$ID = $currentDatabaseId", null) - } - - // Close the cursor. - importDomainsConversionCursor.close() - } - // Close the bookmarks cursor and database. importBookmarksCursor.close() bookmarksDatabaseHelper.close() @@ -678,7 +672,6 @@ class ImportExportDatabaseHelper { val domainJavaScriptColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT) val domainCookiesColumnIndex = importDomainsCursor.getColumnIndexOrThrow(COOKIES) val domainDomStorageColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE) - val domainFormDataColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA) // Form data can be removed once the minimum API >= 26. val domainEasyListColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_EASYLIST) val domainEasyPrivacyColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY) val domainFanboysAnnoyanceListColumnIndex = importDomainsCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST) @@ -714,7 +707,6 @@ class ImportExportDatabaseHelper { domainContentValues.put(ENABLE_JAVASCRIPT, importDomainsCursor.getInt(domainJavaScriptColumnIndex)) domainContentValues.put(COOKIES, importDomainsCursor.getInt(domainCookiesColumnIndex)) domainContentValues.put(ENABLE_DOM_STORAGE, importDomainsCursor.getInt(domainDomStorageColumnIndex)) - domainContentValues.put(ENABLE_FORM_DATA, importDomainsCursor.getInt(domainFormDataColumnIndex)) // Form data can be removed once the minimum API >= 26. domainContentValues.put(ENABLE_EASYLIST, importDomainsCursor.getInt(domainEasyListColumnIndex)) domainContentValues.put(ENABLE_EASYPRIVACY, importDomainsCursor.getInt(domainEasyPrivacyColumnIndex)) domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, importDomainsCursor.getInt(domainFanboysAnnoyanceListColumnIndex)) @@ -763,7 +755,6 @@ class ImportExportDatabaseHelper { .putBoolean(JAVASCRIPT, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(JAVASCRIPT)) == 1) .putBoolean(COOKIES, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(COOKIES)) == 1) .putBoolean(DOM_STORAGE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(DOM_STORAGE)) == 1) - .putBoolean(SAVE_FORM_DATA, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(SAVE_FORM_DATA)) == 1) // Save form data can be removed once the minimum API >= 26. .putString(PREFERENCES_USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndexOrThrow(PREFERENCES_USER_AGENT))) .putString(CUSTOM_USER_AGENT, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndexOrThrow(CUSTOM_USER_AGENT))) .putBoolean(INCOGNITO_MODE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(INCOGNITO_MODE)) == 1) @@ -787,7 +778,6 @@ class ImportExportDatabaseHelper { .putBoolean(CLEAR_EVERYTHING, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_EVERYTHING)) == 1) .putBoolean(CLEAR_COOKIES, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_COOKIES)) == 1) .putBoolean(CLEAR_DOM_STORAGE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_DOM_STORAGE)) == 1) - .putBoolean(CLEAR_FORM_DATA, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_FORM_DATA)) == 1) // Clear form data can be removed once the minimum API >= 26. .putBoolean(CLEAR_LOGCAT, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_LOGCAT)) == 1) .putBoolean(CLEAR_CACHE, importPreferencesCursor.getInt(importPreferencesCursor.getColumnIndexOrThrow(CLEAR_CACHE)) == 1) .putString(HOMEPAGE, importPreferencesCursor.getString(importPreferencesCursor.getColumnIndexOrThrow(HOMEPAGE))) @@ -895,7 +885,6 @@ class ImportExportDatabaseHelper { val domainJavaScriptColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_JAVASCRIPT) val domainCookiesColumnIndex = domainsCursor.getColumnIndexOrThrow(COOKIES) val domainDomStorageColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_DOM_STORAGE) - val domainFormDataColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_FORM_DATA) // Form data can be removed once the minimum API >= 26. val domainEasyListColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_EASYLIST) val domainEasyPrivacyColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_EASYPRIVACY) val domainFanboysAnnoyanceListColumnIndex = domainsCursor.getColumnIndexOrThrow(ENABLE_FANBOYS_ANNOYANCE_LIST) @@ -931,7 +920,6 @@ class ImportExportDatabaseHelper { domainContentValues.put(ENABLE_JAVASCRIPT, domainsCursor.getInt(domainJavaScriptColumnIndex)) domainContentValues.put(COOKIES, domainsCursor.getInt(domainCookiesColumnIndex)) domainContentValues.put(ENABLE_DOM_STORAGE, domainsCursor.getInt(domainDomStorageColumnIndex)) - domainContentValues.put(ENABLE_FORM_DATA, domainsCursor.getInt(domainFormDataColumnIndex)) // Form data can be removed once the minimum API >= 26. domainContentValues.put(ENABLE_EASYLIST, domainsCursor.getInt(domainEasyListColumnIndex)) domainContentValues.put(ENABLE_EASYPRIVACY, domainsCursor.getInt(domainEasyPrivacyColumnIndex)) domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, domainsCursor.getInt(domainFanboysAnnoyanceListColumnIndex)) @@ -975,7 +963,6 @@ class ImportExportDatabaseHelper { "$JAVASCRIPT BOOLEAN, " + "$COOKIES BOOLEAN, " + "$DOM_STORAGE BOOLEAN, " + - "$SAVE_FORM_DATA BOOLEAN, " + "$PREFERENCES_USER_AGENT TEXT, " + "$CUSTOM_USER_AGENT TEXT, " + "$INCOGNITO_MODE BOOLEAN, " + @@ -999,7 +986,6 @@ class ImportExportDatabaseHelper { "$CLEAR_EVERYTHING BOOLEAN, " + "$CLEAR_COOKIES BOOLEAN, " + "$CLEAR_DOM_STORAGE BOOLEAN, " + - "$CLEAR_FORM_DATA BOOLEAN, " + "$CLEAR_LOGCAT BOOLEAN, " + "$CLEAR_CACHE BOOLEAN, " + "$HOMEPAGE TEXT, " + @@ -1028,7 +1014,6 @@ class ImportExportDatabaseHelper { preferencesContentValues.put(JAVASCRIPT, sharedPreferences.getBoolean(JAVASCRIPT, false)) preferencesContentValues.put(COOKIES, sharedPreferences.getBoolean(COOKIES, false)) preferencesContentValues.put(DOM_STORAGE, sharedPreferences.getBoolean(DOM_STORAGE, false)) - preferencesContentValues.put(SAVE_FORM_DATA, sharedPreferences.getBoolean(SAVE_FORM_DATA, false)) // Save form data can be removed once the minimum API >= 26. preferencesContentValues.put(PREFERENCES_USER_AGENT, sharedPreferences.getString(PREFERENCES_USER_AGENT, context.getString(R.string.user_agent_default_value))) preferencesContentValues.put(CUSTOM_USER_AGENT, sharedPreferences.getString(CUSTOM_USER_AGENT, context.getString(R.string.custom_user_agent_default_value))) preferencesContentValues.put(INCOGNITO_MODE, sharedPreferences.getBoolean(INCOGNITO_MODE, false)) @@ -1052,7 +1037,6 @@ class ImportExportDatabaseHelper { preferencesContentValues.put(CLEAR_EVERYTHING, sharedPreferences.getBoolean(CLEAR_EVERYTHING, true)) preferencesContentValues.put(CLEAR_COOKIES, sharedPreferences.getBoolean(CLEAR_COOKIES, true)) preferencesContentValues.put(CLEAR_DOM_STORAGE, sharedPreferences.getBoolean(CLEAR_DOM_STORAGE, true)) - preferencesContentValues.put(CLEAR_FORM_DATA, sharedPreferences.getBoolean(CLEAR_FORM_DATA, true)) // Clear form data can be removed once the minimum API >= 26. preferencesContentValues.put(CLEAR_LOGCAT, sharedPreferences.getBoolean(CLEAR_LOGCAT, true)) preferencesContentValues.put(CLEAR_CACHE, sharedPreferences.getBoolean(CLEAR_CACHE, true)) preferencesContentValues.put(HOMEPAGE, sharedPreferences.getString(HOMEPAGE, context.getString(R.string.homepage_default_value))) diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml deleted file mode 100644 index 90444f68..00000000 --- a/app/src/main/res/drawable/about.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/about_blue.xml b/app/src/main/res/drawable/about_blue.xml index 71035bcc..05b7570e 100644 --- a/app/src/main/res/drawable/about_blue.xml +++ b/app/src/main/res/drawable/about_blue.xml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/drawable/clear_form_data_disabled.xml b/app/src/main/res/drawable/clear_form_data_disabled.xml deleted file mode 100644 index 16aa9e73..00000000 --- a/app/src/main/res/drawable/clear_form_data_disabled.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/clear_form_data_enabled.xml b/app/src/main/res/drawable/clear_form_data_enabled.xml deleted file mode 100644 index 237d4b71..00000000 --- a/app/src/main/res/drawable/clear_form_data_enabled.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml deleted file mode 100644 index d4dbefa8..00000000 --- a/app/src/main/res/drawable/form_data_disabled.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml deleted file mode 100644 index 38096072..00000000 --- a/app/src/main/res/drawable/form_data_enabled.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml deleted file mode 100644 index 0914f14f..00000000 --- a/app/src/main/res/drawable/move_to_folder.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml index 5b143b0c..34cf2c3e 100644 --- a/app/src/main/res/layout/domain_settings_fragment.xml +++ b/app/src/main/res/layout/domain_settings_fragment.xml @@ -1,7 +1,7 @@ - - - - - - - - - - - - - - + + android:autofillHints="" /> diff --git a/app/src/main/res/menu/bookmarks_context_menu.xml b/app/src/main/res/menu/bookmarks_context_menu.xml index 66aa89ae..35f3461b 100644 --- a/app/src/main/res/menu/bookmarks_context_menu.xml +++ b/app/src/main/res/menu/bookmarks_context_menu.xml @@ -1,7 +1,7 @@ - - \ No newline at end of file + diff --git a/app/src/main/res/menu/domains_options_menu.xml b/app/src/main/res/menu/domains_options_menu.xml index 23d2dbb2..f16fa2b5 100644 --- a/app/src/main/res/menu/domains_options_menu.xml +++ b/app/src/main/res/menu/domains_options_menu.xml @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/app/src/main/res/menu/view_headers_options_menu.xml b/app/src/main/res/menu/view_headers_options_menu.xml index 5557ccf6..4cd8d33b 100644 --- a/app/src/main/res/menu/view_headers_options_menu.xml +++ b/app/src/main/res/menu/view_headers_options_menu.xml @@ -1,7 +1,7 @@ - Systemeinstellung - Formulardaten aktiviert - Formulardaten deaktiviert - Systemeinstellung EasyList aktiviert @@ -544,8 +534,6 @@ Sind Cookies im aktiven Tab aktiviert, sind diese auch fÃ¼r alle Netzwerk-Anfragen anderer Tabs im Hintergrund aktiviert. DOM-Speicher JavaScript muss aktiviert sein, damit der DOM-(Document Object Model)-Speicher funktioniert. - Formulardaten - Mit gespeicherten Formulardaten kÃ¶nnen Formularfelder auf Websites automatisch ausgefÃ¼llt werden. User Agent Privacy Browser @@ -639,14 +627,11 @@ Zeigt die Internetseite unterhalb von Ausschnitten wie etwa Kamera-Einbuchtungen. Ist diese Option aktiv, wrd Privacy Browser auch unterhalb der Tastatur dargestellt. Das Ãndern dieser Einstellung startet Privacy Browser neu. Alles lÃ¶schen - - LÃ¶scht Cookies, DOM-Storage, Formular-Daten, das Logcat Systemlogbuch und den WebView-Cache, sowie die gesamten âapp_webviewâ- und âcacheâ-Ordner. + LÃ¶scht Cookies, DOM-Storage, das Logcat Systemlogbuch und den WebView-Cache, sowie die gesamten âapp_webviewâ- und âcacheâ-Ordner. Cookies lÃ¶schen LÃ¶scht Cookies. DOM Storage lÃ¶schen LÃ¶scht DOM storage (aka Web Storage oder Supercookies). - Formulardaten lÃ¶schen - LÃ¶scht in Formulare eingegebene Daten. Logcat leeren Leert das Logcat Systemlogbuch. Cache lÃ¶schen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3d250717..c8dec3c7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -36,11 +36,8 @@ Cookies deshabilitadas Almacenamiento DOM habilitado Almacenamiento DOM deshabilitado - Datos de formulario habilitados - Datos de formulario deshabilitados Cookies borradas Almacenamiento DOM borrado - Datos de formulario borrado Abrir la caja de navegaciÃ³n Cerrar la caja de navegaciÃ³n Fijar el cajÃ³n @@ -135,11 +132,9 @@ Parar Cookies Almacenamiento DOM - Datos de formulario Borrar datos Borrar cookies Borrar almacenamiento DOM - Borrar datos de formulario Lista molesta de Fanboy Lista de bloqueo social de Fanboy Bloquear todas las solicitudes de terceros @@ -361,11 +356,6 @@ Almacenamiento DOM habilitado Almacenamiento DOM deshabilitado - - Por defecto del sistema - Datos de formulario habilitados - Datos de formulario deshabilitados -

Por defecto del sistema EasyList habilitada @@ -547,8 +537,6 @@ Cuando la pestaÃ±a activa tiene las cookies habilitadas, cualquier solicitud de red realizada en segundo plano por otra pestaÃ±a tambiÃ©n tiene las cookies habilitadas. Almacenamiento DOM JavaScript debe estar activado para que el almacenamiento del Modelo de Objetos del Documento funcione. - Datos de formulario - Los datos de formularios guardados pueden rellenar automÃ¡ticamente las casillas o campos de las webs. Agente de usuario Navegador Privado @@ -642,15 +630,11 @@ Mostrar el sitio web bajo los recortes, como las muescas de la cÃ¡mara. Cuando estÃ¡ opciÃ³n estÃ¡ activada, Navegador Privado tambiÃ©n se dibujarÃ¡ bajo el teclado. Al cambiar esta configuraciÃ³n se reiniciarÃ¡ Navegador Privado. Borrar todo - - Borra cookies, almacenamiento DOM, datos de formulario, el logcat y la cachÃ© de WebView. - A continuaciÃ³n borra manualmente los directorios âapp_webviewâ y âcacheâ. + Borra cookies, almacenamiento DOM, el logcat y la cachÃ© de WebView. A continuaciÃ³n borra manualmente los directorios âapp_webviewâ y âcacheâ. Borrar cookies Borra las cookies. Borrar almacenamiento DOM Borra el almacenamiento DOM. - Borrar datos de formulario - Borra los datos de formulario. Borrar logcat Borra el logcat. Borrar cachÃ© diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e2518fa0..d9bd0976 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -36,11 +36,8 @@ Cookies dÃ©sactivÃ©s Stockage du DOM activÃ© Stockage du DOM dÃ©sactivÃ© - DonnÃ©es de formulaires activÃ© - DonnÃ©es de formulaires dÃ©sactivÃ© Cookies supprimÃ©s Stockage du DOM supprimÃ© - DonnÃ©es de formulaires supprimÃ©es Ouvrir le panneau de navigation Fermer le panneau de navigation Ãpingler le panneau @@ -135,11 +132,9 @@ Stop Cookies Stockage DOM - Formulaire de donnÃ©es Effacer les donnÃ©es Effacer les cookies Effacer le stockage du DOM - Effacer les donnÃ©es de formulaire Fanboyâs Annoyance List Fanboyâs Social Blocking List Bloquer toutes les requÃªtes tierces parties @@ -360,11 +355,6 @@ Stockage du DOM activÃ© Stockage du DOM dÃ©sactivÃ© - - Valeur systÃ¨me - DonnÃ©es de formulaire activÃ©es - DonnÃ©es de formulaire dÃ©sactivÃ©es -

Valeur systÃ¨me EasyList activÃ© @@ -544,8 +534,6 @@ toute requÃªte rÃ©seau effectuÃ©e en arriÃ¨re-plan par un autre onglet a Ã©galement les cookies activÃ©s. Stockage du DOM JavaScript doit Ãªtre activÃ© pour que le stockage du Document Object Model fonctionne. - Formulaire de donnÃ©es - Les formulaires de donnÃ©es sauvegardÃ©s peuvent remplir automatiquement des champs sur les sites web. User agent Privacy Browser @@ -639,15 +627,11 @@ Affiche le site web sous les Ã©lÃ©ments dÃ©coupÃ©s, tels que les encoches d\'appareil photo. Lorsque ce paramÃ¨tre est activÃ©, Privacy Browser sera Ã©galement affichÃ© sous le clavier. La modification de ce paramÃ¨tre entraÃ®nera le redÃ©marrage de Privacy Browser. Tout effacer - - Efface les cookies, le stockage DOM, les donnÃ©es de formulaire, le logcat et le cache de WebView. - Supprime ensuite manuellement les rÃ©pertoires entiers Â«app_webviewÂ» et Â«cacheÂ». + Efface les cookies, le stockage DOM, le logcat et le cache de WebView. Supprime ensuite manuellement les rÃ©pertoires entiers Â«app_webviewÂ» et Â«cacheÂ». Effacer les cookies Efface les cookies. Effacer le stockage DOM Efface le stockage du DOM. - Effacer les donnÃ©es de formulaire - Efface les donnÃ©es de formulaire. Vider logcat Vide le logcat. Effacer cache diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ec164bc1..e1bcff0f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -36,11 +36,8 @@ Cookies disabilitati DOM Storage abilitato DOM Storage disabilitato - Dati dei Moduli abilitati - Dati dei Moduli disabilitati Cookies eliminati DOM Storage eliminato - Dati dei Moduli eliminati Apri il menu di navigazione Chiudi il menu di navigazione Fissa il cassetto @@ -135,11 +132,9 @@ Stop Cookies DOM storage - Dati dei moduli Elimina dati Elimina cookies Elimina DOM storage - Elimina dati dei moduli Fanboyâs annoyance list Fanboyâs social blocking list Blocca tutte le richieste di Terze Parti @@ -360,11 +355,6 @@ DOM storage abilitato DOM storage disabilitato - - Default di Sistema - Dati dei Form abilitati - Dati dei Form disabilitati -

Default di Sistema EasyList abilitata @@ -546,8 +536,6 @@ Quando la scheda attiva ha i cookies abilitati, anche ogni altra richiesta di rete effettuata in background da altre schede ha i cookies abilitati. DOM Storage JavaScript deve essere abilitato per permettere il funzionamento del Document Object Model storage. - Dati dei moduli - I dati dei moduli salvati permettono di auto-compilare i campi dei moduli nei siti web. User agent

Privacy Browser @@ -642,14 +630,11 @@ Visualizza il sito web sotto i ritagli dello schermo come quello della fotocamera. Quando questa opzione Ã¨ abilitata, Privacy Browser sarÃ anche visualizzato sotto alla tastiera. La modifica di questa impostazione provoca il riavvio di Privacy Browser. Elimina tutto - - Cancella i cookies, il DOM storage, i dati dei moduli, il logcat e la cache di WebView. Cancella completamente le cartelle âapp_webviewâ e âcacheâ. + Cancella i cookies, il DOM storage, il logcat e la cache di WebView. Cancella completamente le cartelle âapp_webviewâ e âcacheâ. Elimina i cookie Cancella i cookies. Elimina il DOM storage Cancella solo il DOM storage. - Elimina i dati dei moduli - Cancella solo i dati dei moduli. Elimina il logcat Cancella il logcat. Elimina la cache diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 10999f0a..d50014b7 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -36,11 +36,8 @@ Cookies desativados Armazenamento DOM ativado Armazenamento DOM desativado - Dados de formulÃ¡rio habilitados - Dados de formulÃ¡rio desabilitados Cookies excluÃdos Armazenamento DOM excluÃdo - Dados do formulÃ¡rio excluÃdos Abrir a caixa de navegaÃ§Ã£o Fechar a caixa de navegaÃ§Ã£o URL desconhecida:\u0020 %1$s @@ -129,11 +126,9 @@ Parar Cookies Armazenamento DOM - Dados do formulÃ¡rio Limpar dados Limpar Cookies Limpar Armazenamento DOM - Clear Form Data Lista de Aborrecimento Fanboyâs Lista de bloqueio social Fanboyâs Bloquear todas as solicitaÃ§Ãµes de terceiros @@ -435,9 +430,6 @@ Quando a guia ativa tem cookies habilitados, qualquer solicitaÃ§Ã£o de rede feita em segundo plano por outra guia tambÃ©m tem cookies habilitados. Armazenamento DOM O JavaScript deve estar habilitado para que o armazenamento do Document Object Model funcione. - Dados do formulÃ¡rio - Dados de formulÃ¡rio salvos podem preencher campos automaticamente em sites. - Agente do usuÃ¡rio Privacy Browser @@ -521,14 +513,11 @@ Ocultar a barra de aplicativos Oculte a barra de aplicativos que contÃ©m o URL. Limpar tudo - - Limpa cookies, armazenamento DOM, dados de formulÃ¡rio e cache do WebView. Em seguida, exclui manualmente todos os diretÃ³rios âapp_webviewâ e âcacheâ. + Limpa cookies, armazenamento DOM, e cache do WebView. Em seguida, exclui manualmente todos os diretÃ³rios âapp_webviewâ e âcacheâ. Limpar cookies Limpar os cookies. Limpar armazenamento DOM Limpa o armazenamento DOM. - Limpar dados do formulÃ¡rio - Limpa os dados do formulÃ¡rio. Limpar Logcat Limpar os Logcats. Limpar cache diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5f633b3a..19b25cc6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -34,11 +34,8 @@ Cookie Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¾ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ Ð²ÐºÐ»ÑÑÐµÐ½Ñ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ Ð¤Ð°Ð¹Ð»Ñ cookie ÑÐ´Ð°Ð»ÐµÐ½Ñ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ ÑÐ´Ð°Ð»ÐµÐ½Ð¾ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ñ ÐÑÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¸ ÐÐ°ÐºÑÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ Ð½Ð°Ð²Ð¸Ð³Ð°ÑÐ¸Ð¸ ÐÐ°ÐºÑÐµÐ¿Ð¸ÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ @@ -132,11 +129,9 @@ ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Cookie DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ ÐÑÐ¸ÑÑÐ¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÐÑÐ¸ÑÑÐ¸ÑÑ cookie ÐÑÐ¸ÑÑÐ¸ÑÑ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ - ÐÑÐ¸ÑÑÐ¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ Fanboyâs annoyance list Fanboyâs social blocking list ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð²ÑÐµ ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÑ @@ -357,11 +352,6 @@ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð¾ - - ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼ Ð²ÐºÐ»ÑÑÐµÐ½Ñ - ÐÐ°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼ Ð¾ÑÐºÐ»ÑÑÐµÐ½Ñ -

Privacy Browser @@ -638,14 +626,11 @@ ÐÑÑÐ¸ÑÐ¾Ð²ÑÐ²Ð°ÑÑ ÑÐ°Ð¹Ñ Ð¿Ð¾Ð´ Ð²ÑÑÐµÐ·Ð°Ð¼Ð¸, Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð¿Ð¾Ð´ ÐºÐ°Ð¼ÐµÑÐ¾Ð¹. ÐÑÐ»Ð¸ ÑÑÐ° Ð¾Ð¿ÑÐ¸Ñ Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Privacy Browser ÑÐ°ÐºÐ¶Ðµ Ð±ÑÐ´ÐµÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð¿Ð¾Ð´ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ¾Ð¹. ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¹ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐºÑ Privacy Browser. ÐÑÐ¸ÑÑÐ¸ÑÑ Ð²ÑÐµ - - ÐÑÐ¸ÑÐ°ÐµÑ cookie, DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ, Ð´Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼, logcat Ð¸ ÐºÑÑ WebView. ÐÐ¾ÑÐ»Ðµ ÑÑÐ¾Ð³Ð¾ Ð²ÑÑÑÐ½ÑÑ ÑÐ´Ð°Ð»ÑÐµÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ "app_webview" Ð¸ "cache". + ÐÑÐ¸ÑÐ°ÐµÑ cookie, DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ, logcat Ð¸ ÐºÑÑ WebView. ÐÐ¾ÑÐ»Ðµ ÑÑÐ¾Ð³Ð¾ Ð²ÑÑÑÐ½ÑÑ ÑÐ´Ð°Ð»ÑÐµÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¸ "app_webview" Ð¸ "cache". ÐÑÐ¸ÑÑÐ¸ÑÑ cookie ÐÑÐ¸ÑÐ°ÐµÑ cookie. ÐÑÐ¸ÑÑÐ¸ÑÑ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ ÐÑÐ¸ÑÐ°ÐµÑ DOM-ÑÑÐ°Ð½Ð¸Ð»Ð¸ÑÐµ. - ÐÑÐ¸ÑÑÐºÐ° Ð´Ð°Ð½Ð½ÑÑ ÑÐ¾ÑÐ¼Ñ - ÐÑÐ¸ÑÐ°ÐµÑ Ð´Ð°Ð½Ð½ÑÐµ ÑÐ¾ÑÐ¼Ñ. ÐÑÐ¸ÑÑÐ¸ÑÑ logcat ÐÑÐ¸ÑÐ°ÐµÑ logcat. ÐÑÐ¸ÑÑÐ¸ÑÑ ÐºÑÑ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 352c2996..45658be0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,7 +1,7 @@ - Form Verisi devre dÄ±ÅÄ± Ãerezler silindi DOM Depolama silindi - Form Verisi silindi Gezinti MenÃ¼sÃ¼nÃ¼ aÃ§ Gezinti MenÃ¼sÃ¼nÃ¼ kapa OnaylanmamÄ±Å URL:\u0020 %1$s @@ -120,11 +117,9 @@ Yenile Dur DOM Depolama - Form Verisi Veriyi temizle Ãerezleri temizle DOM DepolamayÄ± temizle - Form Verisini temizle Fanboyâs Annoyance List Fanboyâs Social Blocking List TÃ¼m ÃÃ§Ã¼ncÃ¼ Taraf Ä°stekleri engelle @@ -369,8 +364,6 @@ Gizlilik JavaScript, web sitelerin cihazdaki programlarÄ± (scriptler) Ã§alÄ±ÅtÄ±rmasÄ±na izin verir. DOM depolama - Form verisi - Kaydedilen form verisi, web sitelerdeki boÅluklarÄ± otomatik olarak dolduracaktÄ±r. KullanÄ±cÄ± aracÄ±sÄ±

Privacy Browser @@ -434,12 +427,10 @@ Uygulama Ã§ubuÄunu gizle URL iÃ§eren uygulama Ã§ubuÄunu gizler. Her Åeyi temizle - Ãerezleri, DOM depolamayÄ±, form verisini ve WebView Ã¶n belleÄini temizler. SonrasÄ±nda, manuel olarak bÃ¼tÃ¼n âapp_webviewâ ve âcacheâ dizinlerini siler. + Ãerezleri, DOM depolamayÄ±, ve WebView Ã¶n belleÄini temizler. SonrasÄ±nda, manuel olarak bÃ¼tÃ¼n âapp_webviewâ ve âcacheâ dizinlerini siler. Ãerezleri temizle DOM DepolamayÄ± temizle DOM DepolamayÄ± temizler. - Form verisini temizle - Form verisini temizler. ÃnbelleÄi temizle WebView Ã¶nbelleÄini temizler. Genel diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cd165b6a..47c69780 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -40,11 +40,8 @@ å³é Cookies å¼å¯ DOM å¨å å³é DOM å¨å - å¯ç¨è¡¨åæ°æ® - å³éè¡¨åæ°æ® å é¤ Cookies å é¤ DOM å¨å - å é¤è¡¨åæ°æ® æå¼å¯¼èªæ å³éå¯¼èªæ å¼èæ @@ -134,11 +131,9 @@ æå Cookies DOM å¨å - è¡¨åæ°æ® æ¸ç©ºæ°æ® æ¸ç©º Cookies æ¸ç©º DOM å¨å - æ¸æ¥è¡¨åæ°æ® Fanboyâs Annoyance List Fanboyâs Social Blocking List é»æ¢ææç¬¬ä¸æ¹è¯·æ± @@ -439,8 +434,6 @@ Cookies æ¯åºç¨ç¨åºçº§çè®¾ç½®ï¼å½æ´»å¨çé¡µé¢åè®¸cookiesï¼åå°çå¶ä»è¯·æ±ç½ç»çé¡µé¢ä¹åè®¸cookies. DOM å¨å JavaScript å¿é¡»å¯ç¨ï¼DOMæè½å·¥ä½. - ä¿åè¡¨åæ°æ® - ä¿åçè¡¨åæ°æ®å¯ä»¥èªå¨å¡«åç½é¡µçä¸äºåæ®µ. User agent Privacy Browser @@ -523,14 +516,10 @@ éèåºç¨æ éèåå«URLçåºç¨æ . æ¸é¤ææ - - æ¸é¤cookies,DOMå¨å,è¡¨åæ°æ®,æ¥å¿,WebViewç¼åï¼ä¹åæå¨å é¤app_WebViewç¼å æ¸é¤ cookies æ¸é¤ cookies. æ¸é¤ DOM å¨å æ¸é¤ DOM å¨å. - æ¸é¤è¡¨åæ°æ® - æ¸é¤è¡¨åæ°æ®. æ¸é¤æ¥å¿ æ¸é¤æ¥å¿. æ¸é¤ç¼å diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ece00cd..c44f2ed2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,11 +42,8 @@ Cookies disabled DOM Storage enabled DOM Storage disabled - Form Data enabled - Form Data disabled Cookies deleted DOM Storage deleted - Form Data deleted Open navigation drawer Close navigation drawer Pin drawer @@ -140,11 +137,9 @@ Stop Cookies DOM Storage - Form Data Clear Data Clear Cookies Clear DOM Storage - Clear Form Data Fanboyâs Annoyance List Fanboyâs Social Blocking List Block All Third-Party Requests @@ -374,11 +369,6 @@ DOM storage enabled DOM storage disabled - - System default - Form data enabled - Form data disabled -

System default EasyList enabled @@ -562,8 +552,6 @@ When the active tab has cookies enabled, any network request made in the background by another tab also has cookies enabled. DOM storage JavaScript must be enabled for Document Object Model storage to function. - Form data - Saved form data can auto-populate fields on websites. User agent

Privacy Browser @@ -703,14 +691,11 @@ Draw the website under cutouts, like camera notches. When this is enabled, Privacy Browser will also be drawn under the keyboard. Changing this setting will restart Privacy Browser. Clear everything - - Clears cookies, DOM storage, form data, the logcat, and WebViewâs cache. Then manually deletes the entire âapp_webviewâ and âcacheâ directories. + Clears cookies, DOM storage, the logcat, and WebViewâs cache. Then manually deletes the entire âapp_webviewâ and âcacheâ directories. Clear cookies Clears cookies. Clear DOM storage Clears DOM storage. - Clear form data - Clears form data. Clear logcat Clears the logcat. Clear cache @@ -785,7 +770,6 @@ clear_cookies clear_dom_storage clear_everything - clear_form_data clear_logcat custom_user_agent display_additional_app_bar_icons @@ -808,7 +792,6 @@ privacy proxy proxy_custom_url - save_form_data scroll_app_bar search_custom_url search diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 2e106fd5..85fb5e8e 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -44,13 +44,6 @@ app:summary="@string/dom_storage_preference_summary" app:defaultValue="false" /> - - - - - -

3.17 (Version Code 73)

3.17 (version code 73)

3.17 (cÃ³digo de versiÃ³n 73)

3.17 (version du code 73)

3.17 (versione codice 73)

3.17 (cÃ³digo de versÃ£o 73)

3.17 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 73)

3.17 (version code 73)

3.17 (version code 73)

3.17 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 73)