Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update California privacy policy link #1694

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Update California privacy policy link #1694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4407ee3
Update California privacy policy link
codebykat Sep 12, 2024
237a587
updated release notes
codebykat Sep 12, 2024
fd726f2
Merge remote-tracking branch 'origin/trunk' into update/privacy-link
mokagio Sep 16, 2024
8ead86e
Update `RELEASE-NOTES.txt` moving #1694 to 2.35
mokagio Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
2.35
-----

* Updated link to the privacy policy for California users.

2.34
-----

* Under the hood improvements

2.33
-----
Expand Down
2 changes: 1 addition & 1 deletion Simplenote/src/main/java/com/automattic/simplenote/AboutFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading