From afbd5c72c28f8daf8a57a2d024c9a0fbc778c49c Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 13 Dec 2022 04:31:06 +0530
Subject: [PATCH 1/8] add third button to sign in fragment

---
 app/src/main/res/layout/fragment_sign_in.xml | 35 +++++++++++++++-----
 app/src/main/res/values/strings.xml          |  3 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/fragment_sign_in.xml b/app/src/main/res/layout/fragment_sign_in.xml
index 4cec5188d..694d0ed95 100644
--- a/app/src/main/res/layout/fragment_sign_in.xml
+++ b/app/src/main/res/layout/fragment_sign_in.xml
@@ -94,13 +94,32 @@
             android:layout_marginHorizontal="15dp"
             android:text="@string/sign_in_google"
             android:textColor="@color/colorAccent"
-            app:cornerRadius="8dp"
+            app:cornerRadius="5dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:strokeColor="@color/colorAccent" />
 
+        <Button
+            android:id="@+id/anonymousBT"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/sign_in_anonymous"
+            android:textColor="@color/colorAccent"
+            app:cornerRadius="5dp"
+            app:icon="@drawable/ic_incognito"
+            app:iconGravity="textStart"
+            app:iconPadding="15dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/googleBT"
+            app:strokeColor="@color/colorAccent" />
+
         <TextView
             android:id="@+id/textView"
             android:layout_width="wrap_content"
@@ -110,25 +129,23 @@
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/googleBT" />
+            app:layout_constraintTop_toBottomOf="@id/anonymousBT"/>
 
         <Button
-            android:id="@+id/anonymousBT"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:id="@+id/noGoogleBT"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="15dp"
             android:layout_marginTop="5dp"
-            android:text="@string/sign_in_anonymous"
+            android:text="@string/pwa_and_open_source_apps"
             android:textColor="@color/colorAccent"
             app:cornerRadius="8dp"
-            app:icon="@drawable/ic_incognito"
             app:iconGravity="textStart"
             app:iconPadding="15dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.551"
+            app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView"
+            app:layout_constraintTop_toBottomOf="@id/textView"
             app:strokeColor="@color/colorAccent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbcdb80bf..b1bac90e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,7 +42,8 @@
     <string name="sign_in_desc">Sign in to App Lounge using your Google account, or select the Anonymous mode to sign in privately.</string>
     <string name="sign_in_google">Sign in with Google</string>
     <string name="sign_in_anonymous">Anonymous mode</string>
-    <string name="or">or</string>
+    <string name="or">Or show only</string>
+    <string name="pwa_and_open_source_apps">PWA and Open Source apps</string>
 
     <!-- TOS Fragment -->
     <string name="tos_agree">Accept</string>
-- 
GitLab


From 144061de00fe79eae3d6ebe14f92e13ac3186941 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 13 Dec 2022 17:54:19 +0530
Subject: [PATCH 2/8] define User type NO_GOOGLE

---
 .../java/foundation/e/apps/application/ApplicationFragment.kt    | 1 +
 .../e/apps/applicationlist/ApplicationListRVAdapter.kt           | 1 +
 .../main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt | 1 +
 app/src/main/java/foundation/e/apps/utils/enums/User.kt          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt
