From 7d083e3749b300c25ada41473b78ad7b00aa04f1 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 5 Aug 2024 10:09:29 +0800
Subject: [PATCH] AccountProvider: Migrate to object

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../com/aurora/store/data/providers/AccountProvider.kt   | 9 +++------
 .../com/aurora/store/view/ui/account/LogoutDialog.kt     | 2 +-
 .../com/aurora/store/viewmodel/auth/AuthViewModel.kt     | 3 +--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
index 7dc2bb6aa..8012606b6 100644
--- a/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
+++ b/app/src/main/java/com/aurora/store/data/providers/AccountProvider.kt
@@ -21,15 +21,12 @@ package com.aurora.store.data.providers
 
 import android.content.Context
 import com.aurora.Constants
-import com.aurora.store.data.SingletonHolder
 import com.aurora.store.data.model.AccountType
 import com.aurora.store.util.Preferences
 
-class AccountProvider private constructor(var context: Context) {
+object AccountProvider {
 
-    companion object : SingletonHolder<AccountProvider, Context>(::AccountProvider)
-
-    fun getAccountType(): AccountType {
+    fun getAccountType(context: Context): AccountType {
         val rawType = Preferences.getString(context, Constants.ACCOUNT_TYPE)
         return when (rawType) {
             "GOOGLE" -> AccountType.GOOGLE
@@ -37,7 +34,7 @@ class AccountProvider private constructor(var context: Context) {
         }
     }
 
-    fun logout() {
+    fun logout(context: Context) {
         Preferences.putBoolean(context, Constants.ACCOUNT_SIGNED_IN, false)
         Preferences.putString(context, Constants.ACCOUNT_EMAIL_PLAIN, "")
         Preferences.putString(context, Constants.ACCOUNT_AAS_PLAIN, "")
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/LogoutDialog.kt b/app/src/main/java/com/aurora/store/view/ui/account/LogoutDialog.kt
index 6f1ffc829..e357852af 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/LogoutDialog.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/LogoutDialog.kt
@@ -23,7 +23,7 @@ class LogoutDialog: DialogFragment() {
     }
 
     private fun logout() {
-        AccountProvider.with(requireContext()).logout()
+        AccountProvider.logout(requireContext())
         UpdateWorker.cancelAutomatedCheck(requireContext())
         findNavController().navigate(LogoutDialogDirections.actionLogoutDialogToSplashFragment())
     }
diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
index 419157bb6..6b365dd23 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
@@ -166,8 +166,7 @@ class AuthViewModel @Inject constructor(
                         liveData.postValue(AuthState.Valid)
                     } else {
                         //Generate and validate new auth
-                        val type = AccountProvider.with(context).getAccountType()
-                        when (type) {
+                        when (AccountProvider.getAccountType(context)) {
                             AccountType.GOOGLE -> {
                                 val email = Preferences.getString(
                                     context,