Contributors

From c8b11d2b76391db47bdd6d5289e2668147cf177a Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 12 Apr 2024 14:30:17 -0700 Subject: [PATCH 1/9] First wrong button text in View Headers in night theme. https://redmine.stoutner.com/issues/1191 --- .../BookmarksDatabaseViewActivity.kt | 7 ++-- .../activities/LogcatActivity.kt | 14 +++---- .../activities/ViewHeadersActivity.kt | 21 +++------- .../res/color/button_background_selector.xml | 6 +-- .../main/res/color/button_text_selector.xml | 6 +-- .../main/res/color/checked_text_selector.xml | 6 +-- .../main/res/color/yellow_icon_selector.xml | 6 +-- app/src/main/res/layout/url_app_bar.xml | 2 +- .../view_headers_appbar_custom_view.xml | 42 +++++-------------- .../res/layout/view_headers_bottom_appbar.xml | 4 +- .../res/layout/view_headers_top_appbar.xml | 4 +- build.gradle | 2 +- 12 files changed, 45 insertions(+), 75 deletions(-) diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt index b9f161e8..9804e5f5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt @@ -1,7 +1,7 @@ /* * Copyright 2016-2024 Soren Stoutner . * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -104,9 +104,8 @@ class BookmarksDatabaseViewActivity : AppCompatActivity(), EditBookmarkDatabaseV val bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false) // Disable screenshots if not allowed. - if (!allowScreenshots) { + if (!allowScreenshots) window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) - } // Run the default commands. super.onCreate(savedInstanceState) @@ -129,7 +128,7 @@ class BookmarksDatabaseViewActivity : AppCompatActivity(), EditBookmarkDatabaseV setContentView(R.layout.bookmarks_databaseview_top_appbar) } - // Get a handle for the toolbar. + // Get handles for the views. val toolbar = findViewById(R.id.bookmarks_databaseview_toolbar) bookmarksListView = findViewById(R.id.bookmarks_databaseview_listview) 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 214ebf21..a0e5ad8a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt @@ -246,7 +246,7 @@ class LogcatActivity : AppCompatActivity() { override fun onOptionsItemSelected(menuItem: MenuItem): Boolean { // Run the commands that correlate to the selected menu item. - return when (menuItem.itemId) { + when (menuItem.itemId) { R.id.search -> { // Search was selected. // Set the minimum height of the search linear layout to match the toolbar. searchLinearLayout.minimumHeight = toolbar.height @@ -273,7 +273,7 @@ class LogcatActivity : AppCompatActivity() { logcatWebView.resumeTimers() // Consume the event. - true + return true } R.id.copy -> { // Copy was selected. @@ -291,7 +291,7 @@ class LogcatActivity : AppCompatActivity() { Snackbar.make(logcatWebView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show() // Consume the event. - true + return true } R.id.save -> { // Save was selected. @@ -299,7 +299,7 @@ class LogcatActivity : AppCompatActivity() { saveLogcatActivityResultLauncher.launch(getString(R.string.privacy_browser_logcat_txt, BuildConfig.VERSION_NAME)) // Consume the event. - true + return true } R.id.clear -> { // Clear was selected. @@ -317,12 +317,12 @@ class LogcatActivity : AppCompatActivity() { } // Consume the event. - true + return true } - else -> { // The home button was pushed. + else -> { // The home button was selected. // Do not consume the event. The system will process the home command. - super.onOptionsItemSelected(menuItem) + return super.onOptionsItemSelected(menuItem) } } } 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 8a0cc653..8e72b596 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt @@ -46,7 +46,6 @@ import androidx.appcompat.app.ActionBar import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.app.NavUtils import androidx.lifecycle.ViewModelProvider import androidx.preference.PreferenceManager import androidx.swiperefreshlayout.widget.SwipeRefreshLayout @@ -152,9 +151,8 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener val bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false) // Disable screenshots if not allowed. - if (!allowScreenshots) { + if (!allowScreenshots) window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) - } // Run the default commands. super.onCreate(savedInstanceState) @@ -167,11 +165,10 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener val userAgent = intent.getStringExtra(USER_AGENT)!! // Set the content view. - if (bottomAppBar) { + if (bottomAppBar) setContentView(R.layout.view_headers_bottom_appbar) - } else { + else setContentView(R.layout.view_headers_top_appbar) - } // Get a handle for the toolbar. val toolbar = findViewById(R.id.toolbar) @@ -186,7 +183,7 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener actionBar.setCustomView(R.layout.view_headers_appbar_custom_view) // Instruct the action bar to display a custom layout. - actionBar.displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM + actionBar.displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM or ActionBar.DISPLAY_HOME_AS_UP // Get handles for the views. urlEditText = findViewById(R.id.url_edittext) @@ -427,7 +424,7 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener } override fun onOptionsItemSelected(menuItem: MenuItem): Boolean { - // Run the appropriate commands. + // Run the commands that correlate to the selected menu item. when (menuItem.itemId) { R.id.copy_headers -> { // Copy the headers. // Get the headers string. @@ -502,18 +499,12 @@ class ViewHeadersActivity: AppCompatActivity(), UntrustedSslCertificateListener } else -> { // The home button was selected. - // Run the parents class on return. + // Do not consume the event. The system will process the home command. return super.onOptionsItemSelected(menuItem) } } } - // This method must be named `goBack()` and must have a View argument to match the default back arrow in the app bar or a crash occurs. - fun goBack(@Suppress("UNUSED_PARAMETER") view: View) { - // Go home. - NavUtils.navigateUpFromSameTask(this) - } - private fun getHeadersString(): String { // Initialize a headers string builder. val headersStringBuilder = StringBuilder() diff --git a/app/src/main/res/color/button_background_selector.xml b/app/src/main/res/color/button_background_selector.xml index a21d2724..dbb36f95 100644 --- a/app/src/main/res/color/button_background_selector.xml +++ b/app/src/main/res/color/button_background_selector.xml @@ -1,9 +1,9 @@ - - + - - - - - - + android:layout_width="match_parent" + android:hint="@string/url" + android:imeOptions="actionGo" + android:inputType="textUri" + android:selectAllOnFocus="true" + tools:ignore="Autofill" /> diff --git a/app/src/main/res/layout/view_headers_bottom_appbar.xml b/app/src/main/res/layout/view_headers_bottom_appbar.xml index 0219c09a..7dbab777 100644 --- a/app/src/main/res/layout/view_headers_bottom_appbar.xml +++ b/app/src/main/res/layout/view_headers_bottom_appbar.xml @@ -100,7 +100,7 @@ android:text="@string/ciphers" android:onClick="showCiphers" app:backgroundTint="@color/button_background_selector" - android:textColor="@color/button_text_selector" + android:textColor="@color/white" tools:ignore="ButtonStyle" /> diff --git a/app/src/main/res/layout/view_headers_top_appbar.xml b/app/src/main/res/layout/view_headers_top_appbar.xml index 588ff6b7..34207a5b 100644 --- a/app/src/main/res/layout/view_headers_top_appbar.xml +++ b/app/src/main/res/layout/view_headers_top_appbar.xml @@ -122,7 +122,7 @@ android:text="@string/ciphers" android:onClick="showCiphers" app:backgroundTint="@color/button_background_selector" - android:textColor="@color/button_text_selector" + android:textColor="@color/white" tools:ignore="ButtonStyle" /> diff --git a/build.gradle b/build.gradle index c390d1f0..8573ba5c 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.1' + classpath 'com.android.tools.build:gradle:8.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" // NOTE: Do not place your application dependencies here; they belong -- 2.45.2 From f40bd0b76668119cdf4043f1fafecafb1a0869b9 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 23 May 2024 14:26:54 -0700 Subject: [PATCH 2/9] Fix some files not being displayed in the file picker. https://redmine.stoutner.com/issues/1197 --- app/build.gradle | 10 ++-- .../activities/BookmarksActivity.kt | 12 ++--- .../BookmarksDatabaseViewActivity.kt | 8 ++-- .../activities/DomainsActivity.kt | 20 ++++---- .../activities/ImportExportActivity.kt | 32 ++++++------- .../activities/LogcatActivity.kt | 6 +-- .../activities/MainWebViewActivity.kt | 47 ++++++++----------- .../activities/RequestsActivity.kt | 10 ++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 10 files changed, 70 insertions(+), 79 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 900ddf9b..b69d2c95 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,23 +82,23 @@ android { dependencies { // Include the following AndroidX libraries. - implementation "androidx.activity:activity-ktx:1.8.2" + implementation "androidx.activity:activity-ktx:1.9.0" implementation 'androidx.arch.core:core-common:2.2.0' implementation 'androidx.arch.core:core-runtime:2.2.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' - implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.core:core-ktx:1.13.1' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' - implementation 'androidx.webkit:webkit:1.10.0' + implementation 'androidx.webkit:webkit:1.11.0' // Include the Kotlin standard library. This should be the same version number listed in project build.gradle. implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20' // Include the Google material library. - implementation 'com.google.android.material:material:1.11.0' + implementation 'com.google.android.material:material:1.12.0' } diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.kt index fe7d0808..343f8e9a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.kt @@ -1,7 +1,7 @@ /* * Copyright 2016-2024 Soren Stoutner . * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -627,9 +627,9 @@ class BookmarksActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBookma } } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Get the sparse boolean array of the checked items. val checkedBookmarksSparseBooleanArray = bookmarksListView.checkedItemPositions @@ -646,9 +646,9 @@ class BookmarksActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBookma } } - // Store the variables in the saved instance state. - savedInstanceState.putLong(CURRENT_FOLDER_ID, currentFolderId) - savedInstanceState.putIntegerArrayList(CHECKED_BOOKMARKS_ARRAY_LIST, checkedBookmarksArrayList) + // Store the variables in the out state. + outState.putLong(CURRENT_FOLDER_ID, currentFolderId) + outState.putIntegerArrayList(CHECKED_BOOKMARKS_ARRAY_LIST, checkedBookmarksArrayList) } override fun onCreateOptionsMenu(menu: Menu): Boolean { diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt index 9804e5f5..4199dd4e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksDatabaseViewActivity.kt @@ -632,13 +632,13 @@ class BookmarksDatabaseViewActivity : AppCompatActivity(), EditBookmarkDatabaseV return true } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Store the class variables in the bundle. - savedInstanceState.putInt(CURRENT_FOLDER_DATABASE_ID, currentFolderDatabaseId) - savedInstanceState.putBoolean(SORT_BY_DISPLAY_ORDER, sortByDisplayOrder) + outState.putInt(CURRENT_FOLDER_DATABASE_ID, currentFolderDatabaseId) + outState.putBoolean(SORT_BY_DISPLAY_ORDER, sortByDisplayOrder) } override fun saveBookmark(dialogFragment: DialogFragment, selectedBookmarkDatabaseId: Int) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt index 4996568e..e0e06876 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.kt @@ -1,7 +1,7 @@ /* * Copyright 2017-2024 Soren Stoutner . * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -603,9 +603,9 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI return true } - override fun onSaveInstanceState(savedInstanceState: Bundle) { + override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Get a handle for the domain settings scrollview. val domainSettingsScrollView = findViewById(R.id.domain_settings_scrollview) @@ -613,9 +613,9 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI // Check to see if the domain settings scrollview exists. if (domainSettingsScrollView == null) { // The domain settings are not displayed. // Store the domain settings status in the bundle. - savedInstanceState.putBoolean(DOMAIN_SETTINGS_DISPLAYED, false) - savedInstanceState.putInt(DOMAIN_SETTINGS_DATABASE_ID, -1) - savedInstanceState.putInt(DOMAIN_SETTINGS_SCROLL_Y, 0) + outState.putBoolean(DOMAIN_SETTINGS_DISPLAYED, false) + outState.putInt(DOMAIN_SETTINGS_DATABASE_ID, -1) + outState.putInt(DOMAIN_SETTINGS_SCROLL_Y, 0) } else { // The domain settings are displayed. // Save any changes that have been made to the domain settings. saveDomainSettings(coordinatorLayout) @@ -624,9 +624,9 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI val domainSettingsScrollY = domainSettingsScrollView.scrollY // Store the domain settings status in the bundle. - savedInstanceState.putBoolean(DOMAIN_SETTINGS_DISPLAYED, true) - savedInstanceState.putInt(DOMAIN_SETTINGS_DATABASE_ID, DomainSettingsFragment.databaseId) - savedInstanceState.putInt(DOMAIN_SETTINGS_SCROLL_Y, domainSettingsScrollY) + outState.putBoolean(DOMAIN_SETTINGS_DISPLAYED, true) + outState.putInt(DOMAIN_SETTINGS_DATABASE_ID, DomainSettingsFragment.databaseId) + outState.putInt(DOMAIN_SETTINGS_SCROLL_Y, domainSettingsScrollY) } // Check to see if the domains listview exists. @@ -635,7 +635,7 @@ class DomainsActivity : AppCompatActivity(), AddDomainListener, DismissSnackbarI val domainsListViewPosition = domainsListView!!.firstVisiblePosition // Store the listview position in the bundle. - savedInstanceState.putInt(LISTVIEW_POSITION, domainsListViewPosition) + outState.putInt(LISTVIEW_POSITION, domainsListViewPosition) } } diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt index 36d1e725..77019932 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ImportExportActivity.kt @@ -1,7 +1,7 @@ /* - * Copyright 2018-2023 Soren Stoutner . + * Copyright 2018-2024 Soren Stoutner . * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -452,25 +452,25 @@ class ImportExportActivity : AppCompatActivity() { } } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Save the visibility of the views. - savedInstanceState.putInt(ENCRYPTION_PASSWORD_TEXTINPUTLAYOUT_VISIBILITY, encryptionPasswordTextInputLayout.visibility) - savedInstanceState.putInt(OPEN_KEYCHAIN_REQUIRED_TEXTVIEW_VISIBILITY, openKeychainRequiredTextView.visibility) - savedInstanceState.putInt(SETTINGS_FILE_LOCATION_CARDVIEW_VISIBILITY, settingsFileLocationCardView.visibility) - savedInstanceState.putInt(SETTINGS_FILE_NAME_LINEARLAYOUT_VISIBILITY, settingsFileNameLinearLayout.visibility) - savedInstanceState.putInt(OPEN_KEYCHAIN_IMPORT_INSTRUCTIONS_TEXTVIEW_VISIBILITY, openKeychainImportInstructionsTextView.visibility) - savedInstanceState.putInt(SETTINGS_IMPORT_EXPORT_BUTTON_VISIBILITY, settingsImportExportButton.visibility) - savedInstanceState.putInt(BOOKMARKS_FILE_NAME_LINEARLAYOUT_VISIBILITY, bookmarksFileNameLinearLayout.visibility) - savedInstanceState.putInt(BOOKMARKS_IMPORT_EXPORT_BUTTON_VISIBILITY, bookmarksImportExportButton.visibility) + outState.putInt(ENCRYPTION_PASSWORD_TEXTINPUTLAYOUT_VISIBILITY, encryptionPasswordTextInputLayout.visibility) + outState.putInt(OPEN_KEYCHAIN_REQUIRED_TEXTVIEW_VISIBILITY, openKeychainRequiredTextView.visibility) + outState.putInt(SETTINGS_FILE_LOCATION_CARDVIEW_VISIBILITY, settingsFileLocationCardView.visibility) + outState.putInt(SETTINGS_FILE_NAME_LINEARLAYOUT_VISIBILITY, settingsFileNameLinearLayout.visibility) + outState.putInt(OPEN_KEYCHAIN_IMPORT_INSTRUCTIONS_TEXTVIEW_VISIBILITY, openKeychainImportInstructionsTextView.visibility) + outState.putInt(SETTINGS_IMPORT_EXPORT_BUTTON_VISIBILITY, settingsImportExportButton.visibility) + outState.putInt(BOOKMARKS_FILE_NAME_LINEARLAYOUT_VISIBILITY, bookmarksFileNameLinearLayout.visibility) + outState.putInt(BOOKMARKS_IMPORT_EXPORT_BUTTON_VISIBILITY, bookmarksImportExportButton.visibility) // Save the text. - savedInstanceState.putString(SETTINGS_FILE_NAME_TEXT, settingsFileNameEditText.text.toString()) - savedInstanceState.putString(SETTINGS_IMPORT_EXPORT_BUTTON_TEXT, settingsImportExportButton.text.toString()) - savedInstanceState.putString(BOOKMARKS_FILE_NAME_TEXT, bookmarksFileNameEditText.text.toString()) - savedInstanceState.putString(BOOKMARKS_IMPORT_EXPORT_BUTTON_VISIBILITY, bookmarksImportExportButton.text.toString()) + outState.putString(SETTINGS_FILE_NAME_TEXT, settingsFileNameEditText.text.toString()) + outState.putString(SETTINGS_IMPORT_EXPORT_BUTTON_TEXT, settingsImportExportButton.text.toString()) + outState.putString(BOOKMARKS_FILE_NAME_TEXT, bookmarksFileNameEditText.text.toString()) + outState.putString(BOOKMARKS_IMPORT_EXPORT_BUTTON_VISIBILITY, bookmarksImportExportButton.text.toString()) } fun onClickBookmarksRadioButton(view: View) { 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 a0e5ad8a..b33fc7fe 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt @@ -327,12 +327,12 @@ class LogcatActivity : AppCompatActivity() { } } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Store the scroll Y position in the bundle. - savedInstanceState.putInt(SCROLL_Y, logcatWebView.scrollY) + outState.putInt(SCROLL_Y, logcatWebView.scrollY) } // The view parameter cannot be removed because it is called from the layout onClick. 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 042af73d..a1d8ecc7 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt @@ -393,14 +393,14 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook private var ultraPrivacy: ArrayList>>? = null private var waitingForProxy = false - // Define the save webpage image activity result launcher. It must be defined before `onCreate()` is run or the app will crash. + // Define the browse file upload activity result launcher. It must be defined before `onCreate()` is run or the app will crash. private val browseFileUploadActivityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult -> // Pass the file to the WebView. fileChooserCallback.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(activityResult.resultCode, activityResult.data)) } // Define the save URL activity result launcher. It must be defined before `onCreate()` is run or the app will crash. - private val saveUrlActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("*/*")) { fileUri -> + private val saveUrlActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("*/*")) { fileUri -> // Only save the URL if the file URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { // Instantiate the save URL coroutine. @@ -415,7 +415,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook } // Define the save webpage archive activity result launcher. It must be defined before `onCreate()` is run or the app will crash. - private val saveWebpageArchiveActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("multipart/related")) { fileUri -> + 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) { // Get a cursor from the content resolver. @@ -488,7 +488,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook } // Define the save webpage image activity result launcher. It must be defined before `onCreate()` is run or the app will crash. - private val saveWebpageImageActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("image/png")) { fileUri -> + private val saveWebpageImageActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("image/png")) { fileUri -> // Only save the webpage image if the file URI is not null, which happens if the user exited the file picker by pressing back. if (fileUri != null) { // Instantiate the save webpage image coroutine. @@ -894,9 +894,9 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook pendingDialogsArrayList.clear() } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Only save the instance state if the WebView state adapter is not null, which will be the case if the app is restarting to change the initial app theme. if (webViewStateAdapter != null) { @@ -934,11 +934,11 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook val currentTabPosition = tabLayout.selectedTabPosition // Store the saved states in the bundle. - savedInstanceState.putBoolean(BOOKMARKS_DRAWER_PINNED, bookmarksDrawerPinned) - savedInstanceState.putString(PROXY_MODE, proxyMode) - savedInstanceState.putParcelableArrayList(SAVED_NESTED_SCROLL_WEBVIEW_STATE_ARRAY_LIST, savedNestedScrollWebViewStateArrayList) - savedInstanceState.putParcelableArrayList(SAVED_STATE_ARRAY_LIST, savedStateArrayList) - savedInstanceState.putInt(SAVED_TAB_POSITION, currentTabPosition) + outState.putBoolean(BOOKMARKS_DRAWER_PINNED, bookmarksDrawerPinned) + outState.putString(PROXY_MODE, proxyMode) + outState.putParcelableArrayList(SAVED_NESTED_SCROLL_WEBVIEW_STATE_ARRAY_LIST, savedNestedScrollWebViewStateArrayList) + outState.putParcelableArrayList(SAVED_STATE_ARRAY_LIST, savedStateArrayList) + outState.putInt(SAVED_TAB_POSITION, currentTabPosition) } } @@ -5002,26 +5002,17 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Store the file path callback. fileChooserCallback = filePathCallback - // Create an intent to open a chooser based on the file chooser parameters. - val fileChooserIntent = fileChooserParams.createIntent() - - // Check to see if the file chooser intent resolves to an installed package. - if (fileChooserIntent.resolveActivity(packageManager) != null) { // The file chooser intent is fine. - // Launch the file chooser intent. - browseFileUploadActivityResultLauncher.launch(fileChooserIntent) - } else { // The file chooser intent will cause a crash. - // Create a generic intent to open a chooser. - val genericFileChooserIntent = Intent(Intent.ACTION_GET_CONTENT) + // Create a file chooser intent. + val fileChooserIntent = Intent(Intent.ACTION_GET_CONTENT) - // Request an openable file. - genericFileChooserIntent.addCategory(Intent.CATEGORY_OPENABLE) + // Request an openable file. + fileChooserIntent.addCategory(Intent.CATEGORY_OPENABLE) - // Set the file type to everything. - genericFileChooserIntent.type = "*/*" + // Set the file type to everything. The file chooser params cannot be used to create the intent because it only selects the first specified file type. See . + fileChooserIntent.type = "*/*" - // Launch the generic file chooser intent. - browseFileUploadActivityResultLauncher.launch(genericFileChooserIntent) - } + // Launch the file chooser intent. + browseFileUploadActivityResultLauncher.launch(fileChooserIntent) // Handle the event. return true diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.kt index 11efe094..5a0d0ef5 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.kt @@ -1,7 +1,7 @@ /* - * Copyright 2018-2023 Soren Stoutner . + * Copyright 2018-2024 Soren Stoutner . * - * This file is part of Privacy Browser Android . + * This file is part of Privacy Browser Android . * * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -245,15 +245,15 @@ class RequestsActivity : AppCompatActivity(), ViewRequestListener { } } - public override fun onSaveInstanceState(savedInstanceState: Bundle) { + public override fun onSaveInstanceState(outState: Bundle) { // Run the default commands. - super.onSaveInstanceState(savedInstanceState) + super.onSaveInstanceState(outState) // Get the listview position. val listViewPosition = requestsListView.firstVisiblePosition // Store the listview position in the bundle. - savedInstanceState.putInt(LISTVIEW_POSITION, listViewPosition) + outState.putInt(LISTVIEW_POSITION, listViewPosition) } override fun onPrevious(currentId: Int) { diff --git a/build.gradle b/build.gradle index 8573ba5c..c963cfe3 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' + classpath 'com.android.tools.build:gradle:8.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b49cb335..1f5b0c3d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -- 2.45.2 From 5be67db45b84cd4d8abedf70d90ae584415348f6 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 27 May 2024 12:40:56 -0700 Subject: [PATCH 3/9] Release 3.18. --- app/build.gradle | 4 +- app/src/main/assets/de/about_changelog.html | 20 +- app/src/main/assets/en/about_changelog.html | 19 +- app/src/main/assets/es/about_changelog.html | 20 +- app/src/main/assets/filterlists/easylist.txt | 19978 ++++++++++------ .../main/assets/filterlists/easyprivacy.txt | 8753 ++++++- .../assets/filterlists/fanboy-annoyance.txt | 3669 +-- .../main/assets/filterlists/fanboy-social.txt | 1695 +- app/src/main/assets/fr/about_changelog.html | 20 +- app/src/main/assets/it/about_changelog.html | 20 +- .../main/assets/pt-rBR/about_changelog.html | 19 +- app/src/main/assets/ru/about_changelog.html | 20 +- app/src/main/assets/tr/about_changelog.html | 19 +- .../main/assets/zh-rCN/about_changelog.html | 19 +- app/src/main/res/values/strings.xml | 12 +- .../metadata/android/en-US/changelogs/74.txt | 5 + .../metadata/android/es-ES/changelogs/74.txt | 6 + .../metadata/android/fr-FR/changelogs/74.txt | 6 + .../metadata/android/it-IT/changelogs/74.txt | 6 + .../metadata/android/ru-RU/changelogs/74.txt | 5 + 20 files changed, 23648 insertions(+), 10667 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/74.txt create mode 100644 fastlane/metadata/android/es-ES/changelogs/74.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/74.txt create mode 100644 fastlane/metadata/android/it-IT/changelogs/74.txt create mode 100644 fastlane/metadata/android/ru-RU/changelogs/74.txt diff --git a/app/build.gradle b/app/build.gradle index b69d2c95..273dd017 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { defaultConfig { minSdk 26 targetSdk 34 - versionCode 73 - versionName "3.17" + versionCode 74 + versionName "3.18" resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN'] } diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 7374c44d..9c69680b 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -7,7 +7,7 @@ Translation 2016 Aaron Gerlach . Copyright assigned to Soren Stoutner . - This file is part of Privacy Browser Android . + This file is part of Privacy Browser Android . Privacy Browser Android is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,6 +34,24 @@ +

