diff --git a/app/build.gradle b/app/build.gradle index 26b560967..1ce4f64bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -172,7 +172,7 @@ dependencies { implementation "com.github.topjohnwu.libsu:core:${versions.libsu}" //Love <3 - api("com.gitlab.AuroraOSS:gplayapi:514f061739") + api("com.gitlab.AuroraOSS:gplayapi:82843a04ce") } Properties props = new Properties() diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt index bc170151e..43193cbe5 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt @@ -227,7 +227,7 @@ class AppDetailsActivity : BaseDetailsActivity() { private fun fetchCompleteApp() { task { val authData = AuthProvider.with(this).getAuthData() - return@task AppDetailsHelper.with(authData) + return@task AppDetailsHelper(authData) .using(HttpClient.getPreferredClient()) .getAppByPackageName(app.packageName) } successUi { @@ -324,8 +324,7 @@ class AppDetailsActivity : BaseDetailsActivity() { .with(this) .getAuthData() - PurchaseHelper - .with(authData) + PurchaseHelper(authData) .using(HttpClient.getPreferredClient()) .purchase(app.packageName, app.versionCode, app.offerType) } successUi { diff --git a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt index fe651d72b..d8fc7c948 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt @@ -262,8 +262,7 @@ abstract class BaseDetailsActivity : BaseActivity() { ) { task { val authData = AuthProvider.with(this).getAuthData() - ReviewsHelper - .with(authData) + ReviewsHelper(authData) .using(HttpClient.getPreferredClient()) .addOrEditReview( app.packageName, @@ -286,8 +285,7 @@ abstract class BaseDetailsActivity : BaseActivity() { val authData = AuthProvider .with(this) .getAuthData() - val reviewsHelper = ReviewsHelper - .with(authData) + val reviewsHelper = ReviewsHelper(authData) .using(HttpClient.getPreferredClient()) return reviewsHelper.getReviews(app.packageName, Review.Filter.CRITICAL) } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt index 399ec68fc..7a01692af 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt @@ -143,8 +143,7 @@ class DetailsMoreActivity : BaseActivity() { .with(this) .getAuthData() task { - AppDetailsHelper - .with(authData) + AppDetailsHelper(authData) .getAppByPackageName(app.dependencies.dependentPackages) } successUi { B.recyclerDependency.withModels { diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 113ba9743..f0941747b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -81,7 +81,7 @@ class UpdatesFragment : BaseFragment() { VM = ViewModelProvider(requireActivity()).get(UpdatesViewModel::class.java) authData = AuthProvider.with(requireContext()).getAuthData() - purchaseHelper = PurchaseHelper.with(authData) + purchaseHelper = PurchaseHelper(authData) fetch = DownloadManager.with(requireContext()).fetch fetchListener = object : AbstractFetchGroupListener() { diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/BaseAppsViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/BaseAppsViewModel.kt index b9fd86e96..b9f0625f2 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/all/BaseAppsViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/all/BaseAppsViewModel.kt @@ -34,14 +34,12 @@ import java.util.* abstract class BaseAppsViewModel(application: Application) : BaseAndroidViewModel(application) { - val authData = AuthProvider + private val authData = AuthProvider .with(application) .getAuthData() - val appDetailsHelper = - AppDetailsHelper - .with(authData) - .using(HttpClient.getPreferredClient()) + private val appDetailsHelper = AppDetailsHelper(authData) + .using(HttpClient.getPreferredClient()) var blacklistProvider = BlacklistProvider .with(application) diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/LibraryAppsViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/LibraryAppsViewModel.kt index 5cf475a23..71e2a1560 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/all/LibraryAppsViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/all/LibraryAppsViewModel.kt @@ -37,7 +37,7 @@ class LibraryAppsViewModel(application: Application) : BaseAndroidViewModel(appl private val authData: AuthData = AuthProvider.with(application).getAuthData() private val clusterHelper: ClusterHelper = - ClusterHelper.with(authData).using(HttpClient.getPreferredClient()) + ClusterHelper(authData).using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() var streamCluster: StreamCluster = StreamCluster() diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt index 72f603282..7a12943c5 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt @@ -169,7 +169,7 @@ class AuthViewModel(application: Application) : BaseAndroidViewModel(application private fun isValid(authData: AuthData): Boolean { return try { - AuthValidator.with(authData) + AuthValidator(authData) .using(HttpClient.getPreferredClient()) .isValid() } catch (e: Exception) { diff --git a/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt index 6f8dfc8d3..a19d0a853 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/browse/StreamBrowseViewModel.kt @@ -37,8 +37,7 @@ import kotlinx.coroutines.supervisorScope class StreamBrowseViewModel(application: Application) : BaseAndroidViewModel(application) { private val authData: AuthData = AuthProvider.with(application).getAuthData() - private val streamHelper: StreamHelper = StreamHelper - .with(authData) + private val streamHelper: StreamHelper = StreamHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/category/BaseCategoryViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/category/BaseCategoryViewModel.kt index d03ad4e70..d842f44f8 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/category/BaseCategoryViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/category/BaseCategoryViewModel.kt @@ -38,8 +38,7 @@ abstract class BaseCategoryViewModel(application: Application) : BaseAndroidView .with(application) .getAuthData() - private val streamHelper: CategoryHelper = CategoryHelper - .with(authData) + private val streamHelper: CategoryHelper = CategoryHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData> = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/editorschoice/BaseEditorChoiceViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/editorschoice/BaseEditorChoiceViewModel.kt index bd744cb3d..48c8582c4 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/editorschoice/BaseEditorChoiceViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/editorschoice/BaseEditorChoiceViewModel.kt @@ -39,8 +39,7 @@ open class BaseEditorChoiceViewModel(application: Application) : BaseAndroidView .with(application) .getAuthData() - private val streamHelper: StreamHelper = StreamHelper - .with(authData) + private val streamHelper: StreamHelper = StreamHelper(authData) .using(HttpClient.getPreferredClient()) lateinit var category: StreamHelper.Category diff --git a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt index b70349892..8dc3c6064 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt @@ -39,8 +39,7 @@ import kotlinx.coroutines.supervisorScope abstract class BaseClusterViewModel(application: Application) : BaseAndroidViewModel(application) { var authData: AuthData = AuthProvider.with(application).getAuthData() - var streamHelper: StreamHelper = StreamHelper - .with(authData) + var streamHelper: StreamHelper = StreamHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/review/ReviewViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/review/ReviewViewModel.kt index 280f4d676..8a722da5a 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/review/ReviewViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/review/ReviewViewModel.kt @@ -40,8 +40,7 @@ class ReviewViewModel(application: Application) : BaseAndroidViewModel(applicati .with(application) .getAuthData() - var reviewsHelper: ReviewsHelper = ReviewsHelper - .with(authData) + var reviewsHelper: ReviewsHelper = ReviewsHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/sale/AppSalesViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/sale/AppSalesViewModel.kt index 9505fe3a1..c8cbf8c25 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/sale/AppSalesViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/sale/AppSalesViewModel.kt @@ -35,7 +35,7 @@ class AppSalesViewModel(application: Application) : AndroidViewModel(application private val authData: AuthData = AuthProvider.with(application).getAuthData() private val appSalesHelper: AppSalesHelper = - AppSalesHelper.with(authData).using(HttpClient.getPreferredClient()) + AppSalesHelper(authData).using(HttpClient.getPreferredClient()) val liveAppList: MutableLiveData> = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt index 8e01f4550..17efca2b4 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt @@ -39,8 +39,7 @@ class SearchResultViewModel(application: Application) : AndroidViewModel(applica .with(application) .getAuthData() - private val searchHelper: SearchHelper = SearchHelper - .with(authData) + private val searchHelper: SearchHelper = SearchHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt index 374567175..6c1567a81 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchSuggestionViewModel.kt @@ -37,8 +37,7 @@ class SearchSuggestionViewModel(application: Application) : AndroidViewModel(app .with(application) .getAuthData() - private val searchHelper: SearchHelper = SearchHelper - .with(authData) + private val searchHelper: SearchHelper = SearchHelper(authData) .using(HttpClient.getPreferredClient()) val liveSearchSuggestions: MutableLiveData> = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt index cb76de896..57be79a8a 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/subcategory/SubCategoryClusterViewModel.kt @@ -39,8 +39,7 @@ import kotlinx.coroutines.supervisorScope class SubCategoryClusterViewModel(application: Application) : BaseAndroidViewModel(application) { var authData: AuthData = AuthProvider.with(application).getAuthData() - var categoryHelper: CategoryHelper = CategoryHelper - .with(authData) + var categoryHelper: CategoryHelper = CategoryHelper(authData) .using(HttpClient.getPreferredClient()) val liveData: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/aurora/store/viewmodel/topchart/BaseChartViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/topchart/BaseChartViewModel.kt index cca4e9c2f..0542cf7aa 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/topchart/BaseChartViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/topchart/BaseChartViewModel.kt @@ -37,7 +37,7 @@ abstract class BaseChartViewModel(application: Application) : BaseAndroidViewMod private val authData: AuthData = AuthProvider.with(application).getAuthData() private val topChartsHelper: TopChartsHelper = - TopChartsHelper.with(authData).using(HttpClient.getPreferredClient()) + TopChartsHelper(authData).using(HttpClient.getPreferredClient()) lateinit var type: TopChartsHelper.Type lateinit var chart: TopChartsHelper.Chart