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

Commit e9230226 authored by Hasib Prince's avatar Hasib Prince Committed by Sayantan Roychowdhury
Browse files

release 1.15-rc.2 changes

parent b38c4ceb

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

+2 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ class GPlayHttpClient @Inject constructor( 
        private const val HTTP_TIMEOUT_IN_SECOND = 10L

        private const val SEARCH = "search"

        private const val SEARCH_SUGGEST = "searchSuggest"

        private const val STATUS_CODE_OK = 200

        private const val STATUS_CODE_UNAUTHORIZED = 401

        private const val STATUS_CODE_TOO_MANY_REQUESTS = 429

        const val STATUS_CODE_TIMEOUT = 408
@@ -206,7 +207,7 @@ class GPlayHttpClient @Inject constructor( 
                }

            }



            if (code != 200) {

            if (code !in listOf(STATUS_CODE_OK, STATUS_CODE_UNAUTHORIZED)) {

                throw GplayHttpRequestException(code, response.message)

            }

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

+6 −3
Original line number Diff line number Diff line
@@ -43,10 +43,13 @@ class LoginSourceRepository @Inject constructor( 
            if (source::class.java.simpleName in clearAuthTypes) {

                source.clearSavedAuth()

            }

            if (source is LoginSourceGPlay) {

                gplayAuth = source.getAuthObject().result.data



            val authObject = source.getAuthObject()

            authObjectsLocal.add(authObject)



            if (authObject is AuthObject.GPlayAuth) {

                gplayAuth = authObject.result.data

            }

            authObjectsLocal.add(source.getAuthObject())

        }



        return authObjectsLocal

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class DataStoreManager @Inject constructor() { 


    fun getAuthData(): AuthData {

        val authDataJson = dataStoreModule.getAuthDataSync()

        return gson.fromJson(authDataJson, AuthData::class.java)

        return gson.fromJson(authDataJson, AuthData::class.java) ?: AuthData("", "")

    }



    fun getUserType(): User {