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

Commit bb027db9 authored by dev-12's avatar dev-12
Browse files

fix duplicate apps on update screen

parent 94c33a79

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class AuthenticatorRepository @Inject constructor( 
        return kotlin.runCatching {

            appLoungeDataStore.getAuthData()

        }.getOrElse {

            throw GPlayLoginException(false, "AuthData is not available", appLoungeDataStore.getUserType())

            throw GPlayLoginException(false, "AuthData is not available", appLoungeDataStore.getUser())

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class CleanApkAuthenticator @Inject constructor( 
) : StoreAuthenticator {



    private val user: User

        get() = appLoungeDataStore.getUserType()

        get() = appLoungeDataStore.getUser()



    override fun isStoreActive(): Boolean {

        if (user == User.UNAVAILABLE) {

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class LoginCommon @Inject constructor( 
    }



    fun getUserType(): User {

        return appLoungeDataStore.getUserType()

        return appLoungeDataStore.getUser()

    }



    suspend fun saveGoogleLogin(email: String, oauth: String) {

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

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ class PlayStoreAuthenticator @Inject constructor( 
    lateinit var loginManagerFactory: PlayStoreLoginManagerFactory



    private val user: User

        get() = appLoungeDataStore.getUserType()

        get() = appLoungeDataStore.getUser()



    private val loginManager: PlayStoreLoginManager

        get() = loginManagerFactory.createLoginManager(user)
@@ -137,7 +137,7 @@ class PlayStoreAuthenticator @Inject constructor( 
     * Generate new AuthData based on the user type.

     */

    private suspend fun generateAuthData(): ResultSupreme<AuthData?> {

        return when (appLoungeDataStore.getUserType()) {

        return when (appLoungeDataStore.getUser()) {

            User.ANONYMOUS -> getAuthDataAnonymously()

            User.GOOGLE -> getAuthDataWithGoogleAccount()

            else -> ResultSupreme.Error("User type not ANONYMOUS or GOOGLE")

app/src/main/java/foundation/e/apps/data/preference/AppLoungeDataStore.kt

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ class AppLoungeDataStore @Inject constructor( 
        }

    }



    fun getUserType(): User {  // TODO: Rename this to getUser()

    fun getUser(): User {

        return runBlocking {

            userType.first().run {

                val userStrings = User.values().map { it.name }