mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added OAuth help

This commit is contained in:
M66B 2021-10-21 15:16:28 +02:00
parent a6f9f34480
commit bf9c2124e0
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FAQ.md
View File

@ -1001,11 +1001,13 @@ The easiest way is to use the menu item *Fetch more messages* in the three-dots
An Outlook / Live / Hotmail account can be set up via the quick setup wizard and selecting *Outlook/Office 365*.
To use an Outlook, Live or Hotmail account with two factor authentication enabled, you need to create an app password.
To use an Outlook, Live or Hotmail account with two factor authentication enabled, you might need to create an app password.
See [here](https://support.microsoft.com/en-us/help/12409/microsoft-account-app-passwords-two-step-verification) for the details.
See [here](https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040) for Microsoft's instructions.
Please see [this FAQ](#user-content-faq139) for possible causes of the error *... User is authenticated but not connected ...*.
For setting up an Office 365 account, please see [this FAQ](#user-content-faq156).
<br />

25
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View File

@ -118,6 +118,7 @@ public class FragmentOAuth extends FragmentBase {
private TextView tvGmailDraftsHint;
private TextView tvOfficeAuthHint;
private Button btnSupport;
private Button btnHelp;
private Group grpError;
@ -162,6 +163,7 @@ public class FragmentOAuth extends FragmentBase {
tvGmailDraftsHint = view.findViewById(R.id.tvGmailDraftsHint);
tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint);
btnSupport = view.findViewById(R.id.btnSupport);
btnHelp = view.findViewById(R.id.btnHelp);
grpError = view.findViewById(R.id.grpError);
@ -190,6 +192,18 @@ public class FragmentOAuth extends FragmentBase {
}
});
btnHelp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
EmailProvider provider = EmailProvider.getProvider(v.getContext(), id);
Helper.view(v.getContext(), Uri.parse(provider.link), false);
} catch (Throwable ex) {
Log.e(ex);
}
}
});
// Initialize
tvTitle.setText(getString(R.string.title_setup_oauth_rationale, name));
etName.setVisibility(askAccount ? View.VISIBLE : View.GONE);
@ -933,6 +947,16 @@ public class FragmentOAuth extends FragmentBase {
tvOfficeAuthHint.setVisibility(View.VISIBLE);
}
EmailProvider provider;
try {
provider = EmailProvider.getProvider(getContext(), id);
} catch (Throwable exex) {
Log.e(exex);
provider = null;
}
btnHelp.setVisibility((provider != null && provider.link != null ? View.VISIBLE : View.GONE));
etName.setEnabled(true);
etEmail.setEnabled(true);
cbUpdate.setEnabled(true);
@ -950,6 +974,7 @@ public class FragmentOAuth extends FragmentBase {
}
private void hideError() {
btnHelp.setVisibility(View.GONE);
grpError.setVisibility(View.GONE);
tvGmailDraftsHint.setVisibility(View.GONE);
tvOfficeAuthHint.setVisibility(View.GONE);

15
app/src/main/res/layout/fragment_oauth.xml
View File

@ -181,6 +181,21 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOfficeAuthHint" />
<Button
android:id="@+id/btnHelp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:backgroundTint="?attr/colorInfoBackground"
android:drawableEnd="@drawable/twotone_help_24"
android:drawablePadding="6dp"
android:drawableTint="?attr/colorInfoForeground"
android:text="@string/title_setup_help"
android:textColor="?attr/colorInfoForeground"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOfficeAuthHint" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpError"
android:layout_width="0dp"