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

Verified Commit 5a438110 authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: replace `SearchApi` references with `SearchRepository` across codebase

parent 53792be6

app/detekt-baseline.xml

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
    <ID>ReturnCount:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$override suspend fun validateAuthData(): ResultSupreme&lt;AuthData?&gt;</ID>

    <ID>ReturnCount:PlayStoreAuthenticator.kt$PlayStoreAuthenticator$private suspend fun getAuthDataWithGoogleAccount(): ResultSupreme&lt;AuthData?&gt;</ID>

    <ID>ReturnCount:PrivacyInfoViewModel.kt$PrivacyInfoViewModel$fun shouldRequestExodusReport(application: Application?): Boolean</ID>

    <ID>ReturnCount:SearchApiImpl.kt$SearchApiImpl$private suspend fun replaceWithFDroid(gPlayApps: List&lt;Application&gt;): List&lt;Application&gt;</ID>

    <ID>ReturnCount:SearchRepositoryImpl.kt$SearchRepositoryImpl$private suspend fun replaceWithFDroid(gPlayApps: List&lt;Application&gt;): List&lt;Application&gt;</ID>

    <ID>ReturnCount:StorageNotificationManager.kt$StorageNotificationManager$private fun getSpaceMissing(appInstall: AppInstall, downloadId: Long? = null): Long</ID>

    <ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getApplication( packageName: String, releaseType: OsReleaseType, sdkLevel: Int, device: String, ): Application?</ID>

    <ID>ReturnCount:SystemAppsUpdatesRepository.kt$SystemAppsUpdatesRepository$private suspend fun getReleaseDetailsUrl( systemAppProject: SystemAppProject, releaseType: OsReleaseType, ): String?</ID>
@@ -173,7 +173,7 @@ 
    <ID>TooGenericExceptionCaught:PlayStoreRepository.kt$PlayStoreRepository$exception: Exception</ID>

    <ID>TooGenericExceptionCaught:PwaManager.kt$PwaManager$e: Exception</ID>

    <ID>TooGenericExceptionCaught:PwaPlayerStatusReceiver.kt$PwaPlayerStatusReceiver$e: Exception</ID>

    <ID>TooGenericExceptionCaught:SearchApiImpl.kt$SearchApiImpl$e: Exception</ID>

    <ID>TooGenericExceptionCaught:SearchRepositoryImpl.kt$SearchRepositoryImpl$e: Exception</ID>

    <ID>TooGenericExceptionCaught:SystemInfoProvider.kt$SystemInfoProvider$e: Exception</ID>

    <ID>TooGenericExceptionCaught:UpdatesManagerImpl.kt$UpdatesManagerImpl$e: Exception</ID>

    <ID>TooGenericExceptionCaught:UpdatesWorker.kt$UpdatesWorker$e: Throwable</ID>
@@ -200,7 +200,7 @@ 
    <ID>UseCheckOrError:HomeApiImpl.kt$HomeApiImpl$throw IllegalStateException("Could not find store for $source")</ID>

    <ID>UseCheckOrError:PlayStoreRepository.kt$PlayStoreRepository$throw IllegalStateException("App version code cannot be 0")</ID>

    <ID>UseCheckOrError:PlayStoreRepository.kt$PlayStoreRepository$throw IllegalStateException("Could not get download details for $idOrPackageName")</ID>

    <ID>UseCheckOrError:SearchApiImpl.kt$SearchApiImpl$throw IllegalStateException("Could not get store")</ID>

    <ID>UseCheckOrError:SearchRepositoryImpl.kt$SearchRepositoryImpl$throw IllegalStateException("Could not get store")</ID>

    <ID>UseCheckOrError:Stores.kt$Stores$throw IllegalStateException("store not found")</ID>

    <ID>WildcardImport:SystemAppsUpdatesRepository.kt$import foundation.e.apps.data.gitlab.UpdatableSystemAppsApi.*</ID>

  </CurrentIssues>

app/src/main/java/foundation/e/apps/data/application/ApplicationRepository.kt

+6 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package foundation.e.apps.data.application 
import androidx.lifecycle.LiveData

import com.aurora.gplayapi.SearchSuggestEntry

import com.aurora.gplayapi.data.models.AuthData

import com.aurora.gplayapi.data.models.SearchBundle

import foundation.e.apps.data.ResultSupreme

import foundation.e.apps.data.application.apps.AppsApi

import foundation.e.apps.data.application.category.CategoryApi
@@ -34,8 +33,7 @@ import foundation.e.apps.data.application.data.Category 
import foundation.e.apps.data.application.data.Home

import foundation.e.apps.data.application.downloadInfo.DownloadInfoApi

import foundation.e.apps.data.application.home.HomeApi

import foundation.e.apps.data.application.search.GplaySearchResult

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.search.SearchRepository

