diff --git a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt index 00dd50683738bdcc6da11490f52790cf822c3575..4087f64e28c647da7ce5a49e8e92e6ad289e55fa 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedAPIRepository.kt @@ -104,7 +104,7 @@ class FusedAPIRepository @Inject constructor(private val fusedAPIImpl: FusedApi) return fusedAPIImpl.getCategoriesList(type) } - suspend fun getSearchSuggestions(query: String, authData: AuthData): List { + suspend fun getSearchSuggestions(query: String): List { return fusedAPIImpl.getSearchSuggestions(query) } diff --git a/app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt b/app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt index 6d67932faf89781ef595615faae4847b31a77131..f3a5faad75871785c345f8ab6f4d172cdf41640e 100644 --- a/app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt +++ b/app/src/main/java/foundation/e/apps/data/fused/FusedApiImpl.kt @@ -1006,8 +1006,7 @@ class FusedApiImpl @Inject constructor( */ private suspend fun getCleanAPKSearchResults( - keyword: String, - source: String = CleanApkRetrofit.APP_SOURCE_FOSS, + keyword: String ): List { val list = mutableListOf() val response = diff --git a/app/src/main/java/foundation/e/apps/data/playstore/utils/GPlayHttpClient.kt b/app/src/main/java/foundation/e/apps/data/playstore/utils/GPlayHttpClient.kt index 8b7737c68a45529955603b7e64a28414e6e6612a..a8ac6ed998a0e89685dc852c72446f67d0baa168 100644 --- a/app/src/main/java/foundation/e/apps/data/playstore/utils/GPlayHttpClient.kt +++ b/app/src/main/java/foundation/e/apps/data/playstore/utils/GPlayHttpClient.kt @@ -54,7 +54,6 @@ class GPlayHttpClient @Inject constructor( companion object { private const val TAG = "GPlayHttpClient" 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 diff --git a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt index a9afde8e473851944e1561074736d670af44f283..767ca5213192e9e8ff4862d4628b5cfc56a6b4aa 100644 --- a/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/AppInfoFetchViewModel.kt @@ -3,15 +3,12 @@ package foundation.e.apps.ui import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.liveData -import com.aurora.gplayapi.data.models.AuthData -import com.google.gson.Gson import dagger.hilt.android.lifecycle.HiltViewModel import foundation.e.apps.data.blockedApps.BlockedAppRepository import foundation.e.apps.data.faultyApps.FaultyAppRepository import foundation.e.apps.data.fdroid.FdroidRepository import foundation.e.apps.data.fused.data.FusedApp import foundation.e.apps.data.playstore.PlayStoreRepository -import foundation.e.apps.data.preference.DataStoreModule import javax.inject.Inject import javax.inject.Named @@ -23,9 +20,7 @@ class AppInfoFetchViewModel @Inject constructor( private val fdroidRepository: FdroidRepository, @Named("gplayRepository") private val gplayRepository: PlayStoreRepository, private val faultyAppRepository: FaultyAppRepository, - private val dataStoreModule: DataStoreModule, private val blockedAppRepository: BlockedAppRepository, - private val gson: Gson ) : ViewModel() { fun getAuthorName(fusedApp: FusedApp) = liveData { @@ -35,7 +30,6 @@ class AppInfoFetchViewModel @Inject constructor( fun isAppPurchased(app: FusedApp): LiveData { return liveData { - val authData = gson.fromJson(dataStoreModule.getAuthDataSync(), AuthData::class.java) try { gplayRepository.getDownloadInfo( app.package_name, diff --git a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt index 48e89be36c425c07aab3bd3cefa49ec9ff4be811..d88b917240cf1fc90315ef0ad7732d8544a04ee7 100644 --- a/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/MainActivityViewModel.kt @@ -86,10 +86,6 @@ class MainActivityViewModel @Inject constructor( lateinit var connectivityManager: ConnectivityManager - companion object { - private const val TAG = "MainActivityViewModel" - } - fun getUser(): User { return dataStoreModule.getUserType() } diff --git a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt index e20565ce89a20965a6bd4c029c3b27e307ecf783..848650d56b2f76919600230901c3dfc2c480f595 100644 --- a/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/application/ApplicationFragment.kt @@ -665,7 +665,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { applicationIcon?.let { if (fusedApp.isFree) { disableInstallButton(R.string.cancel) - installApplication(fusedApp, it) + installApplication(fusedApp) } else { if (!mainActivityViewModel.shouldShowPaidAppsSnackBar(fusedApp)) { ApplicationDialogFragment( @@ -677,7 +677,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { ), positiveButtonText = getString(R.string.dialog_confirm), positiveButtonAction = { - installApplication(fusedApp, it) + installApplication(fusedApp) }, cancelButtonText = getString(R.string.dialog_cancel), ).show(childFragmentManager, "ApplicationFragment") @@ -709,8 +709,7 @@ class ApplicationFragment : TimeoutFragment(R.layout.fragment_application) { } private fun installApplication( - fusedApp: FusedApp, - it: ImageView + fusedApp: FusedApp ) { if (appInfoFetchViewModel.isAppInBlockedList(fusedApp)) { ApplicationDialogFragment( diff --git a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt index 73142126f295ee9494c35f2b0c6c0656ebb62a18..f1c538a566d4d86480eb75fe16437ebc7fbc5d6d 100644 --- a/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/home/HomeFragment.kt @@ -292,20 +292,6 @@ class HomeFragment : TimeoutFragment(R.layout.fragment_home), FusedAPIInterface mainActivityViewModel.cancelDownload(app) } - private fun onTosAccepted(isTosAccepted: Boolean) { - if (isTosAccepted) { - /* - * "safeNavigate" is an extension function, to prevent calling this navigation multiple times. - * This is taken from: - * https://nezspencer.medium.com/navigation-components-a-fix-for-navigation-action-cannot-be-found-in-the-current-destination-95b63e16152e - * Issue: https://gitlab.e.foundation/e/backlog/-/issues/5166 - * Also related: https://gitlab.e.foundation/ecorp/apps/apps/-/merge_requests/28 - */ - view?.findNavController() - ?.safeNavigate(R.id.homeFragment, R.id.action_homeFragment_to_signInFragment) - } - } - private fun openSettings() { view?.findNavController() ?.safeNavigate(R.id.homeFragment, R.id.action_homeFragment_to_SettingsFragment) diff --git a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt index dbf0b1ba968b7f90a4861ecc74fe1e05d5192228..f006f4b428da6a4ab4e7a4b68b89b1ad6ba74c54 100644 --- a/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt +++ b/app/src/main/java/foundation/e/apps/ui/search/SearchViewModel.kt @@ -65,10 +65,7 @@ class SearchViewModel @Inject constructor( viewModelScope.launch(Dispatchers.IO) { if (gPlayAuth.result.isSuccess()) searchSuggest.postValue( - fusedAPIRepository.getSearchSuggestions( - query, - gPlayAuth.result.data!! - ) + fusedAPIRepository.getSearchSuggestions(query) ) } } @@ -86,12 +83,12 @@ class SearchViewModel @Inject constructor( super.onLoadData(authObjectList, { successAuthList, _ -> successAuthList.find { it is AuthObject.GPlayAuth }?.run { - getSearchResults(query, result.data!! as AuthData, lifecycleOwner) + getSearchResults(query, result.data!! as AuthData) return@onLoadData } successAuthList.find { it is AuthObject.CleanApk }?.run { - getSearchResults(query, null, lifecycleOwner) + getSearchResults(query, null) return@onLoadData } }, retryBlock) @@ -105,8 +102,7 @@ class SearchViewModel @Inject constructor( */ private fun getSearchResults( query: String, - authData: AuthData?, - lifecycleOwner: LifecycleOwner + authData: AuthData? ) { viewModelScope.launch(Dispatchers.IO) { val searchResultSupreme = fusedAPIRepository.getCleanApkSearchResults( diff --git a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt index 6c5fd6a6f3bb21c1d2bb185773e4bb57fd2ace09..ee6825cb3aa0d54780b6f94ec1f6ec2852680a18 100644 --- a/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/foundation/e/apps/ui/updates/UpdatesFragment.kt @@ -278,7 +278,6 @@ class UpdatesFragment : TimeoutFragment(R.layout.fragment_updates), FusedAPIInte private fun initUpdataAllButton() { binding.button.setOnClickListener { - val interval = updatesViewModel.getUpdateInterval() UpdatesWorkManager.startUpdateAllWork(requireContext()) observeUpdateWork() binding.button.isEnabled = false