From fbf8b09fe6dfadec4b9bebfe1f244f942970de45 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 6 Mar 2023 08:06:46 +0100
Subject: [PATCH] =?UTF-8?q?point=20to=20a=20privacy=20policy=20that=20does?=
 =?UTF-8?q?n=E2=80=99t=20use=20anchors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                                  | 2 +-
 .../eu/siacs/conversations/ui/StartConversationActivity.java  | 2 +-
 src/main/res/values/strings.xml                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d454a7aa7d5935010e670e52cb168acb32b4d48..248fdf795328f499e97af71488380f0baf63ed69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,7 +91,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 42050
+        versionCode 42051
         versionName "2.12.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 7a2ffc0d85f41fcbcce6fe382fa5a04aff097a08..dd14d1f63cdef0a3a46bcc7dee6a72b95c2f4fc0 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -765,7 +765,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                         if (QuickConversationsService.isConversations()) {
                             confirmButtonText = R.string.next;
                         } else {
-                            confirmButtonText = R.string.confirm;
+                            confirmButtonText = R.string.agree_and_continue;
                         }
                         builder.setPositiveButton(confirmButtonText, (dialog, which) -> {
                             if (requestPermission.compareAndSet(false, true)) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4edf1ae7d7f5a37a30ce8f2dce308a599e244cb8..3f743bbae8ec8f6afbd9823e675011b604f15ed3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -517,7 +517,7 @@
     <string name="no_camera_permission">Grant %1$s access to the camera</string>
     <string name="sync_with_contacts">Synchronize with contacts</string>
     <string name="sync_with_contacts_long">%1$s wants permission to access your address book to match it with your XMPP contact list.\nThis will display your contacts’ full names and avatars.\n\n%1$s will only read your address book and match it locally without uploading anything to your server.</string>
-    <string name="sync_with_contacts_quicksy"><![CDATA[Quicksy needs access to your contacts’ phone numbers to make suggestions about possible contacts who are already on Quicksy.<br><br>We will not store a copy of those phone numbers.\n\nFor more information read our <a href="https://quicksy.im/#privacy">privacy policy</a>.<br><br>You will now be asked to grant permission to access your contacts.]]></string>
+    <string name="sync_with_contacts_quicksy"><![CDATA[Quicksy needs access to your contacts’ phone numbers to make suggestions about possible contacts who are already on Quicksy.<br><br>We will not store a copy of those phone numbers.\n\nFor more information read our <a href="https://quicksy.im/privacy.htm">privacy policy</a>.<br><br>You will now be asked to grant permission to access your contacts.]]></string>
     <string name="notify_on_all_messages">Notify on all messages</string>
     <string name="notify_only_when_highlighted">Notify only when mentioned</string>
     <string name="notify_never">Notifications disabled</string>
@@ -542,7 +542,7 @@
     <string name="share_uri_with">Share URI with…</string>
     <string name="welcome_header" translatable="false">Join the Conversation</string>
     <string name="welcome_header_quicksy" translatable="false">Have some Quick Conversations</string>
-    <string name="welcome_text_quicksy"><![CDATA[Quicksy is a spin off of the popular XMPP client Conversations with automatic contact discovery.<br><br>You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.<br><br>By signing up you agree to our <a href="https://quicksy.im/#privacy">privacy policy</a>.]]></string>
+    <string name="welcome_text_quicksy"><![CDATA[Quicksy is a spin off of the popular XMPP client Conversations with automatic contact discovery.<br><br>You sign up with your phone number and Quicksy will automatically—based on the phone numbers in your address book—suggest possible contacts to you.<br><br>By signing up you agree to our <a href="https://quicksy.im/privacy.htm">privacy policy</a>.]]></string>
     <string name="agree_and_continue">Agree and continue</string>
     <string name="magic_create_text">A guide is set up for account creation on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full XMPP address.</string>
     <string name="your_full_jid_will_be">Your full XMPP address will be: %s</string>