Browse Source

update README; update license notice

tags/87.0.4280.141-2-extensions
wchen342 8 months ago
parent
commit
238ba1d3eb
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
7 changed files with 80 additions and 52 deletions
  1. +10
    -0
      CHANGELOG.md
  2. +0
    -30
      LICENSE.md
  3. +3
    -1
      README.md
  4. +1
    -1
      patches/Bromite/Add-bookmark-import-export-actions.patch
  5. +25
    -1
      patches/Other/debug-fix.patch
  6. +39
    -11
      patches/ungoogled-chromium-android/Enable-update-notification.patch
  7. +2
    -8
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch

+ 10
- 0
CHANGELOG.md View File

@ -1,3 +1,13 @@
# 87.0.4280.141-2
* Extension version only:
* HTTPS Everywhere can now open options page correctly
* Decentraleyes is now functional and [can pass their test](https://decentraleyes.org/test)
* Fix a bug that prevents uBlock Origin from functioning after restart
* Extension page no longer needs manual refresh after installation or switching on/off.
* Potentially fix a bug with developer mode loading on Android 10+
* Known problem: extensions will not work on the first tab from a cold start (e.g. when you have restarted the device). Close the tab and open a new one fixes the problem.
* Every new file created in the patchset is now marked with GNU GPL notice
# 87.0.4280.141-1
* Prevent Google connections from DRM preprovisioning ([ungoogled-chromium/issues/1297](https://github.com/Eloston/ungoogled-chromium/issues/1297))
* Remove sites on new page


+ 0
- 30
LICENSE.md View File

@ -1,33 +1,3 @@
BSD 3-Clause License
Copyright (c) 2019, The ungoogled-chromium-android Authors. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007


+ 3
- 1
README.md View File

@ -84,11 +84,13 @@ There are three methods to install extensions:
- Method 2 (Direct Download):
1. Go to `chrome://flags/` and change `#extension-mime-request-handling` to `Always prompt for install` and relaunch your browser.
2. Get direct link to `crx` file following the instructions [here](https://ungoogled-software.github.io/ungoogled-chromium-wiki/faq#downloading-the-crx-file).
1. Optionally, you can use a third-party website to download the `crx` file. However, do so at your own risk, as I will take *absolutely no* responsibility for problems caused by using a third party website or service.
3. Paste the link into omnibox and go to that link.
4. The browser should prompt for installation after finishing downloading
5. Check `chrome://extensions/` and you should see the extension there.
- Method 3 (Developer Mode Folder Loading. This method only supports `Android 5.1+`):
1. Download extension following the instructions [here](https://ungoogled-software.github.io/ungoogled-chromium-wiki/faq#downloading-the-crx-file).
1. 1. Optionally, you can use a third-party website to download the `crx` file. However, do so at your own risk, as I will take *absolutely no* responsibility for problems caused by using a third party website or service.
2. Extract the `crx` file into a folder with`unzip`/`7z` and copy the folder to your device.
3. Notice for Android 10: as a workaround for a [permission issue](https://github.com/wchen342/ungoogled-chromium-android/issues/27), you need to enable "Allow from unknown source" for `Ungoogled Chromium Extensions".
4. Make sure you also give storage access.
@ -123,4 +125,4 @@ You can use f-Droid client and add [this repository](https://www.droidware.info/
See [LICENSE](LICENSE.md).
Starting from commit `d86c4905e078944bddbea77f8bc916cca14279b0` and upon everything is licensed under GPLv3. Older commits are still licensed under BSD 3-clause.
Ungoogled Chromium Android is part of Ungoogled Chromium. Everything published here, including (but not limited to) patches, scripts and other files are licensed under GPLv3+.

+ 1
- 1
patches/Bromite/Add-bookmark-import-export-actions.patch View File

@ -877,7 +877,7 @@ Completely remove contacts picker permission from the file dialog
private static final String TAG = "SelectFileDialog";
private static final String IMAGE_TYPE = "image";
private static final String VIDEO_TYPE = "video";
+ private static final String HTML_TYPE = "text/html";
+ private static final String HTML_TYPE = "text";
private static final String AUDIO_TYPE = "audio";
private static final String ALL_TYPES = "*/*";


+ 25
- 1
patches/Other/debug-fix.patch View File

@ -4,6 +4,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
---
base/logging.cc | 2 -
base/supports_user_data.cc | 7 ++++-
build/config/compiler/BUILD.gn | 9 ++-----
components/omnibox/browser/autocomplete_controller.cc | 3 --
components/omnibox/browser/autocomplete_match.cc | 10 --------
@ -15,7 +16,7 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
content/common/input/input_event_stream_validator.cc | 3 --
services/network/network_context.cc | 1
url/gurl.cc | 2 -
12 files changed, 5 insertions(+), 49 deletions(-)
13 files changed, 10 insertions(+), 51 deletions(-)
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@ -207,3 +208,26 @@ Subject: Remove DCHECK and other lines causing Debug builds to fail
#endif
}
}
--- a/base/supports_user_data.cc
+++ b/base/supports_user_data.cc
@@ -20,7 +20,9 @@ SupportsUserData::SupportsUserData(Suppo
SupportsUserData& SupportsUserData::operator=(SupportsUserData&&) = default;
SupportsUserData::Data* SupportsUserData::GetUserData(const void* key) const {
- DCHECK(sequence_checker_.CalledOnValidSequence());
+ // DCHECK(sequence_checker_.CalledOnValidSequence());
+ // TODO: For some reason CalledOnValidSequence() will cause a trylock on a null lock
+ // when called from Extension Tabs API. May not be thread safe.
// Avoid null keys; they are too vulnerable to collision.
DCHECK(key);
auto found = user_data_.find(key);
@@ -31,7 +33,8 @@ SupportsUserData::Data* SupportsUserData
void SupportsUserData::SetUserData(const void* key,
std::unique_ptr<Data> data) {
- DCHECK(sequence_checker_.CalledOnValidSequence());
+ // DCHECK(sequence_checker_.CalledOnValidSequence());
+ // See GetUserData().
// Avoid null keys; they are too vulnerable to collision.
DCHECK(key);
if (data.get())

+ 39
- 11
patches/ungoogled-chromium-android/Enable-update-notification.patch View File

@ -1,23 +1,37 @@
---
chrome/android/chrome_java_sources.gni | 2
chrome/android/java/AndroidManifest.xml | 2
chrome/android/java/src/org/chromium/chrome/browser/download/ChromeUpdateDownloadDelegate.java | 153 ++++++
chrome/android/java/src/org/chromium/chrome/browser/download/ChromeUpdateDownloadDelegate.java | 167 +++++++
chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java | 9
chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java | 20
chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java | 2
chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/UCInlineUpdateController.java | 222 ++++++++++
chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/UCInlineUpdateController.java | 236 ++++++++++
chrome/browser/flag_descriptions.cc | 5
chrome/browser/flags/android/chrome_feature_list.cc | 1
chrome/browser/ui/android/strings/android_chrome_strings.grd | 2
chrome/browser/updates/update_notification_config.cc | 4
11 files changed, 409 insertions(+), 13 deletions(-)
11 files changed, 437 insertions(+), 13 deletions(-)
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/UCInlineUpdateController.java
@@ -0,0 +1,222 @@
+// Copyright 2020 The Ungoogled-Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -0,0 +1,236 @@
+// Copyright 2021 The Ungoogled Chromium Authors. All rights reserved.
+//
+// This file is part of Ungoogled Chromium Android.
+//
+// Ungoogled Chromium Android is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or any later version.
+//
+// Ungoogled Chromium Android is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Ungoogled Chromium Android. If not,
+// see <https://www.gnu.org/licenses/>.
+
+package org.chromium.chrome.browser.omaha.inline;
+
@ -434,10 +448,24 @@
Update Chrome
--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ChromeUpdateDownloadDelegate.java
@@ -0,0 +1,153 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -0,0 +1,167 @@
+// Copyright 2021 The Ungoogled Chromium Authors. All rights reserved.
+//
+// This file is part of Ungoogled Chromium Android.
+//
+// Ungoogled Chromium Android is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or any later version.
+//
+// Ungoogled Chromium Android is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Ungoogled Chromium Android. If not,
+// see <https://www.gnu.org/licenses/>.
+
+package org.chromium.chrome.browser.download;
+


+ 2
- 8
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch View File

@ -3,17 +3,11 @@ Date: Sat, 2 Nov 2019 09:29:52 +0100
Subject: Remove dependency on com.google.android.gcm
---
third_party/android_sdk/BUILD.gn | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
third_party/android_sdk/BUILD.gn | 3 ---
1 file changed, 3 deletions(-)
--- a/third_party/android_sdk/BUILD.gn
+++ b/third_party/android_sdk/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+ # Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -63,7 +63,4 @@ if (enable_java_templates) {
testonly = true
sources = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]


Loading…
Cancel
Save