Rename GooglePlayLogger to GooglePlayLoginManager (71756610) · Commits · e / os / App Lounge

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import foundation.e.apps.data.ResultSupreme
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.enums.User
		import foundation.e.apps.data.login.api.GPlayApiFactory
		import foundation.e.apps.data.login.api.GooglePlayLogger
		import foundation.e.apps.data.login.api.GoogleAccountLogger
		import foundation.e.apps.data.login.api.GooglePlayLoginManager
		import foundation.e.apps.data.login.api.GoogleAccountLoginManager
		import foundation.e.apps.data.login.api.GooglePlayWrapper
		import timber.log.Timber
		import java.util.Locale
		@@ -52,11 +52,11 @@ class GooglePlayAuthenticator @Inject constructor(
		private val user: User
		get() = loginData.getUserType()

		private val logger: GooglePlayLogger
		private val loginManager: GooglePlayLoginManager
		get() = gPlayApiFactory.getGPlayApi(user)

		private val loggerWrapper: GooglePlayWrapper
		get() = GooglePlayWrapper(logger, user)
		get() = GooglePlayWrapper(loginManager, user)

		private val locale: Locale
		get() = context.resources.configuration.locales[0]
		@@ -169,7 +169,7 @@ class GooglePlayAuthenticator @Inject constructor(
		* If aasToken is not yet saved / made, fetch it from email and oauthToken.
		*/
		val aasTokenResponse = loggerWrapper.getAasToken(
		logger as GoogleAccountLogger,
		loginManager as GoogleAccountLoginManager,
		email,
		oauthToken
		)

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@ import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.withContext
		import java.util.Properties

		class AnonymousLogger(
		class AnonymousLoginManager(
		private val gPlayHttpClient: GPlayHttpClient,
		private val nativeDeviceProperty: Properties,
		private val gson: Gson,
		) : GooglePlayLogger {
		) : GooglePlayLoginManager {

		private val tokenUrl: String = "https://eu.gtoken.ecloud.global"

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,10 +35,10 @@ class GPlayApiFactory @Inject constructor(
		private val loginData: LoginData
		) {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,12 +28,12 @@ import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.withContext
		import java.util.Properties

		class GoogleAccountLogger(
		class GoogleAccountLoginManager(
		private val gPlayHttpClient: GPlayHttpClient,
		private val nativeDeviceProperty: Properties,
		private val aC2DMTask: AC2DMTask,
		private val loginData: LoginData
		) : GooglePlayLogger {
		) : GooglePlayLoginManager {

		/**
		* Get PlayResponse for AC2DM Map. This allows us to get an error message too.

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ package foundation.e.apps.data.login.api
		import com.aurora.gplayapi.data.models.AuthData
		import com.aurora.gplayapi.data.models.PlayResponse

		interface GooglePlayLogger {
		interface GooglePlayLoginManager {
		suspend fun login(): AuthData?
		suspend fun validate(authData: AuthData): PlayResponse
		}