Rename LoginSourceRepository to AuthenticatorRepository (2563176b) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/data/gplay/GplayStoreRepositoryImpl.kt

+11 −11

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
		import foundation.e.apps.R
		import foundation.e.apps.data.fused.utils.CategoryType
		import foundation.e.apps.data.gplay.utils.GPlayHttpClient
		import foundation.e.apps.data.login.LoginSourceRepository
		import foundation.e.apps.data.login.AuthenticatorRepository
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.withContext
		import timber.log.Timber
		@@ -46,13 +46,13 @@ import javax.inject.Inject
		class GplayStoreRepositoryImpl @Inject constructor(
		@ApplicationContext private val context: Context,
		private val gPlayHttpClient: GPlayHttpClient,
		private val loginSourceRepository: LoginSourceRepository
		private val authenticatorRepository: AuthenticatorRepository
		) : GplayStoreRepository {

		override suspend fun getHomeScreenData(): Any {
		val homeScreenData = mutableMapOf<String, List<App>>()
		val homeElements = createTopChartElements()
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		homeElements.forEach {
		val chart = it.value.keys.iterator().next()
		@@ -77,7 +77,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		query: String,
		subBundle: MutableSet<SearchBundle.SubBundle>?
		): Pair<List<App>, MutableSet<SearchBundle.SubBundle>> {
		var authData = loginSourceRepository.gplayAuth!!
		var authData = authenticatorRepository.gplayAuth!!
		val searchHelper =
		SearchHelper(authData).using(gPlayHttpClient)

		@@ -102,7 +102,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		}

		override suspend fun getSearchSuggestions(query: String): List<SearchSuggestEntry> {
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		val searchData = mutableListOf<SearchSuggestEntry>()
		withContext(Dispatchers.IO) {
		@@ -113,7 +113,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		}

		override suspend fun getAppsByCategory(category: String, pageUrl: String?): StreamCluster {
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		val subCategoryHelper =
		CategoryAppsHelper(authData).using(gPlayHttpClient)
		@@ -131,7 +131,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		return categoryList
		}

		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		withContext(Dispatchers.IO) {
		val categoryHelper = CategoryHelper(authData).using(gPlayHttpClient)
		@@ -142,7 +142,7 @@ class GplayStoreRepositoryImpl @Inject constructor(

		override suspend fun getAppDetails(packageNameOrId: String): App? {
		var appDetails: App?
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		withContext(Dispatchers.IO) {
		val appDetailsHelper = AppDetailsHelper(authData).using(gPlayHttpClient)
		@@ -153,7 +153,7 @@ class GplayStoreRepositoryImpl @Inject constructor(

		override suspend fun getAppsDetails(packageNamesOrIds: List<String>): List<App> {
		val appDetailsList = mutableListOf<App>()
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		withContext(Dispatchers.IO) {
		val appDetailsHelper = AppDetailsHelper(authData).using(gPlayHttpClient)
		@@ -185,7 +185,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		offerType: Int
		): List<File> {
		val downloadData = mutableListOf<File>()
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		withContext(Dispatchers.IO) {
		val version = versionCode?.let { it as Int } ?: -1
		@@ -202,7 +202,7 @@ class GplayStoreRepositoryImpl @Inject constructor(
		offerType: Int
		): List<File> {
		val downloadData = mutableListOf<File>()
		val authData = loginSourceRepository.gplayAuth!!
		val authData = authenticatorRepository.gplayAuth!!

		withContext(Dispatchers.IO) {
		val purchaseHelper = PurchaseHelper(authData).using(gPlayHttpClient)

app/src/main/java/foundation/e/apps/data/login/LoginSourceRepository.kt→app/src/main/java/foundation/e/apps/data/login/AuthenticatorRepository.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import javax.inject.Singleton

		@JvmSuppressWildcards
		@Singleton
		class LoginSourceRepository @Inject constructor(
		class AuthenticatorRepository @Inject constructor(
		private val loginCommon: LoginCommon,
		private val authenticators: List<StoreAuthenticator>,
		) {

app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt

+7 −7

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import javax.inject.Inject
		*/
		@HiltViewModel
		class LoginViewModel @Inject constructor(
		private val loginSourceRepository: LoginSourceRepository,
		private val authenticatorRepository: AuthenticatorRepository,
		private val cache: Cache,
		) : ViewModel() {

		@@ -54,7 +54,7 @@ class LoginViewModel @Inject constructor(
		*/
		fun startLoginFlow(clearList: List<String> = listOf()) {
		viewModelScope.launch {
		val authObjectsLocal = loginSourceRepository.getAuthObjects(clearList)
		val authObjectsLocal = authenticatorRepository.getAuthObjects(clearList)
		authObjects.postValue(authObjectsLocal)
		}
		}
		@@ -66,7 +66,7 @@ class LoginViewModel @Inject constructor(
		*/
		fun initialAnonymousLogin(onUserSaved: () -> Unit) {
		viewModelScope.launch {
		loginSourceRepository.saveUserType(User.ANONYMOUS)
		authenticatorRepository.saveUserType(User.ANONYMOUS)
		onUserSaved()
		startLoginFlow()
		}
		@@ -80,8 +80,8 @@ class LoginViewModel @Inject constructor(
		*/
		fun initialGoogleLogin(email: String, oauthToken: String, onUserSaved: () -> Unit) {
		viewModelScope.launch {
		loginSourceRepository.saveGoogleLogin(email, oauthToken)
		loginSourceRepository.saveUserType(User.GOOGLE)
		authenticatorRepository.saveGoogleLogin(email, oauthToken)
		authenticatorRepository.saveUserType(User.GOOGLE)
		onUserSaved()
		startLoginFlow()
		}
		@@ -96,7 +96,7 @@ class LoginViewModel @Inject constructor(
		*/
		fun initialNoGoogleLogin(onUserSaved: () -> Unit) {
		viewModelScope.launch {
		loginSourceRepository.setNoGoogleMode()
		authenticatorRepository.setNoGoogleMode()
		onUserSaved()
		startLoginFlow()
		}
		@@ -131,7 +131,7 @@ class LoginViewModel @Inject constructor(
		fun logout() {
		viewModelScope.launch {
		cache.evictAll()
		loginSourceRepository.logout()
		authenticatorRepository.logout()
		authObjects.postValue(listOf())
		}
		}

app/src/main/java/foundation/e/apps/di/NamedRepositoryModule.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import foundation.e.apps.data.cleanapk.repositories.CleanApkRepository
		import foundation.e.apps.data.gplay.GplayStoreRepository
		import foundation.e.apps.data.gplay.GplayStoreRepositoryImpl
		import foundation.e.apps.data.gplay.utils.GPlayHttpClient
		import foundation.e.apps.data.login.LoginSourceRepository
		import foundation.e.apps.data.login.AuthenticatorRepository
		import javax.inject.Named
		import javax.inject.Singleton

		@@ -45,9 +45,9 @@ object NamedRepositoryModule {
		fun getGplayRepository(
		@ApplicationContext context: Context,
		gPlayHttpClient: GPlayHttpClient,
		loginSourceRepository: LoginSourceRepository
		authenticatorRepository: AuthenticatorRepository
		): GplayStoreRepository {
		return GplayStoreRepositoryImpl(context, gPlayHttpClient, loginSourceRepository)
		return GplayStoreRepositoryImpl(context, gPlayHttpClient, authenticatorRepository)
		}

		@Singleton

app/src/main/java/foundation/e/apps/install/updates/UpdatesWorker.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import foundation.e.apps.data.blockedApps.BlockedAppRepository
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.User
		import foundation.e.apps.data.fused.data.FusedApp
		import foundation.e.apps.data.login.LoginSourceRepository
		import foundation.e.apps.data.login.AuthenticatorRepository
		import foundation.e.apps.data.preference.DataStoreManager
		import foundation.e.apps.data.updates.UpdatesManagerRepository
		import foundation.e.apps.install.workmanager.AppInstallProcessor
		@@ -37,7 +37,7 @@ class UpdatesWorker @AssistedInject constructor(
		@Assisted private val params: WorkerParameters,
		private val updatesManagerRepository: UpdatesManagerRepository,
		private val dataStoreManager: DataStoreManager,
		private val loginSourceRepository: LoginSourceRepository,
		private val authenticatorRepository: AuthenticatorRepository,
		private val appInstallProcessor: AppInstallProcessor,
		private val blockedAppRepository: BlockedAppRepository,
		) : CoroutineWorker(context, params) {
		@@ -106,7 +106,7 @@ class UpdatesWorker @AssistedInject constructor(
		val isConnectedToUnMeteredNetwork = isConnectedToUnMeteredNetwork(applicationContext)
		val appsNeededToUpdate = mutableListOf<FusedApp>()
		val user = getUser()
		val authData = loginSourceRepository.getValidatedAuthData().data
		val authData = authenticatorRepository.getValidatedAuthData().data
		val resultStatus: ResultStatus

		if (user in listOf(User.ANONYMOUS, User.GOOGLE) && authData != null) {