From fea0f0077bbe1b007e2efb038c180a0df7ccd80e Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Fri, 18 Aug 2023 09:18:43 +0200
Subject: [PATCH 1/5] send broadcast to start eDrive

---
 app/src/main/AndroidManifest.xml                                | 2 ++
 .../java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24a70afbf..e519e3144 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,6 +27,8 @@
     <!-- android.permission-group.CALENDAR -->
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <!-- android.permission.eDrive -->
+    <uses-permission android:name="foundation.e.permission.ADD_ACCOUNT"/>
 
     <!-- android.permission-group.LOCATION -->
     <!-- getting the WiFi name (for "sync in Wifi only") requires
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 343ae97ef..9afc93e56 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -182,7 +182,7 @@ class AccountDetailsFragment : Fragment() {
                             intent.setPackage(getString(R.string.e_drive_package_name))
                             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
                             intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
-                            requireActivity().startService(intent)
+                            requireActivity().sendBroadcast(intent)
                         }
 
                         handlePostAuthOperations()
-- 
GitLab


From 42f182aafcf75823eac372b1095f6e41e0c90c41 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Fri, 18 Aug 2023 15:20:24 +0200
Subject: [PATCH 2/5] fix intent for broadcast

---
 .../at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 9afc93e56..080986129 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -178,8 +178,10 @@ class AccountDetailsFragment : Fragment() {
                         }
 
                         if (requireActivity().intent.getStringExtra(LoginActivity.ACCOUNT_TYPE) == getString(R.string.eelo_account_type)) {
-                            val intent = Intent("drive.services.InitializerService")
-                            intent.setPackage(getString(R.string.e_drive_package_name))
+                            val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
+                            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+                            intent.component =
+                                ComponentName(getString(R.string.e_drive_package_name), "foundation.e.drive.account.receivers.AccountAddedReceiver")
                             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
                             intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
                             requireActivity().sendBroadcast(intent)
-- 
GitLab


From bd32ba7ad8bbc3621c34e61cc9704fc9089bfd79 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 17 Oct 2023 15:32:51 +0200
Subject: [PATCH 3/5] extract code into dedicated method

---
 .../ui/setup/AccountDetailsFragment.kt        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 080986129..33f71923f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -178,13 +178,7 @@ class AccountDetailsFragment : Fragment() {
                         }
 
                         if (requireActivity().intent.getStringExtra(LoginActivity.ACCOUNT_TYPE) == getString(R.string.eelo_account_type)) {
-                            val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
-                            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
-                            intent.component =
-                                ComponentName(getString(R.string.e_drive_package_name), "foundation.e.drive.account.receivers.AccountAddedReceiver")
-                            intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
-                            intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
-                            requireActivity().sendBroadcast(intent)
+                            triggerFileSyncSetup(name)
                         }
 
                         handlePostAuthOperations()
@@ -196,6 +190,18 @@ class AccountDetailsFragment : Fragment() {
         return v.root
     }
 
+
+    private fun triggerFileSyncSetup(name: String) {
+        val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+        intent.component =
+            ComponentName(getString(R.string.e_drive_package_name), "foundation.e.drive.account.receivers.AccountAddedReceiver")
+        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
+        intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
+        requireActivity().sendBroadcast(intent)
+    }
+
+
     private fun handlePostAuthOperations() {
         val packageToBeOpened = requireActivity().intent.getStringExtra(LoginActivity.OPEN_APP_PACKAGE_AFTER_AUTH)
         val activityToBeOpened = requireActivity().intent.getStringExtra(LoginActivity.OPEN_APP_ACTIVITY_AFTER_AUTH)
-- 
GitLab


From dbd935649cd3dd71ced58633d8b57987c8666651 Mon Sep 17 00:00:00 2001
From: vincent Bourgmayer <vincent.bourgmayer@e.email>
Date: Tue, 17 Oct 2023 16:35:22 +0200
Subject: [PATCH 4/5] apply jonathan's fix

---
 .../at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 33f71923f..04b56a6c3 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -178,7 +178,7 @@ class AccountDetailsFragment : Fragment() {
                         }
 
                         if (requireActivity().intent.getStringExtra(LoginActivity.ACCOUNT_TYPE) == getString(R.string.eelo_account_type)) {
-                            triggerFileSyncSetup(name)
+                            notifyEdrive(name)
                         }
 
                         handlePostAuthOperations()
@@ -191,7 +191,7 @@ class AccountDetailsFragment : Fragment() {
     }
 
 
-    private fun triggerFileSyncSetup(name: String) {
+    private fun notifyEdrive(name: String) {
         val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
         intent.component =
-- 
GitLab


From 1bd2ff51c9faa3ab35b556d1ad0961f42ca79459 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Tue, 17 Oct 2023 15:01:17 +0000
Subject: [PATCH 5/5] Apply 1 suggestion(s) to 1 file(s)

---
 .../at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 04b56a6c3..37bcb67b2 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -195,7 +195,11 @@ class AccountDetailsFragment : Fragment() {
         val intent = Intent("foundation.e.drive.action.ADD_ACCOUNT")
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
         intent.component =
-            ComponentName(getString(R.string.e_drive_package_name), "foundation.e.drive.account.receivers.AccountAddedReceiver")
+            ComponentName(
+                getString(R.string.e_drive_package_name), 
+                "foundation.e.drive.account.receivers.AccountAddedReceiver"
+            )
+
         intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
         intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
         requireActivity().sendBroadcast(intent)
-- 
GitLab