From 2cb21bcb879b25b012918dc85e470fb610c32047 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 3 Apr 2023 10:29:49 +0200 Subject: [PATCH] use static (not translated) text for Privacy policy and TOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a long time Quicksy had a privacy policy written by myself that explains in plain English what data we store and how we use it. https://quicksy.im/#privacy Google doesn’t like that and prefers that we use some bullshit template that is extremely vague, doesn’t explain anything and gives us permission to do basically everything. (At least I think so. I don’t understand the text I copy pasted) Apparantly the text in the app is important as well (BARD didn’t explain that very well when it reviewed our app) therfor we need a static text (not allow translations) Furthermore the data safety section on Google Play now claims we store the users address book even though we don’t actually. But who cares; nobody reads this and we just do this to make the machine happy. Cool! --- build.gradle | 4 ++-- .../siacs/conversations/ui/StartConversationActivity.java | 6 ++++-- src/main/res/values/strings.xml | 5 +++-- src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java | 2 +- src/quicksy/res/layout/activity_tos.xml | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 248fdf795..57a607def 100644 --- a/build.gradle +++ b/build.gradle @@ -91,7 +91,7 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 32 - versionCode 42051 + versionCode 42053 versionName "2.12.2" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" @@ -227,7 +227,7 @@ android { } } lint { - disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource' + disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource', 'ExtraTranslation' } android.applicationVariants.all { variant -> diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index dd14d1f63..d3859cd9f 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -757,7 +757,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne final AtomicBoolean requestPermission = new AtomicBoolean(false); builder.setTitle(R.string.sync_with_contacts); if (QuickConversationsService.isQuicksy()) { - builder.setMessage(Html.fromHtml(getString(R.string.sync_with_contacts_quicksy))); + builder.setMessage(Html.fromHtml(getString(R.string.sync_with_contacts_quicksy_static))); } else { builder.setMessage(getString(R.string.sync_with_contacts_long, getString(R.string.app_name))); } @@ -775,9 +775,11 @@ public class StartConversationActivity extends XmppActivity implements XmppConne builder.setOnDismissListener(dialog -> { if (QuickConversationsService.isConversations() && requestPermission.compareAndSet(false, true)) { requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS); - } }); + if (QuickConversationsService.isQuicksy()) { + builder.setNegativeButton(R.string.decline, null); + } builder.setCancelable(QuickConversationsService.isQuicksy()); final AlertDialog dialog = builder.create(); dialog.setCanceledOnTouchOutside(QuickConversationsService.isQuicksy()); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3f743bbae..27134c0ad 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -517,7 +517,7 @@ Grant %1$s access to the camera Synchronize with contacts %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. -
We will not store a copy of those phone numbers.\n\nFor more information read our privacy policy.

You will now be asked to grant permission to access your contacts.]]> +
By continuing you agree to our Privacy Policy and our Terms & Conditions.

You will now be asked to grant permission to access your contacts.]]> Notify on all messages Notify only when mentioned Notifications disabled @@ -542,7 +542,7 @@ Share URI with… Join the Conversation Have some Quick Conversations -
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.

By signing up you agree to our privacy policy.]]> +
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.
Quicksy stores your contacts’ phone numbers to make suggestions about possible contacts who are already on Quicksy.
By signing up you agree to our Privacy Policy and our Terms & Conditions.]]> Agree and continue 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. Your full XMPP address will be: %s @@ -1005,5 +1005,6 @@ Push Server A user-chosen push server to relay push messages via XMPP to your device. None (deactivated) + Decline diff --git a/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java b/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java index eb2b77d9c..e5dd0f0a7 100644 --- a/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java +++ b/src/quicksy/java/eu/siacs/conversations/ui/TosActivity.java @@ -66,7 +66,7 @@ public class TosActivity extends XmppActivity { startActivity(intent); finish(); }); - welcomeText.setText(Html.fromHtml(getString(R.string.welcome_text_quicksy))); + welcomeText.setText(Html.fromHtml(getString(R.string.welcome_text_quicksy_static))); welcomeText.setMovementMethod(LinkMovementMethod.getInstance()); } diff --git a/src/quicksy/res/layout/activity_tos.xml b/src/quicksy/res/layout/activity_tos.xml index 76afb008c..461032e65 100644 --- a/src/quicksy/res/layout/activity_tos.xml +++ b/src/quicksy/res/layout/activity_tos.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/welcome_text_quicksy" + android:text="@string/welcome_text_quicksy_static" android:textAppearance="@style/TextAppearance.Conversations.Body1"/>