Skip to content

Commit

Permalink
Add Brave License on android
Browse files Browse the repository at this point in the history
  • Loading branch information
emerick committed Jan 10, 2020
1 parent 89b61f6 commit a2f5636
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 0 deletions.
1 change: 1 addition & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ if (is_android) {
"//brave/android/sync/android_sync_words.js",
"//brave/android/sync/crypto.js",
"//brave/components/brave_sync/extension/brave-sync/bundles/bundle.js",
"//brave/LICENSE.html",
]
deps = [
"//brave:browser_dependencies",
Expand Down
132 changes: 132 additions & 0 deletions LICENSE.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions android/brave_java_sources.gni
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/partnercustomizations/CloseBraveManager.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/AppearancePreferences.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BackgroundVideoPlaybackPreference.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BraveLicensePreferences.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/preferences/BravePreferenceManager.java",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* Copyright (c) 2020 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

package org.chromium.chrome.browser.preferences;

import android.os.Bundle;

import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRewardsHelper;
import org.chromium.chrome.browser.preferences.BravePreferenceFragment;
import org.chromium.chrome.browser.preferences.TextMessagePreference;

import java.io.IOException;
import java.io.InputStream;
import java.util.Scanner;

/**
* Fragment to display Brave license information.
*/
public class BraveLicensePreferences extends BravePreferenceFragment {
private static final String TAG = "BraveLicense";

private static final String PREF_BRAVE_LICENSE_TEXT = "brave_license_text";
private static final String ASSET_BRAVE_LICENSE = "LICENSE.html";

@Override
public void onCreatePreferences(Bundle savedInstanceState, String s) {
PreferenceUtils.addPreferencesFromResource(this, R.xml.brave_license_preferences);
getActivity().setTitle(R.string.brave_license_text);
TextMessagePreference licenseText =
(TextMessagePreference) findPreference(PREF_BRAVE_LICENSE_TEXT);
try {
InputStream in = getActivity().getAssets().open(ASSET_BRAVE_LICENSE);
Scanner scanner = new Scanner(in).useDelimiter("\\A");
String summary = scanner.hasNext() ? scanner.next() : "";
in.close();
licenseText.setSummary(BraveRewardsHelper.spannedFromHtmlString(summary));
} catch (IOException e) {
Log.e(TAG, "Could not load license text: " + e);
}
}
}
13 changes: 13 additions & 0 deletions android/java/res/xml/brave_license_preferences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2020 The Brave Authors. All rights reserved.
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this file,
You can obtain one at http://mozilla.org/MPL/2.0/.
-->

<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.chrome.browser.preferences.TextMessagePreference
android:key="brave_license_text" />
</PreferenceScreen>
25 changes: 25 additions & 0 deletions android/java/res/xml/legal_information_preferences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 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. -->

<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<org.chromium.chrome.browser.preferences.HyperlinkPreference
android:key="open_source_license"
android:title="@string/open_source_license_title"
app:url="@string/open_source_license_url" />
<org.chromium.chrome.browser.preferences.HyperlinkPreference
android:key="terms_of_service"
android:title="@string/terms_of_service_title"
app:url="@string/brave_terms_of_service_url" />
<org.chromium.chrome.browser.preferences.HyperlinkPreference
android:key="privacy_notice"
android:title="@string/privacy_notice_title"
app:url="@string/brave_privacy_notice_url" />
<Preference
android:fragment="org.chromium.chrome.browser.preferences.BraveLicensePreferences"
android:key="brave_license"
android:title="@string/brave_license_text" />
</PreferenceScreen>
9 changes: 9 additions & 0 deletions android/java/strings/android_brave_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,15 @@ until they verify, or until 90 days have passed.
<message name="IDS_SYNC_DEVICE_FAILURE" desc="The message for the dialog where the user notified about sync setup failure.">
Sync could not be setup
</message>
<message name="IDS_BRAVE_PRIVACY_NOTICE_URL" desc="URL for the Brave privacy notice" translateable="false">
https://brave.com/privacy_android
</message>
<message name="IDS_BRAVE_TERMS_OF_SERVICE_URL" desc="URL for Brave Terms of Service" translateable="false">
https://brave.com/terms_of_use
</message>
<message name="IDS_BRAVE_LICENSE_TEXT" desc="Title for Brave License">
Brave License
</message>
</messages>
</release>
</grit>

0 comments on commit a2f5636

Please sign in to comment.