Loading app/src/main/java/foundation/e/apps/data/Result.kt +0 −7 Original line number Diff line number Diff line Loading @@ -36,11 +36,4 @@ data class Result<T>(val status: Status, val data: T?, val message: String?) { fun isSuccess() = status == Status.SUCCESS fun handleResult(handler: () -> Unit, defaultErrorData: T?): T? { if (isSuccess()) { handler() return data ?: defaultErrorData } return defaultErrorData } } app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt +0 −5 Original line number Diff line number Diff line Loading @@ -27,11 +27,6 @@ import retrofit2.http.Query interface CleanApkAppDetailsRetrofit { companion object { // API endpoints const val BASE_URL = "https://api.cleanapk.org/v2/" } @GET("apps?action=app_detail") suspend fun getAppOrPWADetailsByID( @Query("id") id: String, Loading app/src/main/java/foundation/e/apps/data/exodus/TrackerApiResponse.kt +0 −6 Original line number Diff line number Diff line Loading @@ -2,12 +2,6 @@ package foundation.e.apps.data.exodus import com.squareup.moshi.Json data class TrackerInfo( val name: String, val creator: String, val reports: List<Report> ) data class Report( val report: Long = -1L, @Json(name = "updated") val updatedAt: String, Loading app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt +19 −19 Original line number Diff line number Diff line Loading @@ -164,11 +164,11 @@ class FusedApiImpl @Inject constructor( ): ResultSupreme<List<FusedHome>> { val apiStatus = when (source) { Source.GPLAY -> runCodeBlockWithTimeout({ Source.GPLAY -> getResultStatusWithTimeoutChecking({ priorList.addAll(fetchGPlayHome(authData)) }) Source.OPEN -> runCodeBlockWithTimeout({ Source.OPEN -> getResultStatusWithTimeoutChecking({ val response = (cleanApkAppsRepository.getHomeScreenData() as Response<HomeScreen>).body() response?.home?.let { Loading @@ -176,7 +176,7 @@ class FusedApiImpl @Inject constructor( } }) Source.PWA -> runCodeBlockWithTimeout({ Source.PWA -> getResultStatusWithTimeoutChecking({ val response = (cleanApkPWARepository.getHomeScreenData() as Response<HomeScreen>).body() response?.home?.let { Loading Loading @@ -302,7 +302,7 @@ class FusedApiImpl @Inject constructor( packageSpecificResults: ArrayList<FusedApp> ): ResultSupreme<Pair<List<FusedApp>, Boolean>> { val pwaApps: MutableList<FusedApp> = mutableListOf() val status = fusedAPIImpl.runCodeBlockWithTimeout({ val status = fusedAPIImpl.getResultStatusWithTimeoutChecking({ val apps = cleanApkPWARepository.getSearchResult(query).body()?.apps apps?.apply { Loading Loading @@ -356,7 +356,7 @@ class FusedApiImpl @Inject constructor( searchResult: MutableList<FusedApp>, packageSpecificResults: ArrayList<FusedApp> ): ResultSupreme<Pair<List<FusedApp>, Boolean>> { val status = fusedAPIImpl.runCodeBlockWithTimeout({ val status = fusedAPIImpl.getResultStatusWithTimeoutChecking({ cleanApkResults.addAll(getCleanAPKSearchResults(query)) }) Loading Loading @@ -385,7 +385,7 @@ class FusedApiImpl @Inject constructor( var gplayPackageResult: FusedApp? = null var cleanapkPackageResult: FusedApp? = null val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ if (preferenceManagerModule.isGplaySelected()) { gplayPackageResult = getGplayPackagResult(query, authData) } Loading Loading @@ -469,7 +469,7 @@ class FusedApiImpl @Inject constructor( */ private suspend fun getCleanapkSearchResult(packageName: String): ResultSupreme<FusedApp> { var fusedApp = FusedApp() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val result = cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -544,7 +544,7 @@ class FusedApiImpl @Inject constructor( override suspend fun getPWAApps(category: String): ResultSupreme<Pair<List<FusedApp>, String>> { val list = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val response = getPWAAppsResponse(category) response?.apps?.forEach { it.updateStatus() Loading @@ -558,7 +558,7 @@ class FusedApiImpl @Inject constructor( override suspend fun getOpenSourceApps(category: String): ResultSupreme<Pair<List<FusedApp>, String>> { val list = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val response = getOpenSourceAppsResponse(category) response?.apps?.forEach { it.updateStatus() Loading @@ -578,7 +578,7 @@ class FusedApiImpl @Inject constructor( */ override suspend fun getCleanapkAppDetails(packageName: String): Pair<FusedApp, ResultStatus> { var fusedApp = FusedApp() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val result = cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -635,7 +635,7 @@ class FusedApiImpl @Inject constructor( * i.e. check timeout for individual package query. */ for (packageName in packageNameList) { status = runCodeBlockWithTimeout({ status = getResultStatusWithTimeoutChecking({ cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -674,7 +674,7 @@ class FusedApiImpl @Inject constructor( /* * Old code moved from getApplicationDetails() */ val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ gplayRepository.getAppsDetails(packageNameList).forEach { app -> /* * Some apps are restricted to locations. Example "com.skype.m2". Loading Loading @@ -712,7 +712,7 @@ class FusedApiImpl @Inject constructor( appList: List<App>, ): ResultSupreme<List<FusedApp>> { val filteredFusedApps = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ appList.forEach { val filter = getAppFilterLevel(it, authData) if (filter.isUnFiltered()) { Loading Loading @@ -804,7 +804,7 @@ class FusedApiImpl @Inject constructor( var response: FusedApp? = null val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ response = if (origin == Origin.CLEANAPK) { (cleanApkAppsRepository.getAppDetails(id) as Response<Application>).body()?.app } else { Loading Loading @@ -871,7 +871,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus = ResultStatus.OK val categoryList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ val playResponse = gplayRepository.getCategories(type).map { app -> val category = app.transformToFusedCategory() updateCategoryDrawable(category) Loading @@ -894,7 +894,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus: ResultStatus = ResultStatus.OK val fusedCategoriesList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ getPWAsCategories()?.let { fusedCategoriesList.addAll( getFusedCategoryBasedOnCategoryType( Loading @@ -918,7 +918,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus: ResultStatus = ResultStatus.OK val fusedCategoryList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ getOpenSourceCategories()?.let { fusedCategoryList.addAll( getFusedCategoryBasedOnCategoryType( Loading Loading @@ -947,7 +947,7 @@ class FusedApiImpl @Inject constructor( * * @return Instance of [ResultStatus] based on whether [block] was executed within timeout limit. */ private suspend fun runCodeBlockWithTimeout( private suspend fun getResultStatusWithTimeoutChecking( block: suspend () -> Unit, timeoutBlock: (() -> Unit)? = null, exceptionBlock: ((e: Exception) -> Unit)? = null, Loading Loading @@ -1414,7 +1414,7 @@ class FusedApiImpl @Inject constructor( var fusedAppList: MutableList<FusedApp> = mutableListOf() var nextPageUrl = "" val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val streamCluster = gplayRepository.getAppsByCategory(category, pageUrl) as StreamCluster val filteredAppList = filterRestrictedGPlayApps(authData, streamCluster.clusterAppList) filteredAppList.data?.let { Loading app/src/main/java/foundation/e/apps/data/fusedDownload/FileManager.kt +0 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,6 @@ import java.io.InputStream import java.io.OutputStream object FileManager { private const val TAG = "FileManager" fun moveFile(inputPath: String, inputFile: String, outputPath: String) { var inputStream: InputStream? = null Loading Loading
app/src/main/java/foundation/e/apps/data/Result.kt +0 −7 Original line number Diff line number Diff line Loading @@ -36,11 +36,4 @@ data class Result<T>(val status: Status, val data: T?, val message: String?) { fun isSuccess() = status == Status.SUCCESS fun handleResult(handler: () -> Unit, defaultErrorData: T?): T? { if (isSuccess()) { handler() return data ?: defaultErrorData } return defaultErrorData } }
app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkAppDetailsRetrofit.kt +0 −5 Original line number Diff line number Diff line Loading @@ -27,11 +27,6 @@ import retrofit2.http.Query interface CleanApkAppDetailsRetrofit { companion object { // API endpoints const val BASE_URL = "https://api.cleanapk.org/v2/" } @GET("apps?action=app_detail") suspend fun getAppOrPWADetailsByID( @Query("id") id: String, Loading
app/src/main/java/foundation/e/apps/data/exodus/TrackerApiResponse.kt +0 −6 Original line number Diff line number Diff line Loading @@ -2,12 +2,6 @@ package foundation.e.apps.data.exodus import com.squareup.moshi.Json data class TrackerInfo( val name: String, val creator: String, val reports: List<Report> ) data class Report( val report: Long = -1L, @Json(name = "updated") val updatedAt: String, Loading
app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt +19 −19 Original line number Diff line number Diff line Loading @@ -164,11 +164,11 @@ class FusedApiImpl @Inject constructor( ): ResultSupreme<List<FusedHome>> { val apiStatus = when (source) { Source.GPLAY -> runCodeBlockWithTimeout({ Source.GPLAY -> getResultStatusWithTimeoutChecking({ priorList.addAll(fetchGPlayHome(authData)) }) Source.OPEN -> runCodeBlockWithTimeout({ Source.OPEN -> getResultStatusWithTimeoutChecking({ val response = (cleanApkAppsRepository.getHomeScreenData() as Response<HomeScreen>).body() response?.home?.let { Loading @@ -176,7 +176,7 @@ class FusedApiImpl @Inject constructor( } }) Source.PWA -> runCodeBlockWithTimeout({ Source.PWA -> getResultStatusWithTimeoutChecking({ val response = (cleanApkPWARepository.getHomeScreenData() as Response<HomeScreen>).body() response?.home?.let { Loading Loading @@ -302,7 +302,7 @@ class FusedApiImpl @Inject constructor( packageSpecificResults: ArrayList<FusedApp> ): ResultSupreme<Pair<List<FusedApp>, Boolean>> { val pwaApps: MutableList<FusedApp> = mutableListOf() val status = fusedAPIImpl.runCodeBlockWithTimeout({ val status = fusedAPIImpl.getResultStatusWithTimeoutChecking({ val apps = cleanApkPWARepository.getSearchResult(query).body()?.apps apps?.apply { Loading Loading @@ -356,7 +356,7 @@ class FusedApiImpl @Inject constructor( searchResult: MutableList<FusedApp>, packageSpecificResults: ArrayList<FusedApp> ): ResultSupreme<Pair<List<FusedApp>, Boolean>> { val status = fusedAPIImpl.runCodeBlockWithTimeout({ val status = fusedAPIImpl.getResultStatusWithTimeoutChecking({ cleanApkResults.addAll(getCleanAPKSearchResults(query)) }) Loading Loading @@ -385,7 +385,7 @@ class FusedApiImpl @Inject constructor( var gplayPackageResult: FusedApp? = null var cleanapkPackageResult: FusedApp? = null val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ if (preferenceManagerModule.isGplaySelected()) { gplayPackageResult = getGplayPackagResult(query, authData) } Loading Loading @@ -469,7 +469,7 @@ class FusedApiImpl @Inject constructor( */ private suspend fun getCleanapkSearchResult(packageName: String): ResultSupreme<FusedApp> { var fusedApp = FusedApp() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val result = cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -544,7 +544,7 @@ class FusedApiImpl @Inject constructor( override suspend fun getPWAApps(category: String): ResultSupreme<Pair<List<FusedApp>, String>> { val list = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val response = getPWAAppsResponse(category) response?.apps?.forEach { it.updateStatus() Loading @@ -558,7 +558,7 @@ class FusedApiImpl @Inject constructor( override suspend fun getOpenSourceApps(category: String): ResultSupreme<Pair<List<FusedApp>, String>> { val list = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val response = getOpenSourceAppsResponse(category) response?.apps?.forEach { it.updateStatus() Loading @@ -578,7 +578,7 @@ class FusedApiImpl @Inject constructor( */ override suspend fun getCleanapkAppDetails(packageName: String): Pair<FusedApp, ResultStatus> { var fusedApp = FusedApp() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val result = cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -635,7 +635,7 @@ class FusedApiImpl @Inject constructor( * i.e. check timeout for individual package query. */ for (packageName in packageNameList) { status = runCodeBlockWithTimeout({ status = getResultStatusWithTimeoutChecking({ cleanApkAppsRepository.getSearchResult( packageName, "package_name" Loading Loading @@ -674,7 +674,7 @@ class FusedApiImpl @Inject constructor( /* * Old code moved from getApplicationDetails() */ val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ gplayRepository.getAppsDetails(packageNameList).forEach { app -> /* * Some apps are restricted to locations. Example "com.skype.m2". Loading Loading @@ -712,7 +712,7 @@ class FusedApiImpl @Inject constructor( appList: List<App>, ): ResultSupreme<List<FusedApp>> { val filteredFusedApps = mutableListOf<FusedApp>() val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ appList.forEach { val filter = getAppFilterLevel(it, authData) if (filter.isUnFiltered()) { Loading Loading @@ -804,7 +804,7 @@ class FusedApiImpl @Inject constructor( var response: FusedApp? = null val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ response = if (origin == Origin.CLEANAPK) { (cleanApkAppsRepository.getAppDetails(id) as Response<Application>).body()?.app } else { Loading Loading @@ -871,7 +871,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus = ResultStatus.OK val categoryList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ val playResponse = gplayRepository.getCategories(type).map { app -> val category = app.transformToFusedCategory() updateCategoryDrawable(category) Loading @@ -894,7 +894,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus: ResultStatus = ResultStatus.OK val fusedCategoriesList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ getPWAsCategories()?.let { fusedCategoriesList.addAll( getFusedCategoryBasedOnCategoryType( Loading @@ -918,7 +918,7 @@ class FusedApiImpl @Inject constructor( var errorApplicationCategory = "" var apiStatus: ResultStatus = ResultStatus.OK val fusedCategoryList = mutableListOf<FusedCategory>() runCodeBlockWithTimeout({ getResultStatusWithTimeoutChecking({ getOpenSourceCategories()?.let { fusedCategoryList.addAll( getFusedCategoryBasedOnCategoryType( Loading Loading @@ -947,7 +947,7 @@ class FusedApiImpl @Inject constructor( * * @return Instance of [ResultStatus] based on whether [block] was executed within timeout limit. */ private suspend fun runCodeBlockWithTimeout( private suspend fun getResultStatusWithTimeoutChecking( block: suspend () -> Unit, timeoutBlock: (() -> Unit)? = null, exceptionBlock: ((e: Exception) -> Unit)? = null, Loading Loading @@ -1414,7 +1414,7 @@ class FusedApiImpl @Inject constructor( var fusedAppList: MutableList<FusedApp> = mutableListOf() var nextPageUrl = "" val status = runCodeBlockWithTimeout({ val status = getResultStatusWithTimeoutChecking({ val streamCluster = gplayRepository.getAppsByCategory(category, pageUrl) as StreamCluster val filteredAppList = filterRestrictedGPlayApps(authData, streamCluster.clusterAppList) filteredAppList.data?.let { Loading
app/src/main/java/foundation/e/apps/data/fusedDownload/FileManager.kt +0 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,6 @@ import java.io.InputStream import java.io.OutputStream object FileManager { private const val TAG = "FileManager" fun moveFile(inputPath: String, inputFile: String, outputPath: String) { var inputStream: InputStream? = null Loading