index 62d3a62f6..120548de2 100644
--- a/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt
+++ b/app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt
@@ -526,6 +526,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) {
         installButton.setOnClickListener {
             val errorMsg = when (mainActivityViewModel.getUser()) {
                 User.ANONYMOUS,
+                User.NO_GOOGLE,
                 User.UNAVAILABLE -> getString(R.string.install_blocked_anonymous)
                 User.GOOGLE -> getString(R.string.install_blocked_google)
             }
diff --git a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt b/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt
index 0c45331ab..effd048ad 100644
--- a/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/applicationlist/ApplicationListRVAdapter.kt
@@ -339,6 +339,7 @@ class ApplicationListRVAdapter(
             setOnClickListener {
                 val errorMsg = when (mainActivityViewModel.getUser()) {
                     User.ANONYMOUS,
+                    User.NO_GOOGLE,
                     User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)
                     User.GOOGLE -> view.context.getString(R.string.install_blocked_google)
                 }
diff --git a/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt b/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt
index 44f0281a5..5eecedc3c 100644
--- a/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt
+++ b/app/src/main/java/foundation/e/apps/home/model/HomeChildRVAdapter.kt
@@ -147,6 +147,7 @@ class HomeChildRVAdapter(
         installButton.setOnClickListener {
             val errorMsg = when (mainActivityViewModel.getUser()) {
                 User.ANONYMOUS,
+                User.NO_GOOGLE,
                 User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)
                 User.GOOGLE -> view.context.getString(R.string.install_blocked_google)
             }
diff --git a/app/src/main/java/foundation/e/apps/utils/enums/User.kt b/app/src/main/java/foundation/e/apps/utils/enums/User.kt
index f1bc469ca..1363b7fa0 100644
--- a/app/src/main/java/foundation/e/apps/utils/enums/User.kt
+++ b/app/src/main/java/foundation/e/apps/utils/enums/User.kt
@@ -1,6 +1,7 @@
 package foundation.e.apps.utils.enums
 
 enum class User {
+    NO_GOOGLE,
     ANONYMOUS,
     GOOGLE,
     UNAVAILABLE
-- 
GitLab


From bf20cdc3c35124940108681374524e865d9ba1a5 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Tue, 13 Dec 2022 17:56:20 +0530
Subject: [PATCH 3/8] code for login as no-google mode from sign in page

---
 .../java/foundation/e/apps/login/LoginCommon.kt   |  8 ++++++++
 .../foundation/e/apps/login/LoginDataStore.kt     |  7 +++++++
 .../e/apps/login/LoginSourceRepository.kt         |  4 ++++
 .../foundation/e/apps/login/LoginViewModel.kt     | 15 +++++++++++++++
 .../e/apps/setup/signin/SignInFragment.kt         |  7 +++++++
 .../e/apps/updates/manager/UpdatesWorker.kt       |  2 +-
 6 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
index 1f0e82aa5..63f9a23e8 100644
--- a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
+++ b/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
@@ -17,6 +17,7 @@
 
 package foundation.e.apps.login
 
+import foundation.e.apps.utils.Constants
 import foundation.e.apps.utils.enums.User
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -39,6 +40,13 @@ class LoginCommon @Inject constructor(
         loginDataStore.saveGoogleLogin(email, oauth)
     }
 
+    suspend fun setNoGoogleMode() {
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_FOSS, true)
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_PWA, true)
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_GPLAY, false)
+        loginDataStore.saveUserType(User.NO_GOOGLE)
+    }
+
     suspend fun logout() {
         loginDataStore.destroyCredentials()
         loginDataStore.clearUserType()
diff --git a/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt b/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt
index 6a1023528..30f633487 100644
--- a/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt
+++ b/app/src/main/java/foundation/e/apps/login/LoginDataStore.kt
@@ -148,6 +148,13 @@ class LoginDataStore @Inject constructor(
     fun isPWASelected() = preferenceManager.getBoolean(PREFERENCE_SHOW_PWA, true)
     fun isGplaySelected() = preferenceManager.getBoolean(PREFERENCE_SHOW_GPLAY, true)
 
+    fun setSource(source: String, value: Boolean) {
+        preferenceManager.edit().run {
+            this.putBoolean(source, value)
+            apply()
+        }
+    }
+
     // Clear data
 
     /**
diff --git a/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt b/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt
index e403c8ba1..ddc4bb392 100644
--- a/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt
+++ b/app/src/main/java/foundation/e/apps/login/LoginSourceRepository.kt
@@ -51,6 +51,10 @@ class LoginSourceRepository @Inject constructor(
         loginCommon.saveGoogleLogin(email, oauth)
     }
 
+    suspend fun setNoGoogleMode() {
+        loginCommon.setNoGoogleMode()
+    }
+
     suspend fun logout() {
         loginCommon.logout()
     }
diff --git a/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt b/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt
index e8ead1327..d4bee02b9 100644
--- a/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt
+++ b/app/src/main/java/foundation/e/apps/login/LoginViewModel.kt
@@ -84,6 +84,21 @@ class LoginViewModel @Inject constructor(
         }
     }
 
+    /**
+     * Call this to use No-Google mode, i.e. show only PWAs and F-droid apps,
+     * without contacting Google servers.
+     * This method is called only for the first time when logging in the user.
+     * @param onUserSaved Code to execute once email, oauthToken and user is saved.
+     * Ends the sign in screen.
+     */
+    fun initialNoGoogleLogin(onUserSaved: () -> Unit) {
+        viewModelScope.launch {
+            loginSourceRepository.setNoGoogleMode()
+            onUserSaved()
+            startLoginFlow()
+        }
+    }
+
     /**
      * Clears all saved data and logs out the user to the sign in screen.
      */
diff --git a/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt b/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt
index ffd568aa0..becf88684 100644
--- a/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt
+++ b/app/src/main/java/foundation/e/apps/setup/signin/SignInFragment.kt
@@ -35,6 +35,13 @@ class SignInFragment : Fragment(R.layout.fragment_sign_in) {
                     .safeNavigate(R.id.signInFragment, R.id.action_signInFragment_to_homeFragment)
             }
         }
+
+        binding.noGoogleBT.setOnClickListener {
+            viewModel.initialNoGoogleLogin {
+                view.findNavController()
+                    .safeNavigate(R.id.signInFragment, R.id.action_signInFragment_to_homeFragment)
+            }
+        }
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt b/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt
index 7ddd47bcd..a7f724939 100644
--- a/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt
+++ b/app/src/main/java/foundation/e/apps/updates/manager/UpdatesWorker.kt
@@ -91,7 +91,7 @@ class UpdatesWorker @AssistedInject constructor(
             /*
              * Signifies valid Google user and valid auth data to update
              * apps from Google Play store.
-             * The user check will be more useful in No Google mode.
+             * The user check will be more useful in No-Google mode.
              */
             val updateData = updatesManagerRepository.getUpdates(authData)
             appsNeededToUpdate.addAll(updateData.first)
-- 
GitLab


From 6e91409b4097e95ddcc8af7ca4b117915efdc09d Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 14 Dec 2022 03:57:41 +0530
Subject: [PATCH 4/8] Settings screen adjustment for no-google mode

---
 .../e/apps/settings/SettingsFragment.kt       | 43 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  5 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
index a39a043fc..39e0e71df 100644
--- a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
@@ -31,6 +31,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.work.ExistingPeriodicWorkPolicy
 import coil.load
+import com.google.android.material.snackbar.Snackbar
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.BuildConfig
@@ -71,6 +72,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
         private const val TAG = "SettingsFragment"
     }
 
+    private val user by lazy {
+        mainActivityViewModel.getUser()
+    }
+
     private val allSourceCheckboxes by lazy {
         listOf(showAllApplications, showFOSSApplications, showPWAApplications)
     }
@@ -166,6 +171,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
                             binding.avatar.load(authData.userProfile?.artwork?.url)
                         }
                     }
+                    User.NO_GOOGLE.name -> {
+                        binding.accountType.setText(R.string.logged_out)
+                    }
                 }
             }
         }
