From 1e25a9f97c6326d3abb2dd8f5f0ee8560e7e8460 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 2 Aug 2018 22:26:56 +0000
Subject: [PATCH] Added reply-to address entry to identity

---
 .../eu/faircode/email/FragmentIdentity.java   |  5 ++++
 app/src/main/res/layout/fragment_identity.xml | 24 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  2 ++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1da066eb10..957a68712d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -59,6 +59,7 @@ public class FragmentIdentity extends Fragment {
     private Spinner spProfile;
     private EditText etName;
     private EditText etEmail;
+    private EditText etReplyTo;
     private EditText etHost;
     private CheckBox cbStartTls;
     private EditText etPort;
@@ -86,6 +87,7 @@ public class FragmentIdentity extends Fragment {
         spProfile = view.findViewById(R.id.spProvider);
         etName = view.findViewById(R.id.etName);
         etEmail = view.findViewById(R.id.etEmail);
+        etReplyTo = view.findViewById(R.id.etReplyTo);
         etHost = view.findViewById(R.id.etHost);
         cbStartTls = view.findViewById(R.id.cbStartTls);
         etPort = view.findViewById(R.id.etPort);
@@ -152,6 +154,7 @@ public class FragmentIdentity extends Fragment {
                 args.putLong("id", id);
                 args.putString("name", etName.getText().toString());
                 args.putString("email", etEmail.getText().toString());
+                args.putString("replyto", etReplyTo.getText().toString());
                 args.putString("host", etHost.getText().toString());
                 args.putBoolean("starttls", cbStartTls.isChecked());
                 args.putString("port", etPort.getText().toString());
@@ -169,6 +172,7 @@ public class FragmentIdentity extends Fragment {
             public void onChanged(@Nullable EntityIdentity identity) {
                 etName.setText(identity == null ? null : identity.name);
                 etEmail.setText(identity == null ? null : identity.email);
+                etReplyTo.setText(identity == null ? null : identity.replyto);
                 etHost.setText(identity == null ? null : identity.host);
                 cbStartTls.setChecked(identity == null ? false : identity.starttls);
                 etPort.setText(identity == null ? null : Long.toString(identity.port));
@@ -216,6 +220,7 @@ public class FragmentIdentity extends Fragment {
                     identity = new EntityIdentity();
                 identity.name = Objects.requireNonNull(args.getString("name"));
                 identity.email = Objects.requireNonNull(args.getString("email"));
+                identity.replyto = args.getString("replyto");
                 identity.host = host;
                 identity.port = Integer.parseInt(port);
                 identity.starttls = starttls;
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 0ad22dae57..ece187d3c3 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -53,6 +53,28 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvEmail" />
 
+        <!-- reply to -->
+
+        <TextView
+            android:id="@+id/tvReplyTo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_reply_to"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/etEmail" />
+
+        <EditText
+            android:id="@+id/etReplyTo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/title_optional"
+            android:inputType="textEmailAddress"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvReplyTo" />
+
         <!--- provider -->
 
         <TextView
@@ -63,7 +85,7 @@
             android:text="@string/title_provider"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etEmail" />
+            app:layout_constraintTop_toBottomOf="@id/etReplyTo" />
 
         <Spinner
             android:id="@+id/spProvider"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0aa71ebbf9..081bdc375d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,8 @@
 
     <string name="title_name">Your name</string>
     <string name="title_email">Your email address</string>
+    <string name="title_reply_to">Reply to address</string>
+    <string name="title_optional">Optional</string>
     <string name="title_account_name">Account name</string>
     <string name="title_account_name_hint">optional</string>
     <string name="title_imap">IMAP</string>