From 29107abea151d74b8febf9f4704c948bd6537745 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 14 Feb 2023 12:00:12 +0100
Subject: [PATCH 1/8] add import settings buttoninto wizard_setup.xml

---
 app/ui/legacy/src/main/res/layout/wizard_setup.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/ui/legacy/src/main/res/layout/wizard_setup.xml b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
index 9e651d9f2a..570c56ad41 100644
--- a/app/ui/legacy/src/main/res/layout/wizard_setup.xml
+++ b/app/ui/legacy/src/main/res/layout/wizard_setup.xml
@@ -22,6 +22,15 @@
             android:background="?selectableItemBackground"
             android:text="@string/account_setup_basics_manual_setup_action" />
 
+        <Button
+            android:id="@+id/import_settings"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="?selectableItemBackground"
+            android:text="@string/settings_import" />
+
         <Button
             android:id="@+id/next"
             style="?android:attr/buttonBarButtonStyle"
@@ -32,4 +41,4 @@
             android:text="@string/next_action" />
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>
-- 
GitLab


From 1a78298166d2496821c54cf6ae432c5e1157d76a Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 14 Feb 2023 16:54:38 +0100
Subject: [PATCH 2/8] add detail in AccountSettupAccountType.kt class
 description

---
 .../java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
index 6c3b529c8a..74d9ff07f5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
@@ -17,7 +17,7 @@ import com.fsck.k9.ui.base.K9Activity
 import org.koin.android.ext.android.inject
 
 /**
- * Prompts the user to select an account type. The account type, along with the
+ * Prompts the user to select an account type (IMAP or POP3). The account type, along with the
  * passed in email address, password and makeDefault are then passed on to the
  * AccountSetupIncoming activity.
  */
-- 
GitLab


From b6f8f3e25e9c71de8bab0fcefd8d62435038bf2a Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 14 Feb 2023 16:55:10 +0100
Subject: [PATCH 3/8] include import button into the activity class

---
 .../com/fsck/k9/activity/setup/AccountSetupBasics.kt  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 5cdcd66824..388e189a2f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -13,6 +13,7 @@ import android.widget.Button
 import android.widget.CheckBox
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
 import com.fsck.k9.Account
 import com.fsck.k9.Core
 import com.fsck.k9.EmailAddressValidator