@@ -177,6 +185,41 @@ class SettingsFragment : PreferenceFragmentCompat() {
         binding.logout.setOnClickListener {
             loginViewModel.logout()
         }
+
+        if (user == User.NO_GOOGLE) {
+            /*
+             * For No-Google mode, do not allow the user to click
+             * on the option to show GPlay apps.
+             * Instead show a message and prompt them to login.
+             */
+            showAllApplications?.apply {
+                setOnPreferenceChangeListener { _, _ ->
+                    Snackbar.make(
+                        binding.root,
+                        R.string.login_to_see_gplay_apps,
+                        Snackbar.LENGTH_SHORT
+                    ).setAction(R.string.login) {
+                        /*
+                         * The login and logout logic is the same,
+                         * it clears all login data (authdata, user selection)
+                         * and restarts the login flow.
+                         * Hence it's the same as logout.
+                         */
+                        binding.logout.performClick()
+                    }.show()
+                    this.isChecked = false
+                    return@setOnPreferenceChangeListener false
+                }
+            }
+
+            /*
+             * For no-google mode, just show a "Login" instead of "Logout".
+             * The background logic is the same.
+             */
+            binding.logout.apply {
+                setText(R.string.login)
+            }
+        }
     }
 
     fun isAnyAppSourceSelected() =
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1bac90e5..39baaa291 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,10 @@
     <string name="terms_services">Terms of Services</string>
     <string name="user_anonymous">Anonymous</string>
     <string name="logout">Log Out</string>