import foundation.e.apps.data.application.utils.CategoryType

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.application.search.SearchResult
@@ -44,7 +42,7 @@ import javax.inject.Singleton 


@Singleton

class ApplicationRepository @Inject constructor(

    private val searchAPIImpl: SearchApi,

    private val searchRepository: SearchRepository,

    private val homeApi: HomeApi,

    private val categoryApi: CategoryApi,

    private val appsApi: AppsApi,
@@ -56,7 +54,7 @@ class ApplicationRepository @Inject constructor( 
    }



    fun getSelectedAppTypes(): List<String> {

        return searchAPIImpl.getSelectedAppTypes()

        return searchRepository.getSelectedAppTypes()

    }



    suspend fun getApplicationDetails(
@@ -107,19 +105,19 @@ class ApplicationRepository @Inject constructor( 
    }



    suspend fun getSearchSuggestions(query: String): List<SearchSuggestEntry> {

        return searchAPIImpl.getSearchSuggestions(query)

        return searchRepository.getSearchSuggestions(query)

    }



    suspend fun getCleanApkSearchResults(

        query: String

    ): SearchResult {

        return searchAPIImpl.getCleanApkSearchResults(query)

        return searchRepository.getCleanApkSearchResults(query)

    }



    suspend fun getGplaySearchResults(

        query: String

    ): SearchResult {

        return searchAPIImpl.getGplaySearchResult(query)

        return searchRepository.getGplaySearchResult(query)

    }



    suspend fun getAppsListBasedOnCategory(

app/src/main/java/foundation/e/apps/data/application/home/HomeApiImpl.kt

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.lifecycle.liveData 
import foundation.e.apps.data.ResultSupreme

import foundation.e.apps.data.Stores

import foundation.e.apps.data.application.data.Home

import foundation.e.apps.data.application.search.SearchApi

import foundation.e.apps.data.application.search.SearchRepository

import foundation.e.apps.data.enums.ResultStatus

import foundation.e.apps.data.enums.Source

import foundation.e.apps.data.handleNetworkResult
@@ -78,8 +78,8 @@ class HomeApiImpl @Inject constructor( 
        setHomeErrorMessage(result.getResultStatus(), source)

        priorList.sortBy {

            when (it.source) {

                SearchApi.APP_TYPE_OPEN -> AppSourceWeight.OPEN_SOURCE.ordinal

                SearchApi.APP_TYPE_PWA -> AppSourceWeight.PWA.ordinal

                SearchRepository.APP_TYPE_OPEN -> AppSourceWeight.OPEN_SOURCE.ordinal

                SearchRepository.APP_TYPE_PWA -> AppSourceWeight.PWA.ordinal

                else -> AppSourceWeight.GPLAY.ordinal

            }

        }

app/src/main/java/foundation/e/apps/data/application/search/SearchApi.kt→app/src/main/java/foundation/e/apps/data/application/search/SearchRepository.kt

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
package foundation.e.apps.data.application.search



import com.aurora.gplayapi.SearchSuggestEntry

import com.aurora.gplayapi.data.models.AuthData

import com.aurora.gplayapi.data.models.SearchBundle

import foundation.e.apps.data.ResultSupreme

import foundation.e.apps.data.application.data.Application
@@ -28,7 +27,7 @@ typealias GplaySearchResult = ResultSupreme<Pair<List<Application>, Set<SearchBu 


typealias SearchResult = ResultSupreme<Pair<List<Application>, Boolean>>



interface SearchApi {

interface SearchRepository {

    companion object {

        const val APP_TYPE_ANY = "any"

        const val APP_TYPE_OPEN = "open"

app/src/main/java/foundation/e/apps/data/application/search/SearchApiImpl.kt→app/src/main/java/foundation/e/apps/data/application/search/SearchRepositoryImpl.kt

+5 −5
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import foundation.e.apps.data.Stores 
import foundation.e.apps.data.application.ApplicationDataManager

import foundation.e.apps.data.application.apps.AppsApi

import foundation.e.apps.data.application.data.Application

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_ANY

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_OPEN

import foundation.e.apps.data.application.search.SearchApi.Companion.APP_TYPE_PWA

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_ANY

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_OPEN

import foundation.e.apps.data.application.search.SearchRepository.Companion.APP_TYPE_PWA

import foundation.e.apps.data.enums.ResultStatus

import foundation.e.apps.data.enums.Source

import foundation.e.apps.data.handleNetworkResult
@@ -41,12 +41,12 @@ import javax.inject.Inject 
import javax.inject.Singleton



@Singleton

class SearchApiImpl @Inject constructor(

class SearchRepositoryImpl @Inject constructor(

    private val appsApi: AppsApi,

    private val appSources: AppSourcesContainer,

    private val stores: Stores,

    private val applicationDataManager: ApplicationDataManager

) : SearchApi {

) : SearchRepository {



    @Inject

    @ApplicationContext