Added remark about Outlook Passkey screen

master
M66B 1 week ago
parent e552a16e28
commit 1ff9ce34cd

@ -133,6 +133,7 @@ public class FragmentOAuth extends FragmentBase {
private TextView tvGmailLoginHint;
private TextView tvGmailLoginMax;
private TextView tvOutlookHint;
private TextView tvOutlookPasskeyHint;
private TextView tvError;
private TextView tvOfficeAuthHint;
@ -196,6 +197,7 @@ public class FragmentOAuth extends FragmentBase {
tvGmailLoginHint = view.findViewById(R.id.tvGmailLoginHint);
tvGmailLoginMax = view.findViewById(R.id.tvGmailLoginMax);
tvOutlookHint = view.findViewById(R.id.tvOutlookHint);
tvOutlookPasskeyHint = view.findViewById(R.id.tvOutlookPasskeyHint);
tvError = view.findViewById(R.id.tvError);
tvOfficeAuthHint = view.findViewById(R.id.tvOfficeAuthHint);
@ -317,6 +319,8 @@ public class FragmentOAuth extends FragmentBase {
}
});
boolean isOutlook = ("office365".equals(id) || "office365pcke".equals(id) || "outlookgraph".equals(id) || "outlook".equals(id));
// Initialize
tvTitle.setText(getString(R.string.title_setup_oauth_rationale, name));
etName.setVisibility(askAccount ? View.VISIBLE : View.GONE);
@ -330,6 +334,7 @@ public class FragmentOAuth extends FragmentBase {
tvGmailLoginHint.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);
tvOutlookPasskeyHint.setVisibility(isOutlook ? View.VISIBLE : View.GONE);
hideError();
etName.setText(personal);

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

@ -249,6 +249,7 @@
<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_outlook_hint">In the case of an alias address, the Office 365 wizard should probably be used.</string>
<string name="title_setup_outlook_passkey_hint">Microsoft may ask you to set up a Passkey. This is less straightforward on a mobile device, so consider skipping or cancelling this optional step.</string>
<string name="title_setup_outlook_modern">Due to changes in Microsoft\'s security policies, from September 16, 2024, only the Outlook/Hotmail/Live wizard will work.</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>

Loading…
Cancel
Save