From fbf1cacae3959c96c7beed4e73993d64564403b5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 24 Mar 2022 17:53:18 +0100 Subject: [PATCH] remove hint about yearly fee for server --- .../siacs/conversations/ui/MagicCreateActivity.java | 2 -- .../res/layout/activity_pick_server.xml | 12 ------------ src/conversations/res/layout/magic_create.xml | 13 ------------- src/conversations/res/values/strings.xml | 2 +- src/main/res/values-w360dp/fineprint.xml | 4 ---- src/main/res/values/fineprint.xml | 4 ---- 6 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 src/main/res/values-w360dp/fineprint.xml delete mode 100644 src/main/res/values/fineprint.xml diff --git a/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java index 3419d8fc9..6f0386672 100644 --- a/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java +++ b/src/conversations/java/eu/siacs/conversations/ui/MagicCreateActivity.java @@ -66,13 +66,11 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher { if (username != null && domain != null) { binding.title.setText(R.string.your_server_invitation); binding.instructions.setText(getString(R.string.magic_create_text_fixed, domain)); - binding.finePrint.setVisibility(View.INVISIBLE); binding.username.setEnabled(false); binding.username.setText(this.username); updateFullJidInformation(this.username); } else if (domain != null) { binding.instructions.setText(getString(R.string.magic_create_text_on_x, domain)); - binding.finePrint.setVisibility(View.INVISIBLE); } binding.createAccount.setOnClickListener(v -> { try { diff --git a/src/conversations/res/layout/activity_pick_server.xml b/src/conversations/res/layout/activity_pick_server.xml index 16be52ec4..d55ea78cc 100644 --- a/src/conversations/res/layout/activity_pick_server.xml +++ b/src/conversations/res/layout/activity_pick_server.xml @@ -84,18 +84,6 @@ android:padding="8dp" android:src="@drawable/main_logo" /> - - diff --git a/src/conversations/res/layout/magic_create.xml b/src/conversations/res/layout/magic_create.xml index cc0337062..f6e0436a5 100644 --- a/src/conversations/res/layout/magic_create.xml +++ b/src/conversations/res/layout/magic_create.xml @@ -95,19 +95,6 @@ android:padding="8dp" android:src="@drawable/main_logo" /> - - diff --git a/src/conversations/res/values/strings.xml b/src/conversations/res/values/strings.xml index f9aaec9ee..fffee31d6 100644 --- a/src/conversations/res/values/strings.xml +++ b/src/conversations/res/values/strings.xml @@ -4,7 +4,7 @@ Use conversations.im Create new account Do you already have an XMPP account? This might be the case if you are already using a different XMPP client or have used Conversations before. If not you can create a new XMPP account right now.\nHint: Some email providers also provide XMPP accounts. - XMPP is a provider independent instant messaging network. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im¹; a provider specially suited for the use with Conversations. + XMPP is a provider independent instant messaging network. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations. You have been invited to %1$s. We will guide you through the process of creating an account.\nWhen picking %1$s as a provider you will be able to communicate with users of other providers by giving them your full XMPP address. You have been invited to %1$s. A username has already been picked for you. We will guide you through the process of creating an account.\nYou will be able to communicate with users of other providers by giving them your full XMPP address. Your server invitation diff --git a/src/main/res/values-w360dp/fineprint.xml b/src/main/res/values-w360dp/fineprint.xml deleted file mode 100644 index fa28fbed4..000000000 --- a/src/main/res/values-w360dp/fineprint.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ¹ Optional conversations.im account €8/year. First 6 month free. - \ No newline at end of file diff --git a/src/main/res/values/fineprint.xml b/src/main/res/values/fineprint.xml deleted file mode 100644 index 55eeccb6d..000000000 --- a/src/main/res/values/fineprint.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ¹ Optional conversations.im account €8/year. 6 month free. - \ No newline at end of file