From cabe0f56e13c14a3f8b65608f64b436c13c80ee1 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 8 Dec 2022 14:36:57 +0600
Subject: [PATCH 1/4] Show 2fa info button to the murena login page

---
 .../res/layout/fragment_eelo_authenticator.xml    | 15 +++++++++++++++
 app/src/main/res/values/strings.xml               |  1 +
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/res/layout/fragment_eelo_authenticator.xml b/app/src/main/res/layout/fragment_eelo_authenticator.xml
index d55e69a6c..0321f345d 100644
--- a/app/src/main/res/layout/fragment_eelo_authenticator.xml
+++ b/app/src/main/res/layout/fragment_eelo_authenticator.xml
@@ -151,6 +151,21 @@
                         android:textColor="@color/primaryTextColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
+                <Button
+                    android:id="@+id/twofa_info_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:text="@string/login_2fa_authentication_title"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginBottom="20dp"
+                    android:textAllCaps="false"
+                    android:textSize="16sp"
+                    android:textColor="@color/button_text"
+                    android:drawableRight="@drawable/ic_info"
+                    android:drawableTint="@color/button_text"
+                    android:drawablePadding="7dp"
+                    android:layout_gravity="center"/>
             </LinearLayout>
         </ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 758ab12a9..db79cf915 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -312,6 +312,7 @@
     <string name="login_server_uri_custom">Server URL (%s)</string>
     <string name="login_server_uri_error">Valid server URL address required</string>
     <string name="login_eelo_server_uri_title">Use a specific server</string>
+    <string name="login_2fa_authentication_title">Two-Factor Authentication</string>
 
     <!-- AccountSettingsActivity -->
     <string name="settings_title">Settings: %s</string>
-- 
GitLab


From e15267ecdbed26ff622645eeaa9b5c52711cd80b Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 8 Dec 2022 21:26:44 +0600
Subject: [PATCH 2/4] Add action on 2fa info button

