From 8f40f142c9c5b269885cac804c2f2286167d174d Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Mon, 9 May 2022 16:02:47 +0530
Subject: [PATCH 1/2] AccountManager: Ditch Jcenter

---
 app/build.gradle | 2 +-
 build.gradle     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9b4d27e90..fd0c4f215 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,7 +129,7 @@ dependencies {
     implementation 'androidx.paging:paging-runtime-ktx:2.1.0'
     implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
-    implementation 'com.google.android:flexbox:1.1.0'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation 'com.google.android.material:material:1.2.0-alpha03'
     implementation 'androidx.browser:browser:1.0.0'
 
diff --git a/build.gradle b/build.gradle
index fd60b5991..7158999ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
     ]
 
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
@@ -26,8 +26,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }
-- 
GitLab


From 46d65a0ec611ec37c213d946d719de33c5a7a449 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Mon, 9 May 2022 14:32:26 +0530
Subject: [PATCH 2/2] AccountManager: dont show /e/ pref on non e accounts

---
 ...ccount_authenticator_eelo_address_book.xml |  2 +-
 .../res/xml/eelo_account_authenticator.xml    |  2 +-
 app/src/main/res/xml/sync_prefs.xml           | 13 ++++-----
 app/src/main/res/xml/sync_prefs_eelo.xml      | 27 +++++++++++++++++++
 4 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/xml/sync_prefs_eelo.xml

diff --git a/app/src/main/res/xml/account_authenticator_eelo_address_book.xml b/app/src/main/res/xml/account_authenticator_eelo_address_book.xml
index dc56c591a..4538cc3b1 100644
--- a/app/src/main/res/xml/account_authenticator_eelo_address_book.xml
+++ b/app/src/main/res/xml/account_authenticator_eelo_address_book.xml
@@ -7,7 +7,7 @@
   -->
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountPreferences="@xml/sync_prefs"
+    android:accountPreferences="@xml/sync_prefs_eelo"
     android:accountType="@string/account_type_eelo_address_book"
     android:icon="@drawable/ic_account_provider_eelo"
     android:label="@string/account_title_eelo_address_book"
diff --git a/app/src/main/res/xml/eelo_account_authenticator.xml b/app/src/main/res/xml/eelo_account_authenticator.xml
index c30176907..461d3b3c3 100644
--- a/app/src/main/res/xml/eelo_account_authenticator.xml
+++ b/app/src/main/res/xml/eelo_account_authenticator.xml
@@ -7,7 +7,7 @@
   -->
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountPreferences="@xml/sync_prefs"
+    android:accountPreferences="@xml/sync_prefs_eelo"
     android:accountType="@string/eelo_account_type"
     android:icon="@drawable/ic_account_provider_eelo"
     android:label="@string/eelo_account_name"
diff --git a/app/src/main/res/xml/sync_prefs.xml b/app/src/main/res/xml/sync_prefs.xml
index 159726f55..d652271cd 100644
--- a/app/src/main/res/xml/sync_prefs.xml
+++ b/app/src/main/res/xml/sync_prefs.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
   ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
   ~ All rights reserved. This program and the accompanying materials
@@ -13,15 +12,13 @@
 
     <PreferenceScreen
         android:iconSpaceReserved="true"
-        android:summary="@string/advanced_account_summary"
-        android:title="@string/advanced_account_title"
+        android:summary="@string/manage_account_description"
+        android:title="@string/manage_accounts"
         android:order="300"
-        settings:allowDividerBelow="false">
+        settings:allowDividerAbove="false">
         <intent
             android:action="ACTION_VIEW"
-            android:targetClass="foundation.e.drive.activity.AccountsActivity"
-            android:targetPackage="foundation.e.drive" />
+            android:targetClass="foundation.e.accountmanager.ui.AccountsActivity"
+            android:targetPackage="foundation.e.accountmanager" />
     </PreferenceScreen>
 </PreferenceScreen>
-
-
diff --git a/app/src/main/res/xml/sync_prefs_eelo.xml b/app/src/main/res/xml/sync_prefs_eelo.xml
new file mode 100644
index 000000000..159726f55
--- /dev/null
+++ b/app/src/main/res/xml/sync_prefs_eelo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+  ~ 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
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceScreen
+        android:iconSpaceReserved="true"
+        android:summary="@string/advanced_account_summary"
+        android:title="@string/advanced_account_title"
+        android:order="300"
+        settings:allowDividerBelow="false">
+        <intent
+            android:action="ACTION_VIEW"
+            android:targetClass="foundation.e.drive.activity.AccountsActivity"
+            android:targetPackage="foundation.e.drive" />
+    </PreferenceScreen>
+</PreferenceScreen>
+
+
-- 
GitLab