]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
projects / PrivacyBrowserAndroid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78e6b0e)
Fix a rare crash on resource requests. https://redmine.stoutner.com/issues/645
authorSoren Stoutner <soren@stoutner.com>
Fri, 27 Nov 2020 06:00:22 +0000 (23:00 -0700)
committerSoren Stoutner <soren@stoutner.com>
Fri, 27 Nov 2020 06:00:22 +0000 (23:00 -0700)
app/src/main/assets/de/about_changelog.html patch | blob | history
app/src/main/assets/en/about_changelog.html patch | blob | history
app/src/main/assets/es/about_changelog.html patch | blob | history
app/src/main/assets/fr/about_changelog.html patch | blob | history
app/src/main/assets/it/about_changelog.html patch | blob | history
app/src/main/assets/pt-rBR/about_changelog.html patch | blob | history
app/src/main/assets/ru/about_changelog.html patch | blob | history
app/src/main/assets/tr/about_changelog.html patch | blob | history
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java patch | blob | history

diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html
index d69dadf6d8816288ae2b732271a6356e9e53cc4f..8202e0dbf7044fbaa1e352b83c4f0e54fd62a32d 100644 (file)
--- a/app/src/main/assets/de/about_changelog.html
+++ b/app/src/main/assets/de/about_changelog.html
@@ -33,8 +33,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (version code 53)</h3>
-        <p>26. November 2020 - Mindest-API 19, Ziel-API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (version code 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26. November 2020</a> - Mindest-API 19, Ziel-API 29</p>
         <ul>
             <li>Fix eines Bugs, der die <a href="https://redmine.stoutner.com/issues/642">Quelltext-Anzeige zum Absturz brachte</a>.</li>
         </ul>
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 8437b690e6f6b20e1189fc8a055fed332fcd455d..b4c00294cfb1536fbcc7ca90922fb9c80fd80b57 100644 (file)
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -27,8 +27,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (version code 53)</h3>
-        <p>26 November 2020 - minimum API 19, target API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (version code 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 November 2020</a> - minimum API 19, target API 29</p>
         <ul>
             <li>Fix a bug that caused <a href="https://redmine.stoutner.com/issues/642">View Source to crash</a>.</li>
         </ul>
diff --git a/app/src/main/assets/es/about_changelog.html b/app/src/main/assets/es/about_changelog.html
index 4713b1dfc218d3324fa4881ddda49bf5c21f301a..3a89f0f96e760d6a2dd216e442aae627e6c12fe0 100644 (file)
--- a/app/src/main/assets/es/about_changelog.html
+++ b/app/src/main/assets/es/about_changelog.html
@@ -29,8 +29,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (código de versión 53)</h3>
-        <p>26 de noviembre de 2020 - API mínimo 19, API dirigido 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (código de versión 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 de noviembre de 2020</a> - API mínimo 19, API dirigido 29</p>
         <ul>
             <li>Arreglar un error que provocaba la <a href="https://redmine.stoutner.com/issues/642">caída de Ver la Fuente</a>.</li>
         </ul>
diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html
index 497fc4b37d828b71da8fb94a7f8452ff63940d95..079df41d9d817195d08d11892ac0d98d027dbef6 100644 (file)
--- a/app/src/main/assets/fr/about_changelog.html
+++ b/app/src/main/assets/fr/about_changelog.html
@@ -29,8 +29,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (version code 53)</h3>
-        <p>26 Novembre 2020 - API minimale : 19, API optimale : 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (version code 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 Novembre 2020</a> - API minimale : 19, API optimale : 29</p>
         <ul>
             <li>Fix a bug that caused <a href="https://redmine.stoutner.com/issues/642">View Source to crash</a>.</li>
         </ul>
diff --git a/app/src/main/assets/it/about_changelog.html b/app/src/main/assets/it/about_changelog.html
index dd342f7912c80fd0ca5afda9c46c9c43d2a0e644..8cb5a9c79b1cc1d011e352f80d329af525d0db83 100644 (file)
--- a/app/src/main/assets/it/about_changelog.html
+++ b/app/src/main/assets/it/about_changelog.html
@@ -29,8 +29,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (versione codice 53)</h3>
-        <p>26 Novembre 2020 - minima API 19, target API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (versione codice 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 Novembre 2020</a> - minima API 19, target API 29</p>
         <ul>
             <li>Correzione di un baco che provocava <a href="https://redmine.stoutner.com/issues/642">il crash della vista della sorgente della pagina</a>.</li>
         </ul>
diff --git a/app/src/main/assets/pt-rBR/about_changelog.html b/app/src/main/assets/pt-rBR/about_changelog.html
index 55cfd33efb50d596668c0c40e6a9197597dd852a..445b49f2191a39238acbea47e79b4cb30e06d5c3 100644 (file)
--- a/app/src/main/assets/pt-rBR/about_changelog.html
+++ b/app/src/main/assets/pt-rBR/about_changelog.html
@@ -29,8 +29,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (código da versão 53)</h3>
-        <p>26 November 2020 - minimum API 19, target API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (código da versão 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 November 2020</a> - minimum API 19, target API 29</p>
         <ul>
             <li>Corrigido o erro que gerava <a href="https://redmine.stoutner.com/issues/642">Ver Fonte ao travar</a>.</li>
         </ul>
diff --git a/app/src/main/assets/ru/about_changelog.html b/app/src/main/assets/ru/about_changelog.html
index 129886011a6274702c4a7efd7ef5acb966ad9340..37a171f72b5c02e3d54793c1a06f083fab43a889 100644 (file)
--- a/app/src/main/assets/ru/about_changelog.html
+++ b/app/src/main/assets/ru/about_changelog.html
@@ -27,8 +27,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (код версии 53)</h3>
-        <p>26 Ноябрь 2020 года - минимальный API 19, целевой API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (код версии 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 Ноябрь 2020 года</a> - минимальный API 19, целевой API 29</p>
         <ul>
             <li>Исправлена ошибка, приводившая к сбою <a href="https://redmine.stoutner.com/issues/642">при просмотре исходного кода страницы</a>.</li>
         </ul>
diff --git a/app/src/main/assets/tr/about_changelog.html b/app/src/main/assets/tr/about_changelog.html
index 4c47728b8a7d07011b3d11784543a18d8458388d..b7eab553d8393ffa60b65e27932ad9140b31a293 100644 (file)
--- a/app/src/main/assets/tr/about_changelog.html
+++ b/app/src/main/assets/tr/about_changelog.html
@@ -27,8 +27,8 @@
     </head>
 
     <body>
-        <h3>3.6.1 (version code 53)</h3>
-        <p>26 November 2020 - minimum API 19, target API 29</p>
+        <h3><a href="https://www.stoutner.com/privacy-browser-3-6-1/">3.6.1</a> (version code 53)</h3>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=78e6b0e9a553e3bf800e4c69535c46fb63bef017">26 November 2020</a> - minimum API 19, target API 29</p>
         <ul>
             <li>Fix a bug that caused <a href="https://redmine.stoutner.com/issues/642">View Source to crash</a>.</li>
         </ul>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index 1595f4a3d04105a63e237b083ca32ac087361132..9d001fe0d2c990ae293973c02fc93837ca4aaaa6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -332,6 +332,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
     private TabLayout tabLayout;
     private SwipeRefreshLayout swipeRefreshLayout;
     private ViewPager webViewPager;
+    private NavigationView navigationView;
+
+    // Declare the class menus.
+    private Menu navigationMenu;
+
+    // Declare the class menu items.
+    private MenuItem navigationRequestsMenuItem;
 
     @Override
     // Remove the warning about needing to override `performClick()` when using an `OnTouchListener` with `WebView`.
@@ -404,6 +411,13 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         tabLayout = findViewById(R.id.tablayout);
         swipeRefreshLayout = findViewById(R.id.swiperefreshlayout);
         webViewPager = findViewById(R.id.webviewpager);
+        navigationView = findViewById(R.id.navigationview);
+
+        // Get handles for the class menus.
+        navigationMenu = navigationView.getMenu();
+
+        // Get a handle for the navigation requests menu item.
+        navigationRequestsMenuItem = navigationMenu.findItem(R.id.requests);
 
         // Get a handle for the app compat delegate.
         AppCompatDelegate appCompatDelegate = getDelegate();
@@ -3250,8 +3264,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         this.registerReceiver(orbotStatusBroadcastReceiver, new IntentFilter("org.torproject.android.intent.action.STATUS"));
 
         // Get handles for views that need to be modified.
-        NavigationView navigationView = findViewById(R.id.navigationview);
-        SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.swiperefreshlayout);
         ListView bookmarksListView = findViewById(R.id.bookmarks_drawer_listview);
         FloatingActionButton launchBookmarksActivityFab = findViewById(R.id.launch_bookmarks_activity_fab);
         FloatingActionButton createBookmarkFolderFab = findViewById(R.id.create_bookmark_folder_fab);
@@ -3261,12 +3273,10 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         // Listen for touches on the navigation menu.
         navigationView.setNavigationItemSelectedListener(this);
 
-        // Get handles for the navigation menu and the back and forward menu items.
-        Menu navigationMenu = navigationView.getMenu();
+        // Get handles for the navigation menu items.
         MenuItem navigationBackMenuItem = navigationMenu.findItem(R.id.back);
         MenuItem navigationForwardMenuItem = navigationMenu.findItem(R.id.forward);
         MenuItem navigationHistoryMenuItem = navigationMenu.findItem(R.id.history);
-        MenuItem navigationRequestsMenuItem = navigationMenu.findItem(R.id.requests);
 
         // Update the web view pager every time a tab is modified.
         webViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@@ -5789,15 +5799,6 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
                 // Sanitize the URL.
                 url = sanitizeUrl(url);
 
-                // Get a handle for the navigation view.
-                NavigationView navigationView = findViewById(R.id.navigationview);
-
-                // Get a handle for the navigation menu.
-                Menu navigationMenu = navigationView.getMenu();
-
-                // Get a handle for the navigation requests menu item.
-                MenuItem navigationRequestsMenuItem = navigationMenu.findItem(R.id.requests);
-
                 // Create an empty web resource response to be used if the resource request is blocked.
                 WebResourceResponse emptyWebResourceResponse = new WebResourceResponse("text/plain", "utf8", new ByteArrayInputStream("".getBytes()));
 
A web browser that respects your privacy.