narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

point to a privacy policy that doesn’t use anchors

Browse source
This commit is contained in:
Daniel Gultsch 2023-03-06 08:06:46 +01:00
parent 9715271e92
commit fbf8b09fe6
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -91,7 +91,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 32 targetSdkVersion 32
versionCode 42050 versionCode 42051
versionName "2.12.2" versionName "2.12.2"
archivesBaseName += "-$versionName" archivesBaseName += "-$versionName"
applicationId "eu.siacs.conversations" applicationId "eu.siacs.conversations"

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -765,7 +765,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
if (QuickConversationsService.isConversations()) { if (QuickConversationsService.isConversations()) {
confirmButtonText = R.string.next; confirmButtonText = R.string.next;
} else { } else {
confirmButtonText = R.string.confirm; confirmButtonText = R.string.agree_and_continue;
} }
builder.setPositiveButton(confirmButtonText, (dialog, which) -> { builder.setPositiveButton(confirmButtonText, (dialog, which) -> {
if (requestPermission.compareAndSet(false, true)) { if (requestPermission.compareAndSet(false, true)) {

4
src/main/res/values/strings.xml
View file

@ -517,7 +517,7 @@
<string name="no_camera_permission">Grant %1$s access to the camera</string> <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">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_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_on_all_messages">Notify on all messages</string>
<string name="notify_only_when_highlighted">Notify only when mentioned</string> <string name="notify_only_when_highlighted">Notify only when mentioned</string>
<string name="notify_never">Notifications disabled</string> <string name="notify_never">Notifications disabled</string>
@ -542,7 +542,7 @@
<string name="share_uri_with">Share URI with…</string> <string name="share_uri_with">Share URI with…</string>
<string name="welcome_header" translatable="false">Join the Conversation</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_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="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="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> <string name="your_full_jid_will_be">Your full XMPP address will be: %s</string>