From 62eab6299ee7e84ed5ac966e44e6f9be2e0f7c5a Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 11 Oct 2017 00:09:15 +1000 Subject: [PATCH 1/5] Replace About text with version drafted by WMF lawyer --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d9a5d19d2..b55bf356d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -77,7 +77,7 @@ Tap this message (or hit back) to skip this step. Settings Sign Up About - Open Source software released under the <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\">Apache License v2</a>. %1$s and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation. + The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. <a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a> From 7b5d2bff1262673fa8331d3bcc2f2c3b7f1722d1 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 11 Oct 2017 00:10:43 +1000 Subject: [PATCH 2/5] Modify privacy policy URL --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b55bf356d..107a4647f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Tap this message (or hit back) to skip this step. The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. - <a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a> + <a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy-(draft)\">Privacy policy</a> <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">Credits</a> About Send Feedback (via Email) From dcb9ad0a96cb08b5e59fb920ad4bd81b461484c2 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 11 Oct 2017 00:09:15 +1000 Subject: [PATCH 3/5] Replace About text with version drafted by WMF lawyer --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d9a5d19d2..b55bf356d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -77,7 +77,7 @@ Tap this message (or hit back) to skip this step. Settings Sign Up About - Open Source software released under the <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\">Apache License v2</a>. %1$s and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation. + The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. <a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a> From 9e0a790b8a1748384ea0afcd634879b9cbd54dae Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 11 Oct 2017 00:10:43 +1000 Subject: [PATCH 4/5] Modify privacy policy URL --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b55bf356d..107a4647f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Tap this message (or hit back) to skip this step. The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. - <a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a> + <a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy-(draft)\">Privacy policy</a> <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">Credits</a> About Send Feedback (via Email) From 473d5f62a284eca880a20376a77cf6a04a93cc9f Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 11 Oct 2017 01:34:50 +1000 Subject: [PATCH 5/5] Futureproof privacy policy link --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 107a4647f..b168170f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ Tap this message (or hit back) to skip this step. The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. Wikimedia Commons <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. - <a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy-(draft)\">Privacy policy</a> + <a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\">Privacy policy</a> <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">Credits</a> About Send Feedback (via Email)