From 1d656c562831f535aa33903d44198dd890393f4f Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 29 Sep 2021 16:14:44 -0700 Subject: [PATCH] Fix a crash when opening a drawer while restarting. https://redmine.stoutner.com/issues/765 --- app/build.gradle | 4 +- .../free/assets/de/about_privacy_policy.html | 4 +- .../free/assets/en/about_privacy_policy.html | 10 +- app/src/free/assets/es/about_permissions.html | 2 +- .../free/assets/es/about_privacy_policy.html | 12 +- app/src/free/assets/fr/about_permissions.html | 2 +- .../free/assets/fr/about_privacy_policy.html | 12 +- .../free/assets/it/about_privacy_policy.html | 10 +- .../assets/pt-rBR/about_privacy_policy.html | 10 +- .../free/assets/ru/about_privacy_policy.html | 10 +- .../free/assets/tr/about_privacy_policy.html | 10 +- .../privacybrowser/helpers/AdHelper.kt | 2 +- app/src/free/res/values-es/strings.xml | 2 +- app/src/free/res/values-fr/strings.xml | 2 +- app/src/main/AndroidManifest.xml | 27 +-- app/src/main/assets/de/about_licenses.html | 2 +- app/src/main/assets/de/about_links.html | 4 +- app/src/main/assets/en/about_licenses.html | 2 +- app/src/main/assets/en/about_links.html | 4 +- .../main/assets/en/about_privacy_policy.html | 6 +- app/src/main/assets/es/about_changelog.html | 126 ++++++------ app/src/main/assets/es/about_licenses.html | 2 +- app/src/main/assets/es/about_links.html | 4 +- .../main/assets/es/about_privacy_policy.html | 6 +- app/src/main/assets/fr/about_licenses.html | 2 +- app/src/main/assets/fr/about_links.html | 4 +- .../main/assets/fr/about_privacy_policy.html | 6 +- app/src/main/assets/it/about_licenses.html | 2 +- app/src/main/assets/it/about_links.html | 4 +- .../main/assets/it/about_privacy_policy.html | 6 +- .../main/assets/pt-rBR/about_licenses.html | 2 +- app/src/main/assets/pt-rBR/about_links.html | 4 +- .../assets/pt-rBR/about_privacy_policy.html | 6 +- app/src/main/assets/ru/about_licenses.html | 2 +- app/src/main/assets/ru/about_links.html | 4 +- .../main/assets/ru/about_privacy_policy.html | 6 +- app/src/main/assets/tr/about_licenses.html | 2 +- app/src/main/assets/tr/about_links.html | 4 +- .../main/assets/tr/about_privacy_policy.html | 6 +- .../activities/AboutActivity.kt | 10 +- .../activities/BookmarksActivity.java | 4 +- .../BookmarksDatabaseViewActivity.java | 4 +- .../activities/DomainsActivity.java | 4 +- .../activities/GuideActivity.java | 4 +- .../activities/ImportExportActivity.java | 4 +- .../activities/LogcatActivity.java | 4 +- .../activities/MainWebViewActivity.java | 13 +- .../activities/RequestsActivity.java | 4 +- .../activities/ViewSourceActivity.kt | 4 +- .../dialogs/AboutViewSourceDialog.kt | 2 +- .../privacybrowser/dialogs/AddDomainDialog.kt | 9 +- .../dialogs/CreateBookmarkDialog.kt | 7 +- .../dialogs/CreateBookmarkFolderDialog.kt | 7 +- .../dialogs/CreateHomeScreenShortcutDialog.kt | 7 +- .../dialogs/EditBookmarkDatabaseViewDialog.kt | 7 +- .../dialogs/EditBookmarkDialog.kt | 7 +- .../EditBookmarkFolderDatabaseViewDialog.kt | 7 +- .../dialogs/EditBookmarkFolderDialog.kt | 7 +- .../privacybrowser/dialogs/FontSizeDialog.kt | 7 +- .../dialogs/HttpAuthenticationDialog.kt | 7 +- .../dialogs/MoveToFolderDialog.kt | 7 +- .../privacybrowser/dialogs/OpenDialog.kt | 7 +- .../dialogs/PinnedMismatchDialog.kt | 9 +- .../privacybrowser/dialogs/SaveDialog.kt | 7 +- .../dialogs/SaveWebpageDialog.kt | 7 +- .../dialogs/SslCertificateErrorDialog.kt | 7 +- .../dialogs/UntrustedSslCertificateDialog.kt | 2 +- .../dialogs/UrlHistoryDialog.kt | 7 +- .../dialogs/ViewRequestDialog.kt | 7 +- .../dialogs/ViewSslCertificateDialog.kt | 11 +- .../dialogs/WaitingForProxyDialog.kt | 7 +- .../fragments/AboutWebViewFragment.kt | 10 +- .../fragments/SettingsFragment.java | 21 +- .../views/NestedScrollWebView.kt | 2 +- .../res/drawable/.idea/codeStyles/Project.xml | 113 ----------- app/src/main/res/drawable/.idea/misc.xml | 8 - app/src/main/res/drawable/.idea/modules.xml | 8 - app/src/main/res/drawable/.idea/vcs.xml | 6 - app/src/main/res/drawable/.idea/workspace.xml | 186 ------------------ ...tom_appbar.xml => about_bottom_appbar.xml} | 0 ...ut_top_appbar.xml => about_top_appbar.xml} | 0 ...appbar.xml => bookmarks_bottom_appbar.xml} | 0 ... bookmarks_databaseview_bottom_appbar.xml} | 0 ... => bookmarks_databaseview_top_appbar.xml} | 0 ...op_appbar.xml => bookmarks_top_appbar.xml} | 0 ...m_appbar.xml => domains_bottom_appbar.xml} | 0 ..._top_appbar.xml => domains_top_appbar.xml} | 0 ...tom_appbar.xml => guide_bottom_appbar.xml} | 0 ...ut_top_appbar.xml => guide_top_appbar.xml} | 10 +- ...ar.xml => import_export_bottom_appbar.xml} | 0 ...ppbar.xml => import_export_top_appbar.xml} | 0 ...om_appbar.xml => logcat_bottom_appbar.xml} | 0 ...t_top_appbar.xml => logcat_top_appbar.xml} | 0 ..._appbar.xml => requests_bottom_appbar.xml} | 0 ...top_appbar.xml => requests_top_appbar.xml} | 0 ...pbar.xml => view_source_bottom_appbar.xml} | 0 ..._appbar.xml => view_source_top_appbar.xml} | 0 app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 62 +++--- build.gradle | 4 +- .../android/en-US/images/promoGraphic.png | Bin 11263 -> 0 bytes .../android/en-US/images/tvBanner.png | Bin 42140 -> 0 bytes 102 files changed, 297 insertions(+), 677 deletions(-) delete mode 100644 app/src/main/res/drawable/.idea/codeStyles/Project.xml delete mode 100644 app/src/main/res/drawable/.idea/misc.xml delete mode 100644 app/src/main/res/drawable/.idea/modules.xml delete mode 100644 app/src/main/res/drawable/.idea/vcs.xml delete mode 100644 app/src/main/res/drawable/.idea/workspace.xml rename app/src/main/res/layout/{about_coordinatorlayout_bottom_appbar.xml => about_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{about_coordinatorlayout_top_appbar.xml => about_top_appbar.xml} (100%) rename app/src/main/res/layout/{bookmarks_coordinatorlayout_bottom_appbar.xml => bookmarks_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{bookmarks_databaseview_coordinatorlayout_bottom_appbar.xml => bookmarks_databaseview_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{bookmarks_databaseview_coordinatorlayout_top_appbar.xml => bookmarks_databaseview_top_appbar.xml} (100%) rename app/src/main/res/layout/{bookmarks_coordinatorlayout_top_appbar.xml => bookmarks_top_appbar.xml} (100%) rename app/src/main/res/layout/{domains_coordinatorlayout_bottom_appbar.xml => domains_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{domains_coordinatorlayout_top_appbar.xml => domains_top_appbar.xml} (100%) rename app/src/main/res/layout/{guide_coordinatorlayout_bottom_appbar.xml => guide_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{guide_coordinatorlayout_top_appbar.xml => guide_top_appbar.xml} (100%) rename app/src/main/res/layout/{import_export_coordinatorlayout_bottom_appbar.xml => import_export_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{import_export_coordinatorlayout_top_appbar.xml => import_export_top_appbar.xml} (100%) rename app/src/main/res/layout/{logcat_coordinatorlayout_bottom_appbar.xml => logcat_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{logcat_coordinatorlayout_top_appbar.xml => logcat_top_appbar.xml} (100%) rename app/src/main/res/layout/{requests_coordinatorlayout_bottom_appbar.xml => requests_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{requests_coordinatorlayout_top_appbar.xml => requests_top_appbar.xml} (100%) rename app/src/main/res/layout/{view_source_coordinatorlayout_bottom_appbar.xml => view_source_bottom_appbar.xml} (100%) rename app/src/main/res/layout/{view_source_coordinatorlayout_top_appbar.xml => view_source_top_appbar.xml} (100%) delete mode 100644 fastlane/metadata/android/en-US/images/promoGraphic.png delete mode 100644 fastlane/metadata/android/en-US/images/tvBanner.png diff --git a/app/build.gradle b/app/build.gradle index b75f2115..3cc3256b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,11 +83,11 @@ dependencies { implementation 'androidx.webkit:webkit:1.4.0' // Include the Kotlin standard libraries. This should be the same version number listed in project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31' // Include the Google material library. implementation 'com.google.android.material:material:1.4.0' // Only compile AdMob ads for the free flavor. - freeImplementation 'com.google.android.gms:play-services-ads:20.2.0' + freeImplementation 'com.google.android.gms:play-services-ads:20.4.0' } \ No newline at end of file diff --git a/app/src/free/assets/de/about_privacy_policy.html b/app/src/free/assets/de/about_privacy_policy.html index 5060287c..0f7e6065 100644 --- a/app/src/free/assets/de/about_privacy_policy.html +++ b/app/src/free/assets/de/about_privacy_policy.html @@ -83,8 +83,8 @@

Werbeeinblendungen

Privacy Browser Free blendet einen Werbebanner unten am Bildschirm ein und verwendet hierfür Googles Netzwerk AdMob, - dessen eigene Datenschutzbestimmungen hier zu finden sind. - Die Ausspielung dieser Werbebanner erfolgt dabei nicht-personalisiert. + dessen eigene Datenschutzbestimmungen hier zu finden sind. + Die Ausspielung dieser Werbebanner erfolgt dabei nicht-personalisiert. AdMob überträgt zudem anonymisierte Zusammenfassungen folgender Informationen an die Entwickler: