diff --git a/res/values/strings.xml b/res/values/strings.xml index db21e5a165..5d8f4b59e5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -111,7 +111,7 @@ Insecure MMS TextSecure Get with it: %s - Install TextSecure: %s + Let's use this to chat: %s Error leaving group... diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index 69e7d040cc..f854f57aa5 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -343,14 +343,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void handleInviteLink() { try { - if (!TextUtils.isEmpty(composeText.getText()) && - !composeText.getText().toString().endsWith(" ")) - { - composeText.append(" "); - } boolean a = SecureRandom.getInstance("SHA1PRNG").nextBoolean(); - if (a) composeText.append(getString(R.string.ConversationActivity_get_with_it, "http://sgnl.link/zhrzvk6")); - else composeText.append(getString(R.string.ConversationActivity_install_textsecure, "http://sgnl.link/1yKYqoN")); + if (a) composeText.appendInvite(getString(R.string.ConversationActivity_get_with_it, "http://sgnl.link/1IvurmD")); + else composeText.appendInvite(getString(R.string.ConversationActivity_lets_use_this_to_chat, "sgnl.link/1CYCQQN")); } catch (NoSuchAlgorithmException e) { throw new AssertionError(e); } diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java index d237b8a3b9..8327800356 100644 --- a/src/org/thoughtcrime/securesms/components/ComposeText.java +++ b/src/org/thoughtcrime/securesms/components/ComposeText.java @@ -6,6 +6,7 @@ import android.os.Build; import android.support.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; +import android.text.TextUtils; import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.widget.EditText; @@ -33,4 +34,12 @@ public class ComposeText extends EditText { span.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); super.setHint(span); } + + public void appendInvite(String invite) { + if (!TextUtils.isEmpty(getText()) && !getText().toString().equals(" ")) { + append(" "); + } + + append(invite); + } }