diff --git a/FAQ.md b/FAQ.md index 1a66252dae..5ee618c2bd 100644 --- a/FAQ.md +++ b/FAQ.md @@ -575,7 +575,7 @@ Please see [this FAQ](#user-content-faq111) about OAuth support. **(9) What are identities / how do I add an alias?** -Identities represent email addresses you are sending *from*. +Identities represent email addresses you are sending *from* via an email (SMTP) server. Some providers allow you to have multiple aliases. You can configure these by setting the email address field of an additional identity to the alias address diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index ba40fcdc1b..dea6e9ce2b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -70,6 +70,7 @@ public class FragmentSetup extends FragmentBase { private TextView tvIdentityDone; private Button btnIdentity; + private TextView tvIdentityWhat; private TextView tvNoIdentities; private TextView tvPermissionsDone; @@ -116,6 +117,7 @@ public class FragmentSetup extends FragmentBase { tvIdentityDone = view.findViewById(R.id.tvIdentityDone); btnIdentity = view.findViewById(R.id.btnIdentity); + tvIdentityWhat = view.findViewById(R.id.tvIdentityWhat); tvNoIdentities = view.findViewById(R.id.tvNoIdentities); tvPermissionsDone = view.findViewById(R.id.tvPermissionsDone); @@ -231,6 +233,14 @@ public class FragmentSetup extends FragmentBase { } }); + tvIdentityWhat.setPaintFlags(tvIdentityWhat.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); + tvIdentityWhat.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Helper.viewFAQ(getContext(), 9); + } + }); + btnPermissions.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml index e715b4ec29..e553713955 100644 --- a/app/src/main/res/layout/fragment_setup.xml +++ b/app/src/main/res/layout/fragment_setup.xml @@ -338,6 +338,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/tvIdentityDone" /> + + + app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0ed380312..3b8a245d1b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -186,6 +186,7 @@ Setup identities To send email To change name, color, signature, etc + What is an identity? Grant permissions To access contact information (optional) Setup battery optimizations