Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a75a3799 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Rename GPlayApiFactory to GooglePlayLoginManagerFactory

parent 71756610
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.data.ResultSupreme
import foundation.e.apps.data.ResultSupreme
import foundation.e.apps.data.enums.ResultStatus
import foundation.e.apps.data.enums.ResultStatus
import foundation.e.apps.data.enums.User
import foundation.e.apps.data.enums.User
import foundation.e.apps.data.login.api.GPlayApiFactory
import foundation.e.apps.data.login.api.GooglePlayLoginManagerFactory
import foundation.e.apps.data.login.api.GooglePlayLoginManager
import foundation.e.apps.data.login.api.GooglePlayLoginManager
import foundation.e.apps.data.login.api.GoogleAccountLoginManager
import foundation.e.apps.data.login.api.GoogleAccountLoginManager
import foundation.e.apps.data.login.api.GooglePlayWrapper
import foundation.e.apps.data.login.api.GooglePlayWrapper
@@ -47,13 +47,13 @@ class GooglePlayAuthenticator @Inject constructor(
) : StoreAuthenticator, AuthDataValidator {
) : StoreAuthenticator, AuthDataValidator {


    @Inject
    @Inject
    lateinit var gPlayApiFactory: GPlayApiFactory
    lateinit var loginManagerFactory: GooglePlayLoginManagerFactory


    private val user: User
    private val user: User
        get() = loginData.getUserType()
        get() = loginData.getUserType()


    private val loginManager: GooglePlayLoginManager
    private val loginManager: GooglePlayLoginManager
        get() = gPlayApiFactory.getGPlayApi(user)
        get() = loginManagerFactory.createLoginManager(user)


    private val loggerWrapper: GooglePlayWrapper
    private val loggerWrapper: GooglePlayWrapper
        get() = GooglePlayWrapper(loginManager, user)
        get() = GooglePlayWrapper(loginManager, user)
+2 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ import javax.inject.Inject
import javax.inject.Singleton
import javax.inject.Singleton


@Singleton
@Singleton
class GPlayApiFactory @Inject constructor(
class GooglePlayLoginManagerFactory @Inject constructor(
    private val gPlayHttpClient: GPlayHttpClient,
    private val gPlayHttpClient: GPlayHttpClient,
    private val nativeDeviceProperty: Properties,
    private val nativeDeviceProperty: Properties,
    private val aC2DMTask: AC2DMTask,
    private val aC2DMTask: AC2DMTask,
@@ -35,7 +35,7 @@ class GPlayApiFactory @Inject constructor(
    private val loginData: LoginData
    private val loginData: LoginData
) {
) {


    fun getGPlayApi(user: User): GooglePlayLoginManager {
    fun createLoginManager(user: User): GooglePlayLoginManager {
        return when (user) {
        return when (user) {
            User.GOOGLE -> GoogleAccountLoginManager(gPlayHttpClient, nativeDeviceProperty, aC2DMTask, loginData)
            User.GOOGLE -> GoogleAccountLoginManager(gPlayHttpClient, nativeDeviceProperty, aC2DMTask, loginData)
            else -> AnonymousLoginManager(gPlayHttpClient, nativeDeviceProperty, gson)
            else -> AnonymousLoginManager(gPlayHttpClient, nativeDeviceProperty, gson)