+    <string name="select_one_source_of_applications">Please select at least one source of applications.</string>
+    <string name="login_to_see_gplay_apps">You need to log in to see common apps.</string>
+    <string name="login">Login</string>
+    <string name="logged_out">Logged out</string>
 
     <!-- Application -->
     <string name="description">Description</string>
@@ -210,7 +214,6 @@
     <string name="install_anyway">Install anyway</string>
     <string name="this_app_may_not_work_properly">This app may not work properly!</string>
     <string name="may_not_work_warning_message">Forcing installation will allow you to download and install it, but it won\'t guarantee that it will work.&lt;br /&gt;&lt;br /&gt;Attempting to install unsupported apps may cause crashes or slow down the system.&lt;br /&gt;&lt;br /&gt;We\'re working on improving compatiblity with this application in a near future.</string>
-    <string name="select_one_source_of_applications">Please select at least one source of applications.</string>
 
     <string name="daily">Daily</string>
     <string name="weekly">Weekly</string>
-- 
GitLab


From 91ed132b4e74c9354bd0ce8aaabbb4fa7091da36 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 14 Dec 2022 03:58:36 +0530
Subject: [PATCH 5/8] show common apps to top of checkboxes as shown in renders

---
 app/src/main/res/xml/settings_preferences.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index 90bf05a8f..2672c00a1 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -69,25 +69,25 @@
 
         <CheckBoxPreference
             android:defaultValue="true"
-            android:key="showFOSSApplications"
+            android:key="showAllApplications"
             android:layout="@layout/layout_custom_checkbox_preference"
-            android:title="@string/show_only_open_source_apps"
+            android:title="@string/Show_common_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
         <CheckBoxPreference
             android:defaultValue="true"
-            android:key="showPWAApplications"
+            android:key="showFOSSApplications"
             android:layout="@layout/layout_custom_checkbox_preference"
-            android:title="@string/show_only_pwa_apps"
+            android:title="@string/show_only_open_source_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
         <CheckBoxPreference
             android:defaultValue="true"
-            android:key="showAllApplications"
+            android:key="showPWAApplications"
             android:layout="@layout/layout_custom_checkbox_preference"
-            android:title="@string/Show_common_apps"
+            android:title="@string/show_only_pwa_apps"
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
-- 
GitLab


From 1618eb540febfe3a97eb501b1cddd917b9d7144c Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 14 Dec 2022 04:00:18 +0530
Subject: [PATCH 6/8] Settings screen - center account type textview

---
 .../main/java/foundation/e/apps/settings/SettingsFragment.kt | 5 ++++-
 app/src/main/res/layout/custom_preference.xml                | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt b/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
