From 4407ee328815bdb12bb606c8820d2e17bcf31db4 Mon Sep 17 00:00:00 2001 From: Kat Hagan Date: Wed, 11 Sep 2024 21:00:04 -0400 Subject: [PATCH 1/3] Update California privacy policy link --- .../src/main/java/com/automattic/simplenote/AboutFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java b/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java index 43409ebd9..2c8049678 100644 --- a/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java +++ b/Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java @@ -40,7 +40,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_CALIFORNIA = "https://automattic.com/privacy/#us-privacy-laws"; 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"; From 237a5872c9856004cb56e2071e656dc37403a21a Mon Sep 17 00:00:00 2001 From: Kat Hagan Date: Wed, 11 Sep 2024 21:04:48 -0400 Subject: [PATCH 2/3] updated release notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1922b9341..d48878270 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,6 @@ 2.34 ----- - +* Updated link to the privacy policy for California users. 2.33 ----- From 8ead86e84b0a750e9a66792bea850d60aeecd082 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 16 Sep 2024 20:15:04 +1000 Subject: [PATCH 3/3] Update `RELEASE-NOTES.txt` moving #1694 to 2.35 --- RELEASE-NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1a8d0c299..10efd67e0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,10 +1,10 @@ 2.35 ----- - +* Updated link to the privacy policy for California users. 2.34 ----- -* Updated link to the privacy policy for California users. +* Under the hood improvements 2.33 -----