From 0571cc07a1cbb37ea3430d1a4b563e1c4fbac2ef Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:00:20 +0100
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/EntityAccount.java   | 4 ++++
 app/src/main/java/eu/faircode/email/FragmentAccount.java | 8 +++-----
 app/src/main/java/eu/faircode/email/FragmentOAuth.java   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 97c2602aaf..758e18e05f 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -177,6 +177,10 @@ public class EntityAccount extends EntityOrder implements Serializable {
         return "outlook.office365.com".equalsIgnoreCase(host);
     }
 
+    static boolean isOutlook(String id) {
+        return ("office365".equals(id) || "outlook".equals(id));
+    }
+
     boolean isYahooJp() {
         return "imap.mail.yahoo.co.jp".equalsIgnoreCase(host);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index a29385b24d..3fc1f9847e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -319,9 +319,8 @@ public class FragmentAccount extends FragmentBase {
                 etUser.setTag(null);
                 etUser.setText(null);
                 tilPassword.getEditText().setText(null);
-                tvAppPassword.setVisibility(
-                        "office365".equals(provider.id) || "outlook".equals(provider.id)
-                                ? View.VISIBLE : View.GONE);
+                tvAppPassword.setVisibility(EntityAccount.isOutlook(provider.id)
+                        ? View.VISIBLE : View.GONE);
                 certificate = null;
                 tvCertificate.setText(R.string.title_optional);
                 etRealm.setText(null);
@@ -1606,8 +1605,7 @@ public class FragmentAccount extends FragmentBase {
 
                     etUser.setText(account == null ? null : account.user);
                     tilPassword.getEditText().setText(account == null ? null : account.password);
-                    tvAppPassword.setVisibility(account != null &&
-                            ("office365".equals(account.provider) || "outlook".equals(account.provider))
+                    tvAppPassword.setVisibility(account != null && EntityAccount.isOutlook(account.provider)
                             ? View.VISIBLE : View.GONE);
                     certificate = (account == null ? null : account.certificate_alias);
                     tvCertificate.setText(certificate == null ? getString(R.string.title_optional) : certificate);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 693202b299..4f56109be0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -1006,7 +1006,7 @@ public class FragmentOAuth extends FragmentBase {
 
         grpError.setVisibility(View.VISIBLE);
 
-        if ("office365".equals(id) || "outlook".equals(id)) {
+        if (EntityAccount.isOutlook(id)) {
             if (ex instanceof AuthenticationFailedException)
                 tvOfficeAuthHint.setVisibility(View.VISIBLE);
         }