3.18 (Version Code 74)

27. Mai 2024 - Mindest-API 26, Ziel-API 34

Fix some files not being selectable in the file picker on some websites.
Colorize the logcat and add a search option.
Allow selecting a bookmark favorite icon from the filesystem.
Fix + a + number + of + small + issues + and + bugs.
Bump the minimum API to 26 (Android 8.0).
Aktualisierte deutsche Ãbersetzung von Bernhard G. Keller.

3.17 (Version Code 73)

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

PrivacyBrowser/1.0

WebView default user agent

Mozilla/5.0 (Android 14; Mobile; rv:122.0) Gecko/122.0 Firefox/122.0

Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36

Mozilla/5.0 (Android 14; Mobile; rv:126.0) Gecko/126.0 Firefox/126.0

Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Mobile Safari/537.36

Mozilla/5.0 (iPhone; CPU iPhone OS 17_2_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Mobile/15E148 Safari/604.1

Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0

Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36

Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0

Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36

Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0

Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36

Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0

Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36

Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0

Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15

Custom user agent

Date: Wed, 17 Jul 2024 15:30:26 -0700 Subject: [PATCH 4/9] Fix updating of entry enabled status in the Navigation Drawer. --- app/build.gradle | 4 ++-- app/src/main/assets/de/about_changelog.html | 4 ++-- app/src/main/assets/en/about_changelog.html | 4 ++-- app/src/main/assets/es/about_changelog.html | 4 ++-- app/src/main/assets/filterlists/easyprivacy.txt | 1 - app/src/main/assets/fr/about_changelog.html | 4 ++-- app/src/main/assets/it/about_changelog.html | 4 ++-- app/src/main/assets/pt-rBR/about_changelog.html | 4 ++-- app/src/main/assets/ru/about_changelog.html | 4 ++-- app/src/main/assets/tr/about_changelog.html | 4 ++-- app/src/main/assets/zh-rCN/about_changelog.html | 4 ++-- .../privacybrowser/fragments/AboutVersionFragment.kt | 2 +- app/src/main/res/values/strings.xml | 10 +++++----- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 15 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 273dd017..e827df84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,7 +90,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.core:core-ktx:1.13.1' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' @@ -100,5 +100,5 @@ dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20' // Include the Google material library. - implementation 'com.google.android.material:material:1.12.0' + implementation 'com.google.android.material:material:1.13.0-alpha04' } diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 9c69680b..22100c74 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -34,8 +34,8 @@ -

3.18 (Version Code 74)

27. Mai 2024 - Mindest-API 26, Ziel-API 34

3.18 (Version Code 74)

27. Mai 2024 - Mindest-API 26, Ziel-API 34

Fix some files not being selectable in the file picker on some websites.
Colorize the logcat and add a search option.

3.18 (version code 74)

27 May 2024 - minimum API 26, target API 34

3.18 (version code 74)

27 May 2024 - minimum API 26, target API 34

Fix some files not being selectable in the file picker on some websites.
Colorize the logcat and add a search option.

3.18 (cÃ³digo de versiÃ³n 74)

27 de mayo de 2024 - API mÃnimo 26, API objetivo 34

3.18 (cÃ³digo de versiÃ³n 74)

27 de mayo de 2024 - API mÃnimo 26, API objetivo 34

Corregir algunos archivos no seleccionables en el selector de archivos en algunos sitios web.
Colorear el logcat y aÃ±adir una opciÃ³n de bÃºsqueda.

3.18 (version du code 74)

27 Mai 2024 - API minimale : 26, API optimale : 34

3.18 (version du code 74)

27 Mai 2024 - API minimale : 26, API optimale : 34

Correction de certains fichiers qui ne pouvaient pas Ãªtre sÃ©lectionnÃ©s dans le sÃ©lecteur de fichiers sur certains sites Web.
Coloration du logcat et ajout d'une option de recherche.

3.18 (versione codice 74)

27 Maggio 2024 - minima API 26, target API 34

3.18 (versione codice 74)

27 Maggio 2024 - minima API 26, target API 34

Correzione del problema per cui alcuni file non erano selezionabili nella finestra di dialogo per alcuni siti web.
Colorazione del logcat e aggiunta dell'opzione di ricerca.

3.18 (cÃ³digo de versÃ£o 74)

27 de maio de 2024 - minimum API 26, target API 34

3.18 (cÃ³digo de versÃ£o 74)

27 de maio de 2024 - minimum API 26, target API 34

Fix some files not being selectable in the file picker on some websites.
Colorize the logcat and add a search option.

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¾ÑÑÑÑÑÑÐ²Ð¸Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð²ÑÐ±Ð¾ÑÐ° Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² ÑÐ°Ð¹Ð»Ð¾Ð²Ð¾Ð¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑÐµ Ð½Ð° ÑÑÐ´Ðµ ÑÐ°Ð¹ÑÐ¾Ð².
Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ Ð¶ÑÑÐ½Ð°Ð»Ð° logcat ÑÐµÐ¿ÐµÑÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¸Ð²Ð°ÐµÑÑÑ ÑÐ²ÐµÑÐ°Ð¼Ð¸, diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html index b598c9e4..ccf33521 100644 --- a/app/src/main/assets/tr/about_changelog.html +++ b/app/src/main/assets/tr/about_changelog.html @@ -28,8 +28,8 @@ -
3.18 (version code 74)
-
27 MayÄ±s 2024 - minimum API 26, target API 34
+
3.18 (version code 74)
+
27 MayÄ±s 2024 - minimum API 26, target API 34
- Fix some files not being selectable in the file picker on some websites.
- Colorize the logcat and add a search option.

3.18 (Version Code 74)

3.17 (Version Code 73)

3.18 (Version Code 74)

3.18 (Version Code 74)

3.18 (version code 74)

3.18 (version code 74)

3.18 (cÃ³digo de versiÃ³n 74)

3.18 (cÃ³digo de versiÃ³n 74)

3.18 (version du code 74)

3.18 (version du code 74)

3.18 (versione codice 74)

3.18 (versione codice 74)

3.18 (cÃ³digo de versÃ£o 74)

3.18 (cÃ³digo de versÃ£o 74)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18 (version code 74)

3.18 (version code 74)

3.18 (version code 74)

3.18 (version code 74)

3.18.1 (Version Code 75)

3.18 (Version Code 74)

3.18.1 (version code 75)

3.18 (version code 74)

3.18.1 (cÃ³digo de versiÃ³n 75)

3.18 (cÃ³digo de versiÃ³n 74)

3.18.1 (version du code 75)

3.18 (version du code 74)

3.18.1 (versione codice 75)

3.18 (versione codice 74)

3.18.1 (cÃ³digo de versÃ£o 75)

3.18 (cÃ³digo de versÃ£o 74)

3.18.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 75)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18.1 (version code 75)

3.18 (version code 74)

3.18.1 (version code 75)

3.18 (version code 74)

3.18.1 (Version Code 75)

3.18.1 (version code 75)

3.18.1 (cÃ³digo de versiÃ³n 75)

3.18.1 (version du code 75)

3.18.1 (versione codice 75)

3.18.1 (cÃ³digo de versÃ£o 75)

3.18.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 75)

3.18.1 (version code 75)

3.18.1 (version code 75)

3.18.1 (version du code 75)

3.18 (version du code 74)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 75)

3.18 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 74)

3.18.1 (ÐºÐ¾Ð´ Ð²ÐµÑÑÐ¸Ð¸ 75)