@@ -69,6 +70,7 @@ class AccountSetupBasics : K9Activity() {
     private lateinit var advancedOptionsContainer: View
     private lateinit var nextButton: Button
     private lateinit var manualSetupButton: Button
+    private lateinit var importSettingsButton: Button
     private lateinit var allowClientCertificateView: ViewGroup
 
     private var uiState = UiState.EMAIL_ADDRESS_ONLY
@@ -89,8 +91,17 @@ class AccountSetupBasics : K9Activity() {
         advancedOptionsContainer = findViewById(R.id.foldable_advanced_options)
         nextButton = findViewById(R.id.next)
         manualSetupButton = findViewById(R.id.manual_setup)
+        importSettingsButton = findViewById(R.id.import_settings)
 
         manualSetupButton.setOnClickListener { onManualSetup() }
+        importSettingsButton.setOnClickListener { onImportSettings() }
+    }
+
+    private fun onImportSettings() {
+        TODO("Not yet implemented")
+
+        // TODO find a way to start SettingsImportFragment
+
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
-- 
GitLab


From c307ec7bf7018908277f81126c2714ed80238ed0 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 15 Feb 2023 09:21:58 +0100
Subject: [PATCH 4/8] add new activity for loading importSettingFragment

---
 app/k9mail/src/main/AndroidManifest.xml        |  5 +++++
 .../k9/activity/setup/AccountSetupBasics.kt    |  7 +------
 .../setup/AccountSetupImportSettings.kt        | 18 ++++++++++++++++++
 .../layout/account_setup_import_settings.xml   | 15 +++++++++++++++
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
 create mode 100644 app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml

diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index 6c889e67bd..ff83a77387 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -75,6 +75,11 @@
             android:configChanges="locale"
             android:label="@string/account_setup_basics_title"/>
 
+        <activity
+            android:name=".activity.setup.AccountSetupImportSettings"
+            android:configChanges="locale"
+            android:label="@string/settings_import_title"/>
+
         <activity
             android:name=".activity.setup.AccountSetupAccountType"
             android:configChanges="locale"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 388e189a2f..f81effa50e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -5,7 +5,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.provider.Settings
 import android.text.Editable
 import android.view.View
 import android.view.ViewGroup
@@ -13,12 +12,10 @@ import android.widget.Button
 import android.widget.CheckBox
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavController
 import com.fsck.k9.Account
 import com.fsck.k9.Core
 import com.fsck.k9.EmailAddressValidator
 import com.fsck.k9.Preferences
-import com.fsck.k9.account.AccountCreationAction
 import com.fsck.k9.account.AccountCreator
 import com.fsck.k9.activity.MessageList
 import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection
@@ -98,9 +95,7 @@ class AccountSetupBasics : K9Activity() {
     }
 
     private fun onImportSettings() {
-        TODO("Not yet implemented")
-
-        // TODO find a way to start SettingsImportFragment
+        //val intent : Intent = Intent(this, )
 
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
new file mode 100644
index 0000000000..6679680713
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
@@ -0,0 +1,18 @@
+package com.fsck.k9.activity.setup
+
+import android.os.Bundle
+import com.fsck.k9.ui.R
+import com.fsck.k9.ui.base.K9Activity
+
+/**
+ * Prompts the user to select a exported settings file
+ *
+ */
+class AccountSetupImportSettings : K9Activity() {
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setLayout(R.layout.account_setup_import_settings)
+        setTitle(R.string.settings_import_title)
+    }
+}
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
new file mode 100644
index 0000000000..f826f23999
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    tools:context="com.fsck.k9.activity.setup.AccountSetupImportSettings">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="com.fsck.k9.ui.settings.import.SettingsImportFragment" />
+
+</LinearLayout>
-- 
GitLab


From c35ae3bda338ed172b42e148c692ec73bd1d5fe5 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 15 Feb 2023 09:29:07 +0100
Subject: [PATCH 5/8] Call the new activity from activity basic setup

---
 .../com/fsck/k9/activity/setup/AccountSetupBasics.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index f81effa50e..160db8e506 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -94,11 +94,6 @@ class AccountSetupBasics : K9Activity() {
         importSettingsButton.setOnClickListener { onImportSettings() }
     }
 
-    private fun onImportSettings() {
-        //val intent : Intent = Intent(this, )
-
-    }
-
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
 
@@ -344,6 +339,11 @@ class AccountSetupBasics : K9Activity() {
         AccountSetupAccountType.actionSelectAccountType(this, account, makeDefault = false, initialAccountSettings)
     }
 
+    private fun onImportSettings() {
+        val intent : Intent = Intent(this, AccountSetupImportSettings::class.java)
+        startActivity(intent)
+    }
+
     private fun initAccount(email: String): Account {
         val account = this.account ?: createAccount().also { this.account = it }
 
-- 
GitLab


From 3220b929d42290eb21e355c6becec009794f88a3 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 15 Feb 2023 09:57:59 +0100
Subject: [PATCH 6/8] Add missing licence header and apply Jonathan's
 suggestion

---
 .../fsck/k9/activity/setup/AccountSetupBasics.kt |  2 +-
 .../activity/setup/AccountSetupImportSettings.kt | 16 ++++++++++++++++
 .../res/layout/account_setup_import_settings.xml | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 160db8e506..5a49854bc3 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -340,7 +340,7 @@ class AccountSetupBasics : K9Activity() {
     }
 
     private fun onImportSettings() {
-        val intent : Intent = Intent(this, AccountSetupImportSettings::class.java)
+        val intent = Intent(this, AccountSetupImportSettings::class.java)
         startActivity(intent)
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
index 6679680713..4928562f83 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright MURENA SAS 2023
+ * 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 com.fsck.k9.activity.setup
 
 import android.os.Bundle
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
index f826f23999..9d055712fd 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
+++ b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright MURENA SAS 2023
+  ~ 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/>.
+  -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-- 
GitLab


From 06a8167b97e0d134b13d0b970ef57bdc0181a6f8 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Wed, 15 Feb 2023 10:17:13 +0100
Subject: [PATCH 7/8] add missing element in activity_import_settings layout

---
 .../src/main/res/layout/account_setup_import_settings.xml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
index 9d055712fd..be4964ac8c 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
+++ b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
@@ -21,7 +21,8 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     tools:context="com.fsck.k9.activity.setup.AccountSetupImportSettings">
-
+    
+    <include layout="@layout/toolbar" />
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-- 
GitLab


From 3b1563241528e17a755d337d9237b08ee91002ae Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Thu, 16 Feb 2023 19:36:14 +0600
Subject: [PATCH 8/8] Fix navigation issues

---
 .../k9/activity/setup/AccountSetupBasics.kt   |  1 +
 .../setup/AccountSetupImportSettings.kt       | 44 +++++++++++++++++++
 .../layout/account_setup_import_settings.xml  |  1 +
 3 files changed, 46 insertions(+)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index 5a49854bc3..3e31c8ed4a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -342,6 +342,7 @@ class AccountSetupBasics : K9Activity() {
     private fun onImportSettings() {
         val intent = Intent(this, AccountSetupImportSettings::class.java)
         startActivity(intent)
+        finish()
     }
 
     private fun initAccount(email: String): Account {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
index 4928562f83..aa0b846104 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupImportSettings.kt
@@ -16,9 +16,16 @@
 
 package com.fsck.k9.activity.setup
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
+import android.view.MenuItem
+import com.fsck.k9.activity.MessageList
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.K9Activity
+import com.fsck.k9.ui.settings.import.SettingsImportResultViewModel
+import com.fsck.k9.ui.settings.import.SettingsImportSuccess
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 /**
  * Prompts the user to select a exported settings file
@@ -26,9 +33,46 @@ import com.fsck.k9.ui.base.K9Activity
  */
 class AccountSetupImportSettings : K9Activity() {
 
+    private val resultViewModel: SettingsImportResultViewModel by viewModel()
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setLayout(R.layout.account_setup_import_settings)
+        setUpActionBar()
+
+        handleOnSuccessCallback()
+    }
+
+    private fun handleOnSuccessCallback() {
+        resultViewModel.settingsImportResult.observe(this) {
+            if (it == SettingsImportSuccess) {
+                startActivityClearTop(MessageList::class.java)
+            }
+        }
+    }
+
+    private fun <T : Activity> startActivityClearTop(clazz: Class<T>) {
+        val intent = Intent(this@AccountSetupImportSettings, clazz)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+        finish()
+    }
+
+    private fun setUpActionBar() {
         setTitle(R.string.settings_import_title)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onBackPressed() {
+        startActivityClearTop(AccountSetupBasics::class.java)
     }
 }
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
index be4964ac8c..74eeb9a10f 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
+++ b/app/ui/legacy/src/main/res/layout/account_setup_import_settings.xml
@@ -23,6 +23,7 @@
     tools:context="com.fsck.k9.activity.setup.AccountSetupImportSettings">
     
     <include layout="@layout/toolbar" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
-- 
GitLab