index 39e0e71df..b6e5da083 100644
--- a/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
+++ b/app/src/main/java/foundation/e/apps/settings/SettingsFragment.kt
@@ -23,6 +23,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
@@ -162,7 +163,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
             mainActivityViewModel.getUser().name.let { user ->
                 when (user) {
                     User.ANONYMOUS.name -> {
-                        binding.accountType.text = view.context.getString(R.string.user_anonymous)
+                        binding.accountType.setText(R.string.user_anonymous)
+                        binding.email.isVisible = false
                     }
                     User.GOOGLE.name -> {
                         if (!authData.isAnonymous) {
@@ -173,6 +175,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
                     }
                     User.NO_GOOGLE.name -> {
                         binding.accountType.setText(R.string.logged_out)
+                        binding.email.isVisible = false
                     }
                 }
             }
diff --git a/app/src/main/res/layout/custom_preference.xml b/app/src/main/res/layout/custom_preference.xml
index c1805653e..2ebf0bbbd 100644
--- a/app/src/main/res/layout/custom_preference.xml
+++ b/app/src/main/res/layout/custom_preference.xml
@@ -85,6 +85,7 @@
                 android:textSize="15sp"
                 app:layout_constraintStart_toEndOf="@id/avatar"
                 app:layout_constraintTop_toTopOf="@id/avatar"
+                app:layout_constraintBottom_toTopOf="@id/email"
                 app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-- 
GitLab


From 76d7a9b58097b23341a9f11f3b88672395337df6 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 14 Dec 2022 04:12:14 +0530
Subject: [PATCH 7/8] reset app source preference on logout

---
 app/src/main/java/foundation/e/apps/login/LoginCommon.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt b/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
index 63f9a23e8..e17d0997b 100644
--- a/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
+++ b/app/src/main/java/foundation/e/apps/login/LoginCommon.kt
@@ -50,5 +50,9 @@ class LoginCommon @Inject constructor(
     suspend fun logout() {
         loginDataStore.destroyCredentials()
         loginDataStore.clearUserType()
+        // reset app source preferences on logout.
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_FOSS, true)
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_PWA, true)
+        loginDataStore.setSource(Constants.PREFERENCE_SHOW_GPLAY, true)
     }
 }
-- 
GitLab


From 43fb8e8e2a1c30cd7446308696fef902c9fd0f26 Mon Sep 17 00:00:00 2001
From: Sayantan Roychowdhury <sayantan.rc@e.email>
Date: Wed, 14 Dec 2022 05:00:29 +0530
Subject: [PATCH 8/8] fix loading forever in search

---
 .../foundation/e/apps/search/SearchFragment.kt | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
index aaa3faa17..9d33f4ffa 100644
--- a/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
+++ b/app/src/main/java/foundation/e/apps/search/SearchFragment.kt
@@ -46,7 +46,6 @@ import foundation.e.apps.AppProgressViewModel
 import foundation.e.apps.MainActivityViewModel
 import foundation.e.apps.PrivacyInfoViewModel
 import foundation.e.apps.R
-import foundation.e.apps.api.ResultSupreme
 import foundation.e.apps.api.fused.FusedAPIInterface
 import foundation.e.apps.api.fused.data.FusedApp
 import foundation.e.apps.application.subFrags.ApplicationDialogFragment
@@ -170,23 +169,20 @@ class SearchFragment :
      */
     private fun updateSearchResult(
         listAdapter: ApplicationListRVAdapter?,
-        it: ResultSupreme<Pair<List<FusedApp>, Boolean>>
+        appList: List<FusedApp>?,
+        hasMore: Boolean,
     ): Boolean {
+        binding.loadingProgressBar.isVisible = hasMore
+
         val currentList = listAdapter?.currentList ?: listOf()
-        if (it.data?.first != null && !searchViewModel.isAnyAppUpdated(
-                it.data?.first!!,
-                currentList
-            )
-        ) {
-            binding.loadingProgressBar.isVisible = it.data!!.second
+        if (appList != null && !searchViewModel.isAnyAppUpdated(appList, currentList)) {
             return false
         }
 
-        binding.loadingProgressBar.isVisible = it.data!!.second
         stopLoadingUI()
         noAppsFoundLayout?.visibility = View.GONE
         searchHintLayout?.visibility = View.GONE
-        listAdapter?.setData(it.data?.first!!)
+        listAdapter?.setData(appList!!)
         return true
     }
 
@@ -266,7 +262,7 @@ class SearchFragment :
 
         val hasMoreDataToLoad = searchViewModel.searchResult.value?.data?.second == true
         mainActivityViewModel.updateStatusOfFusedApps(searchList, fusedDownloadList)
-        updateSearchResult(applicationListRVAdapter, ResultSupreme.Success(Pair(searchList, hasMoreDataToLoad)))
+        updateSearchResult(applicationListRVAdapter, searchList, hasMoreDataToLoad)
     }
 
     override fun onTimeout(
-- 
GitLab