Adapt to new API changes related to helpers

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()

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
+            PurchaseHelper(authData)
-                .with(authData)
                 .using(HttpClient.getPreferredClient())
                 .purchase(app.packageName, app.versionCode, app.offerType)
         } successUi {

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
+            ReviewsHelper(authData)
-                .with(authData)
                 .using(HttpClient.getPreferredClient())
                 .addOrEditReview(
                     app.packageName,
@@ -286,8 +285,7 @@ abstract class BaseDetailsActivity : BaseActivity() {
         val authData = AuthProvider
             .with(this)
             .getAuthData()
-        val reviewsHelper = ReviewsHelper
+        val reviewsHelper = ReviewsHelper(authData)
-            .with(authData)
             .using(HttpClient.getPreferredClient())
         return reviewsHelper.getReviews(app.packageName, Review.Filter.CRITICAL)
     }

app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt

@@ -143,8 +143,7 @@ class DetailsMoreActivity : BaseActivity() {
             .with(this)
             .getAuthData()
         task {
-            AppDetailsHelper
+            AppDetailsHelper(authData)
-                .with(authData)
                 .getAppByPackageName(app.dependencies.dependentPackages)
         } successUi {
             B.recyclerDependency.withModels {

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() {

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 =
+    private val appDetailsHelper = AppDetailsHelper(authData)
-        AppDetailsHelper
+        .using(HttpClient.getPreferredClient())
-            .with(authData)
-            .using(HttpClient.getPreferredClient())
 
     var blacklistProvider = BlacklistProvider
         .with(application)

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<StreamCluster> = MutableLiveData()
     var streamCluster: StreamCluster = StreamCluster()

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) {

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
+    private val streamHelper: StreamHelper = StreamHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<StreamCluster> = MutableLiveData()

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
+    private val streamHelper: CategoryHelper = CategoryHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<List<Category>> = MutableLiveData()

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
+    private val streamHelper: StreamHelper = StreamHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     lateinit var category: StreamHelper.Category

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
+    var streamHelper: StreamHelper = StreamHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<ViewState> = MutableLiveData()

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
+    var reviewsHelper: ReviewsHelper = ReviewsHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<ViewState> = MutableLiveData()

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<List<App>> = MutableLiveData()
 

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
+    private val searchHelper: SearchHelper = SearchHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<SearchBundle> = MutableLiveData()

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
+    private val searchHelper: SearchHelper = SearchHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveSearchSuggestions: MutableLiveData<List<SearchSuggestEntry>> = MutableLiveData()

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
+    var categoryHelper: CategoryHelper = CategoryHelper(authData)
-        .with(authData)
         .using(HttpClient.getPreferredClient())
 
     val liveData: MutableLiveData<ViewState> = MutableLiveData()

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