From 206e7f22cc18ca1a546ded8f6eaaf8ba7b6edde1 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 1 Dec 2018 13:21:15 +0100 Subject: [PATCH] Extra without plus --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/MessageHelper.java | 3 +-- app/src/main/res/layout/fragment_compose.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index edda710e6a..e08ec51ce9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -193,7 +193,7 @@ public class FragmentCompose extends FragmentEx { public void onItemSelected(AdapterView parent, View view, int position, long id) { EntityIdentity identity = (EntityIdentity) parent.getAdapter().getItem(position); int at = (identity == null ? -1 : identity.email.indexOf('@')); - tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at) + "+"); + tvExtraPrefix.setText(at < 0 ? null : identity.email.substring(0, at)); tvExtraSuffix.setText(at < 0 ? null : identity.email.substring(at)); if (pro) { tvSignature.setText(identity == null ? null : Html.fromHtml(identity.signature)); diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 413d32ff7d..7162215260 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -197,8 +197,7 @@ public class MessageHelper { String name = ((InternetAddress) message.from[0]).getPersonal(); if (email != null && !TextUtils.isEmpty(message.extra)) { int at = email.indexOf('@'); - boolean separator = Character.isLetterOrDigit(message.extra.charAt(0)); - email = email.substring(0, at) + (separator ? "+" : "") + message.extra + email.substring(at); + email = email.substring(0, at) + message.extra + email.substring(at); Log.i(Helper.TAG, "extra=" + email); } imessage.setFrom(new InternetAddress(email, name)); diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml index 19cd7575a3..58bb1f0b83 100644 --- a/app/src/main/res/layout/fragment_compose.xml +++ b/app/src/main/res/layout/fragment_compose.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:text="name+" + android:text="name" android:textAppearance="@style/TextAppearance.AppCompat.Small" app:layout_constraintBottom_toBottomOf="@+id/etExtra" app:layout_constraintStart_toStartOf="parent"