mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-01 01:06:11 +00:00
Code Issues Releases Wiki Activity

Added remark about Outlook alias addresses

Browse source
This commit is contained in:
M66B 2024-08-02 22:05:20 +02:00
parent 86ec31ca05
commit ad09499cf3
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View file

@ -130,6 +130,7 @@ public class FragmentOAuth extends FragmentBase {
private TextView tvGmailHint; private TextView tvGmailHint;
private TextView tvGmailLoginHint; private TextView tvGmailLoginHint;
private TextView tvGmailLoginMax; private TextView tvGmailLoginMax;
private TextView tvOutlookHint;
private TextView tvError; private TextView tvError;
private TextView tvOfficeAuthHint; private TextView tvOfficeAuthHint;
@ -191,6 +192,7 @@ public class FragmentOAuth extends FragmentBase {
tvGmailHint = view.findViewById(R.id.tvGmailHint); tvGmailHint = view.findViewById(R.id.tvGmailHint);
tvGmailLoginHint = view.findViewById(R.id.tvGmailLoginHint); tvGmailLoginHint = view.findViewById(R.id.tvGmailLoginHint);
tvGmailLoginMax = view.findViewById(R.id.tvGmailLoginMax); tvGmailLoginMax = view.findViewById(R.id.tvGmailLoginMax);
tvOutlookHint = view.findViewById(R.id.tvOutlookHint);
tvError = view.findViewById(R.id.tvError); tvError = view.findViewById(R.id.tvError);
tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint); tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint);
@ -316,6 +318,7 @@ public class FragmentOAuth extends FragmentBase {
tvGmailHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE); tvGmailHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
tvGmailLoginHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE); tvGmailLoginHint.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
tvGmailLoginMax.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE); tvGmailLoginMax.setVisibility("gmail".equals(id) ? View.VISIBLE : View.GONE);
tvOutlookHint.setVisibility("outlookgraph".equals(id) ? View.VISIBLE : View.GONE);
hideError(); hideError();
etName.setText(personal); etName.setText(personal);

13
app/src/main/res/layout/fragment_oauth.xml
View file

@ -234,6 +234,17 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginHint" /> app:layout_constraintTop_toBottomOf="@id/tvGmailLoginHint" />
<TextView
android:id="@+id/tvOutlookHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_setup_outlook_hint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic|bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginMax" />
<TextView <TextView
android:id="@+id/tvErrorTitle" android:id="@+id/tvErrorTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -243,7 +254,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGmailLoginMax" /> app:layout_constraintTop_toBottomOf="@id/tvOutlookHint" />
<TextView <TextView
android:id="@+id/tvError" android:id="@+id/tvError"

1
app/src/main/res/values/strings.xml
View file

@ -247,6 +247,7 @@
<string name="title_setup_gmail_permissions">Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your explicit consent.</string> <string name="title_setup_gmail_permissions">Google will ask for permissions to read, compose, send and permanently delete all your email. FairEmail will never delete your messages without your explicit consent.</string>
<string name="title_setup_gmail_login">If Chrome is signed in to an account, a new account can only be added through Android. This can be avoided by logging out of Chrome via the Chrome sync settings.</string> <string name="title_setup_gmail_login">If Chrome is signed in to an account, a new account can only be added through Android. This can be avoided by logging out of Chrome via the Chrome sync settings.</string>
<string name="title_setup_gmail_max">In case of the error message \"You\'re signed in to the maximum number of accounts\", you need to log out the browser from all Google accounts.</string> <string name="title_setup_gmail_max">In case of the error message \"You\'re signed in to the maximum number of accounts\", you need to log out the browser from all Google accounts.</string>
<string name="title_setup_outlook_hint">In the case of an alias address, the Office 365 wizard should probably be used.</string>
<string name="title_setup_gmail_on_device">Why do I need to select an on-device account?</string> <string name="title_setup_gmail_on_device">Why do I need to select an on-device account?</string>
<string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string> <string name="title_setup_gmail_password">I want to authorize an account with a password instead of an on-device account</string>
<string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string> <string name="title_setup_office_auth">The error \'AUTHENTICATE failed\' can be caused by IMAP/SMTP being disabled by the system administrator</string>