From cd2323e565785ec0867462f50de58406adaffe3d Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 27 May 2017 11:33:44 -0700 Subject: [PATCH] Add attribution to Thomas Jensen for Huawei spinner fix. --- app/src/main/assets/de/about_contributors.html | 1 + app/src/main/assets/en/about_contributors.html | 1 + app/src/main/assets/es/about_contributors.html | 1 + app/src/main/assets/it/about_contributors.html | 1 + app/src/main/assets/zh-rTW/about_contributors.html | 1 + .../privacybrowser/activities/MainWebViewActivity.java | 2 ++ .../privacybrowser/fragments/DomainSettingsFragment.java | 4 +++- .../res/layout/simple_spinner_dropdown_item_huawei_fix.xml | 2 ++ 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/assets/de/about_contributors.html b/app/src/main/assets/de/about_contributors.html index e222b0e8..66f5a295 100644 --- a/app/src/main/assets/de/about_contributors.html +++ b/app/src/main/assets/de/about_contributors.html @@ -36,6 +36,7 @@

Privacy Browser ist primär entwickelt von Soren Stoutner.

Coders

+ Thomas Jensen
Hendrik Knackstedt

Mitwirkende

diff --git a/app/src/main/assets/en/about_contributors.html b/app/src/main/assets/en/about_contributors.html index 9ff18a2b..251b052c 100644 --- a/app/src/main/assets/en/about_contributors.html +++ b/app/src/main/assets/en/about_contributors.html @@ -31,6 +31,7 @@

Privacy Browser is primarily developed by Soren Stoutner.

Coders

+ Thomas Jensen
Hendrik Knackstedt

Translators

diff --git a/app/src/main/assets/es/about_contributors.html b/app/src/main/assets/es/about_contributors.html index 717a91f7..bc017ac0 100644 --- a/app/src/main/assets/es/about_contributors.html +++ b/app/src/main/assets/es/about_contributors.html @@ -31,6 +31,7 @@

Navegador Privado es desarrollado principalmente por Soren Stoutner.

Programadores

+ Thomas Jensen
Hendrik Knackstedt

Traductores

diff --git a/app/src/main/assets/it/about_contributors.html b/app/src/main/assets/it/about_contributors.html index 61de0cd4..4967be58 100644 --- a/app/src/main/assets/it/about_contributors.html +++ b/app/src/main/assets/it/about_contributors.html @@ -33,6 +33,7 @@

Privacy Browser è sviluppato da Soren Stoutner.

Programmatori

+ Thomas Jensen
Hendrik Knackstedt

Traduttori

diff --git a/app/src/main/assets/zh-rTW/about_contributors.html b/app/src/main/assets/zh-rTW/about_contributors.html index 9ff18a2b..251b052c 100644 --- a/app/src/main/assets/zh-rTW/about_contributors.html +++ b/app/src/main/assets/zh-rTW/about_contributors.html @@ -31,6 +31,7 @@

Privacy Browser is primarily developed by Soren Stoutner.

Coders

+ Thomas Jensen
Hendrik Knackstedt

Translators

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 873d1124..bbef023e 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java @@ -1785,6 +1785,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation DownloadManager.Request downloadRequest = new DownloadManager.Request(Uri.parse(imageUrl)); // Pass cookies to download manager if cookies are enabled. This is required to download images from websites that require a login. + // Code contributed 2017 Hendrik Knackstedt. Copyright assigned to Soren Stoutner . if (firstPartyCookiesEnabled) { // Get the cookies for `imageUrl`. String cookies = cookieManager.getCookie(imageUrl); @@ -1832,6 +1833,7 @@ public class MainWebViewActivity extends AppCompatActivity implements Navigation DownloadManager.Request downloadRequest = new DownloadManager.Request(Uri.parse(downloadUrl)); // Pass cookies to download manager if cookies are enabled. This is required to download files from websites that require a login. + // Code contributed 2017 Hendrik Knackstedt. Copyright assigned to Soren Stoutner . if (firstPartyCookiesEnabled) { // Get the cookies for `downloadUrl`. String cookies = cookieManager.getCookie(downloadUrl); diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java index 5362026c..c6c465f0 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java @@ -1,6 +1,8 @@ /* * Copyright © 2017 Soren Stoutner . * + * Huawei spinner code fix contributed 2017 Thomas Jensen . Copyright assigned to Soren Stoutner . + * * This file is part of Privacy Browser . * * Privacy Browser is free software: you can redistribute it and/or modify @@ -121,7 +123,7 @@ public class DomainSettingsFragment extends Fragment { // Some phones running Huawei's customized Android 7.0 don't display a spinner that requires scrolling correctly with the default `simple_spinner_dropdown_item`. The Huawei P9 Lite is known to be affected. if (Build.BRAND.equals("HUAWEI") && (Build.VERSION.SDK_INT == 24)) { // The device is manufactured by Huawei and is running Android 7.0. - // Use a customized `simple_spinner_dropdown_item`. + // Use a customized `simple_spinner_dropdown_item`. Huawei spinner code fix contributed 2017 Thomas Jensen . Copyright assigned to Soren Stoutner . userAgentArrayAdapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item_huawei_fix); } else { // Use the standard `android.R.layout.simple_spinner_dropdown_item` on all other devices. userAgentArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/app/src/main/res/layout/simple_spinner_dropdown_item_huawei_fix.xml b/app/src/main/res/layout/simple_spinner_dropdown_item_huawei_fix.xml index eeb37ce5..c433c95e 100644 --- a/app/src/main/res/layout/simple_spinner_dropdown_item_huawei_fix.xml +++ b/app/src/main/res/layout/simple_spinner_dropdown_item_huawei_fix.xml @@ -2,6 +2,8 @@