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

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

Merge branch '0000-s-some-renamings' into 'main' 

Some refactorization for the login logic

See merge request !372
parents 4ea09b31 9239f47e

app/src/main/java/foundation/e/apps/MainActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.google.android.material.snackbar.Snackbar 
import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.login.LoginSourceGPlay

import foundation.e.apps.data.login.PlayStoreAuthenticator

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.data.login.exceptions.GPlayValidationException

import foundation.e.apps.data.preference.PreferenceManagerModule
@@ -308,7 +308,7 @@ class MainActivity : AppCompatActivity() { 
            binding.sessionErrorLayout.visibility = View.VISIBLE

            binding.retrySessionButton.setOnClickListener {

                binding.sessionErrorLayout.visibility = View.GONE

                loginViewModel.startLoginFlow(listOf(LoginSourceGPlay::class.java.simpleName))

                loginViewModel.startLoginFlow(listOf(PlayStoreAuthenticator::class.java.simpleName))

            }

        }

    }

app/src/main/java/foundation/e/apps/data/NetworkHandler.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


package foundation.e.apps.data



import foundation.e.apps.data.gplay.utils.GPlayHttpClient

import foundation.e.apps.data.gplay.utils.GplayHttpRequestException

import foundation.e.apps.data.playstore.utils.GPlayHttpClient

import foundation.e.apps.data.playstore.utils.GplayHttpRequestException

import foundation.e.apps.data.login.exceptions.GPlayException

import java.net.SocketTimeoutException

app/src/main/java/foundation/e/apps/data/BaseStoreRepository.kt→app/src/main/java/foundation/e/apps/data/StoreRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


package foundation.e.apps.data



interface BaseStoreRepository {

interface StoreRepository {

    suspend fun getHomeScreenData(): Any

    suspend fun getAppDetails(packageNameOrId: String): Any?

}

app/src/main/java/foundation/e/apps/data/cleanapk/repositories/CleanApkRepository.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


package foundation.e.apps.data.cleanapk.repositories



import foundation.e.apps.data.BaseStoreRepository

import foundation.e.apps.data.StoreRepository

import foundation.e.apps.data.cleanapk.data.categories.Categories

import foundation.e.apps.data.cleanapk.data.search.Search

import retrofit2.Response
@@ -26,7 +26,7 @@ import retrofit2.Response 
const val NUMBER_OF_ITEMS = 20



const val NUMBER_OF_PAGES = 1

interface CleanApkRepository : BaseStoreRepository {

interface CleanApkRepository : StoreRepository {

    suspend fun getSearchResult(query: String, searchBy: String? = null): Response<Search>

    suspend fun getAppsByCategory(category: String, paginationParameter: Any? = null): Response<Search>

    suspend fun getCategories(): Response<Categories>

app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import foundation.e.apps.data.fused.data.Ratings 
import foundation.e.apps.data.fused.utils.CategoryType

import foundation.e.apps.data.fused.utils.CategoryUtils

import foundation.e.apps.data.fusedDownload.models.FusedDownload

import foundation.e.apps.data.gplay.GplayStoreRepository

import foundation.e.apps.data.playstore.PlayStoreRepository

import foundation.e.apps.data.handleNetworkResult

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.preference.PreferenceManagerModule
@@ -86,7 +86,7 @@ class FusedApiImpl @Inject constructor( 
    private val pkgManagerModule: PkgManagerModule,

    private val pwaManagerModule: PWAManagerModule,

    private val preferenceManagerModule: PreferenceManagerModule,

    @Named("gplayRepository") private val gplayRepository: GplayStoreRepository,

    @Named("gplayRepository") private val gplayRepository: PlayStoreRepository,

    @Named("cleanApkAppsRepository") private val cleanApkAppsRepository: CleanApkRepository,

    @Named("cleanApkPWARepository") private val cleanApkPWARepository: CleanApkRepository,

    @ApplicationContext private val context: Context