---
 app/src/main/AndroidManifest.xml              |  3 ++
 .../at/bitfire/davdroid/ui/ShowUrlActivity.kt | 44 +++++++++++++++++++
 .../ui/setup/EeloAuthenticatorFragment.kt     | 20 +++++++++
 app/src/main/res/layout/activity_show_url.xml | 14 ++++++
 app/src/main/res/layout/dialog_2fa_info.xml   | 44 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  6 +++
 6 files changed, 131 insertions(+)
 create mode 100644 app/src/main/java/at/bitfire/davdroid/ui/ShowUrlActivity.kt
 create mode 100644 app/src/main/res/layout/activity_show_url.xml
 create mode 100644 app/src/main/res/layout/dialog_2fa_info.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 191c7e23a..4daa704fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -132,6 +132,9 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".ui.ShowUrlActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <activity
             android:name=".ui.account.AccountActivity"
             android:parentActivityName=".ui.AccountsActivity"
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/ShowUrlActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/ShowUrlActivity.kt
new file mode 100644
index 000000000..728393835
--- /dev/null
+++ b/app/src/main/java/at/bitfire/davdroid/ui/ShowUrlActivity.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright MURENA SAS 2022
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package at.bitfire.davdroid.ui
+
+import android.os.Bundle
+import android.webkit.WebView
+import androidx.appcompat.app.AppCompatActivity
+import at.bitfire.davdroid.R
+
+class ShowUrlActivity : AppCompatActivity() {
+
+    companion object {
+        const val URL = "url"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_show_url)
+
+        val url = intent.getStringExtra(URL)
+
+        if (url.isNullOrEmpty()) {
+            finish()
+            return
+        }
+
+        val webView: WebView = findViewById(R.id.webview)
+        webView.loadUrl(url)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
index cfd3cbeab..6ad52e367 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
@@ -18,7 +18,9 @@ package at.bitfire.davdroid.ui.setup
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.content.Intent
 import android.net.ConnectivityManager
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -33,6 +35,8 @@ import at.bitfire.davdroid.ECloudAccountHelper
 import at.bitfire.davdroid.R
 import at.bitfire.davdroid.databinding.FragmentEeloAuthenticatorBinding
 import at.bitfire.davdroid.db.Credentials
+import at.bitfire.davdroid.ui.ShowUrlActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.android.synthetic.main.fragment_eelo_authenticator.*
 import kotlinx.android.synthetic.main.fragment_eelo_authenticator.view.*
 import java.net.URI
@@ -67,6 +71,8 @@ class EeloAuthenticatorFragment : Fragment() {
 
         v.root.sign_in.setOnClickListener { login() }
 
+        v.root.twofa_info_button.setOnClickListener { show2FAInfoDialog() }
+
         v.root.urlpwd_user_name.doOnTextChanged { text, _, _, _ ->
             val domain = computeDomain(text)
             if (domain.isEmpty()) {
@@ -242,4 +248,18 @@ class EeloAuthenticatorFragment : Fragment() {
             toggleButtonState = false
         }
     }
+
+    private fun show2FAInfoDialog() {
+        MaterialAlertDialogBuilder(requireContext(), R.style.CustomAlertDialogStyle)
+            .setView(R.layout.dialog_2fa_info)
+            .setPositiveButton(R.string.view_more) { _, _ ->
+                val intent = Intent(requireContext(), ShowUrlActivity::class.java)
+                    .putExtra(ShowUrlActivity.URL, getString(R.string.url_2fa_info))
+                startActivity(intent)
+            }
+            .setNegativeButton(R.string.later) { _, _ ->
+            }
+            .show()
+
+    }
 }
diff --git a/app/src/main/res/layout/activity_show_url.xml b/app/src/main/res/layout/activity_show_url.xml
new file mode 100644
index 000000000..d2ecec8c1
--- /dev/null
+++ b/app/src/main/res/layout/activity_show_url.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright © MURENA SAS 2022.
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/webview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_2fa_info.xml b/app/src/main/res/layout/dialog_2fa_info.xml
new file mode 100644
index 000000000..e60dd8066
--- /dev/null
+++ b/app/src/main/res/layout/dialog_2fa_info.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright © MURENA SAS 2022.
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="24dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@color/primaryTextColor"
+        android:text="@string/login_2fa_authentication_title"
+        android:textSize="16sp"
+        app:drawableTint="@color/primaryTextColor"
+        app:drawableStartCompat="@drawable/ic_info"
+        android:drawablePadding="10dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="@string/login_2fa_info_details"
+        android:layout_marginTop="23dp"
+        android:textSize="14sp"
+        android:textColor="@color/secondaryTextColor" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db79cf915..cecf13764 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -313,6 +313,12 @@
     <string name="login_server_uri_error">Valid server URL address required</string>
     <string name="login_eelo_server_uri_title">Use a specific server</string>
     <string name="login_2fa_authentication_title">Two-Factor Authentication</string>
+    <string name="login_2fa_info_details">In order to setup an account protected with two-factor authentication within /e/OS, you need to create a dedicated <b>application password</b> in your account settings at murena.io.</string>
+
+    <string name="url_2fa_info" translatable="false">https://doc.e.foundation/support-topics/two-factor-authentication#using-an-application-password-for-the-eos-account-manager</string>
+
+    <string name="view_more">View More</string>
+    <string name="later">Later</string>
 
     <!-- AccountSettingsActivity -->
     <string name="settings_title">Settings: %s</string>
-- 
GitLab


From 176db06f5bdc423da222fd09ffeab519c1c391b6 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 8 Dec 2022 21:29:05 +0600
Subject: [PATCH 3/4] Update murena account login page description text

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cecf13764..ca31024b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -272,7 +272,7 @@
 
     <!-- AddAccountActivity -->
     <string name="login_title">Add account</string>
-    <string name="login_eelo_title">Use your Murena ID (@e.email or @murena.io) to sign in:</string>
+    <string name="login_eelo_title">Use your Murena ID to sign in (for example @e.email or @murena.io):</string>
     <string name="login_type_email">Login with email address</string>
     <string name="login_user_id">User ID</string>
     <string name="login_email_address">Email address</string>
-- 
GitLab


From ad12152cc3db83f653c4f31ac072ab4206b2a05d Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Mon, 12 Dec 2022 07:54:52 +0000
Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s)

---
 .../at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
index 6ad52e367..3d73d760e 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/EeloAuthenticatorFragment.kt
@@ -257,8 +257,7 @@ class EeloAuthenticatorFragment : Fragment() {
                     .putExtra(ShowUrlActivity.URL, getString(R.string.url_2fa_info))
                 startActivity(intent)
             }
-            .setNegativeButton(R.string.later) { _, _ ->
-            }
+            .setNegativeButton(R.string.later, null)
             .show()
 
     }
-- 
GitLab