diff --git a/Simplenote/build.gradle b/Simplenote/build.gradle index 4634d15c1..148d2b66d 100644 --- a/Simplenote/build.gradle +++ b/Simplenote/build.gradle @@ -32,7 +32,7 @@ android { } else { versionName "2.8-rc-1" } - versionCode 107 + versionCode 109 minSdkVersion 23 targetSdkVersion 29 diff --git a/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java index 88d8ff2db..c87450ed5 100644 --- a/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java +++ b/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java @@ -38,6 +38,7 @@ public class AboutFragment extends Fragment implements SpeedListener { private static final String SIMPLENOTE_TWITTER_HANDLE = "simplenoteapp"; private static final String TWITTER_PROFILE_URL = "https://twitter.com/#!/"; private static final String TWITTER_APP_URI = "twitter://user?screen_name="; + private static final String URL_CALIFORNIA = "https://automattic.com/privacy/#california-consumer-privacy-act-ccpa"; private static final String URL_CONTRIBUTE = "https://github.com/Automattic/simplenote-android"; private static final String URL_PRIVACY = "https://automattic.com/privacy"; private static final String URL_TERMS = "https://simplenote.com/terms"; @@ -55,6 +56,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c View hiring = view.findViewById(R.id.about_careers); TextView privacy = view.findViewById(R.id.about_privacy); TextView terms = view.findViewById(R.id.about_terms); + TextView california = view.findViewById(R.id.about_california); TextView copyright = view.findViewById(R.id.about_copyright); String colorLink = Integer.toHexString(ContextCompat.getColor(requireContext(), R.color.blue_5) & 0xffffff); @@ -165,6 +167,24 @@ public void onClick(View v) { } }); + california.setText(Html.fromHtml(String.format( + getResources().getString(R.string.link_california), + "", + "" + ))); + california.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + try { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(URL_CALIFORNIA))); + } catch (Exception e) { + Toast.makeText(getActivity(), R.string.no_browser_available, Toast.LENGTH_LONG).show(); + } + } + }); + ((SpinningImageButton) view.findViewById(R.id.about_logo)).setSpeedListener(this); return view; } diff --git a/Simplenote/src/main/res/layout/fragment_about.xml b/Simplenote/src/main/res/layout/fragment_about.xml index fd0f41101..9ada8129d 100644 --- a/Simplenote/src/main/res/layout/fragment_about.xml +++ b/Simplenote/src/main/res/layout/fragment_about.xml @@ -227,6 +227,15 @@ + + + Blog \"Unable to open website. No browser available.\" simplenote.com/blog + %1$s%2$s%3$sPrivacy Notice for California Users%4$s · %1$s%2$s%3$sPrivacy Policy%4$s %1$s%2$s%3$sTerms of Service%4$s