From be0382fca76eef12ae3d19a4e0dfe1689219d897 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 30 Oct 2020 15:04:37 +0800 Subject: [PATCH] Pop out privacy notice in first launch in MozillaOnline builds Add privacy notice related strings Pop out privacy notice with onboarding Using embeded geckoview to display details about privacy Present or hide privacy pop window according to isMozillaOnline Add activity_privacy_content_display.xml into layoutNotToTest due to EngineView --- app/src/main/AndroidManifest.xml | 3 + .../org/mozilla/fenix/home/HomeFragment.kt | 8 ++ .../PrivacyContentDisplayActivity.kt | 84 +++++++++++++++++++ .../mozonline/PrivacyContentDisplayHelper.kt | 53 ++++++++++++ .../home/mozonline/PrivacyContentSpan.kt | 44 ++++++++++ .../java/org/mozilla/fenix/utils/Settings.kt | 5 ++ .../activity_privacy_content_display.xml | 43 ++++++++++ .../res/values-zh-rCN/mozonline_strings.xml | 22 +++++ app/src/main/res/values/mozonline_strings.xml | 22 +++++ app/src/main/res/values/preference_keys.xml | 3 + .../fenix/perf/PerformanceInflaterTest.kt | 3 +- 11 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayActivity.kt create mode 100644 app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt create mode 100644 app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt create mode 100644 app/src/main/res/layout/activity_privacy_content_display.xml create mode 100644 app/src/main/res/values-zh-rCN/mozonline_strings.xml create mode 100644 app/src/main/res/values/mozonline_strings.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index efb94c3c04..0f4ac90f1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -119,6 +119,9 @@ + + (R.id.privacyContentEngineView) as EngineView + closeButton = findViewById(R.id.privacyContentCloseButton) as ImageButton + engineSession = components.core.engine.createSession() + } + + override fun onCreateView( + parent: View?, + name: String, + context: Context, + attrs: AttributeSet + ): View? = when (name) { + EngineView::class.java.name -> components.core.engine.createView(context, attrs).apply { + selectionActionDelegate = DefaultSelectionActionDelegate( + BrowserStoreSearchAdapter( + components.core.store + ), + resources = context.resources, + shareTextClicked = { share(it) }, + emailTextClicked = { email(it) }, + callTextClicked = { call(it) } + ) + }.asView() + else -> super.onCreateView(parent, name, context, attrs) + } + + override fun onStart() { + super.onStart() + engineSession.register(this) + engineSession.let { engineSession -> + engineView.render(engineSession) + url?.let { engineSession.loadUrl(it) } + } + closeButton.setOnClickListener { finish() } + } + + override fun onStop() { + super.onStop() + engineSession.unregister(this) + } + + override fun onDestroy() { + super.onDestroy() + engineSession.close() + } +} diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt new file mode 100644 index 0000000000..d34371a00d --- /dev/null +++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt @@ -0,0 +1,53 @@ +/* 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.mozilla.fenix.home.mozonline + +import android.app.Activity +import android.content.Context +import android.content.DialogInterface +import android.text.SpannableString +import android.text.Spanned +import android.text.method.LinkMovementMethod +import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import org.mozilla.fenix.R +import org.mozilla.fenix.ext.settings +import kotlin.system.exitProcess + +fun showPrivacyPopWindow(context: Context, activity: Activity) { + val content = context.getString(R.string.privacy_notice_content) + + // Use hyperlinks to display details about privacy + val messageClickable1 = context.getString(R.string.privacy_notice_clickable1) + val messageClickable2 = context.getString(R.string.privacy_notice_clickable2) + val messageClickable3 = context.getString(R.string.privacy_notice_clickable3) + val messageSpannable = SpannableString(content) + + val clickableSpan1 = PrivacyContentSpan(Position.POS1, context) + val clickableSpan2 = PrivacyContentSpan(Position.POS2, context) + val clickableSpan3 = PrivacyContentSpan(Position.POS3, context) + + messageSpannable.setSpan(clickableSpan1, content.indexOf(messageClickable1), + content.indexOf(messageClickable1) + messageClickable1.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + messageSpannable.setSpan(clickableSpan2, content.indexOf(messageClickable2), + content.indexOf(messageClickable2) + messageClickable2.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + messageSpannable.setSpan(clickableSpan3, content.indexOf(messageClickable3), + content.indexOf(messageClickable3) + messageClickable3.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + + // Users can only use fenix after they agree with the privacy notice + val builder = AlertDialog.Builder(activity) + .setPositiveButton(context.getString(R.string.privacy_notice_positive_button), + DialogInterface.OnClickListener { _, _ -> + context.settings().shouldShowPrivacyPopWindow = false + }) + .setNeutralButton(context.getString(R.string.privacy_notice_neutral_button), + DialogInterface.OnClickListener { _, _ -> exitProcess(0) }) + .setTitle(context.getString(R.string.privacy_notice_title)) + .setMessage(messageSpannable) + .setCancelable(false) + val alertDialog: AlertDialog = builder.create() + alertDialog.show() + alertDialog.findViewById(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance() +} diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt new file mode 100644 index 0000000000..c718a6654c --- /dev/null +++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentSpan.kt @@ -0,0 +1,44 @@ +/* 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.mozilla.fenix.home.mozonline + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.text.style.ClickableSpan +import android.view.View + +object Position { + const val POS1 = 1 + const val POS2 = 2 + const val POS3 = 3 +} + +object ADDR { + const val URL1 = "https://www.mozilla.org/en-US/MPL/" + const val URL2 = "https://www.mozilla.org/en-US/foundation/trademarks/policy/" + const val URL3 = "https://www.mozilla.org/zh-CN/privacy/firefox/" +} + +class PrivacyContentSpan(var pos: Int, var context: Context) : + ClickableSpan() { + override fun onClick(widget: View) { + /** + * To avoid users directly using fenix by clicking these urls before + * they click positive button of privacy notice alert dialog, start + * PrivacyContentDisplayActivity to display them. + */ + val engineViewIntent = Intent(context, PrivacyContentDisplayActivity::class.java) + engineViewIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK + val addr = Bundle() + when (pos) { + Position.POS1 -> addr.putString("url", ADDR.URL1) + Position.POS2 -> addr.putString("url", ADDR.URL2) + Position.POS3 -> addr.putString("url", ADDR.URL3) + } + engineViewIntent.putExtras(addr) + context.startActivity(engineViewIntent) + } +} diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index e12cc12f79..0ddb3c35ed 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -252,6 +252,11 @@ class Settings(private val appContext: Context) : PreferencesHolder { val shouldShowSecurityPinWarning: Boolean get() = loginsSecureWarningCount.underMaxCount() + var shouldShowPrivacyPopWindow by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_privacy_pop_window), + default = true + ) + var shouldUseLightTheme by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_light_theme), default = false diff --git a/app/src/main/res/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml new file mode 100644 index 0000000000..c6ff55e47a --- /dev/null +++ b/app/src/main/res/layout/activity_privacy_content_display.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-zh-rCN/mozonline_strings.xml b/app/src/main/res/values-zh-rCN/mozonline_strings.xml new file mode 100644 index 0000000000..d09a3e0b9b --- /dev/null +++ b/app/src/main/res/values-zh-rCN/mozonline_strings.xml @@ -0,0 +1,22 @@ + + + + + 关于您的权利 + + Mozilla Firefox 是一款自由开源软件，由来自世界各地成千上万的社区志愿者共同完成。以下几点您应该了解： + \n\n•Firefox 提供给您时依照的条款为 Mozilla 公共许可证（MPL）。这表示您可以使用、复制和向他人分发 Firefox。我们也非常欢迎您按自己的需要修改 Firefox 的源代码。Mozilla 公共许可证还授予您分发您自己修改过的软件版本的权利。 + \n•您没有获得 Mozilla 基金会或其他任何一方的商标权利或许可，这包括但不限于 Firefox 的名称或标志。有关商标的其他信息在：这里。 + \n•Firefox 的一些功能（例如崩溃报告器）使您可以向 Mozilla 提供反馈。提交反馈的同时，您授权 Mozilla 使用反馈信息改进产品、在其网站上发布反馈信息，以及分发反馈内容。 + \n•关于我们如何使用您通过 Firefox 提交给 Mozilla 的个人信息和反馈，请参见 Firefox 隐私权政策。 + + Mozilla 公共许可证（MPL） + + 这里 + + Firefox 隐私权政策 + + 同意并继续 + + 退出应用 + \ No newline at end of file diff --git a/app/src/main/res/values/mozonline_strings.xml b/app/src/main/res/values/mozonline_strings.xml new file mode 100644 index 0000000000..89c9fbc4c5 --- /dev/null +++ b/app/src/main/res/values/mozonline_strings.xml @@ -0,0 +1,22 @@ + + + + + About your rights + + Mozilla Firefox is free and open source software, built by a community of thousands from all over the world. There are a few things you should know: + \n\n•Firefox is made available to you under the terms of the Mozilla Public License. This means you may use, copy and distribute Firefox to others. You are also welcome to modify the source code of Firefox as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions. + \n•You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found here. + \n•Some features in Firefox, such as the Crash Reporter, give you the option to provide feedback to Mozilla. By choosing to submit feedback, you give Mozilla permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback. + \n•How we use your personal information and feedback submitted to Mozilla through Firefox is described in the Firefox Privacy Policy. + + Mozilla Public License + + found here + + Firefox Privacy Policy + + Agree and Continue + + Exit the App + \ No newline at end of file diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index aea6b71804..e0ad6b502a 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -126,6 +126,9 @@ pref_key_toolbar_top pref_key_toolbar_bottom + + pref_key_privacy_pop_window + pref_key_light_theme pref_key_dark_theme diff --git a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt index 59698c7831..dc09d1fbab 100644 --- a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt @@ -26,7 +26,8 @@ class PerformanceInflaterTest { private val layoutsNotToTest = setOf( "fragment_browser", - "fragment_add_on_internal_settings" + "fragment_add_on_internal_settings", + "activity_privacy_content_display" ) @Before