From 2813d28120a6642672c6bc42057c92d9fba2bd3d Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 15 Jul 2024 16:49:13 +0700
Subject: [PATCH] Adapt for data class changes

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../aurora/store/data/network/OkHttpClient.kt  | 18 ++++++------------
 .../viewmodel/details/DevProfileViewModel.kt   |  2 +-
 .../store/viewmodel/review/ReviewViewModel.kt  |  6 +++---
 gradle/libs.versions.toml                      |  2 +-
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt b/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt
index 0887dfc78..3ad023e89 100644
--- a/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt
+++ b/app/src/main/java/com/aurora/store/data/network/OkHttpClient.kt
@@ -186,18 +186,12 @@ object OkHttpClient : IProxyHttpClient {
     }
 
     private fun buildPlayResponse(response: Response): PlayResponse {
-        return PlayResponse().apply {
-            isSuccessful = response.isSuccessful
-            code = response.code
-
-            if (response.body != null) {
-                responseBytes = response.body!!.bytes()
-            }
-
-            if (!isSuccessful) {
-                errorString = response.message
-            }
-        }.also {
+        return PlayResponse(
+            isSuccessful = response.isSuccessful,
+            code = response.code,
+            responseBytes = response.body?.bytes() ?: byteArrayOf(),
+            errorString = if (!response.isSuccessful) response.message else String()
+        ).also {
             _responseCode.value = response.code
             Log.i("OKHTTP [${response.code}] ${response.request.url}")
         }
diff --git a/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
index 55ce6302b..03224f4e0 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/details/DevProfileViewModel.kt
@@ -80,7 +80,7 @@ class DevProfileViewModel @Inject constructor(
                     if (streamCluster.hasNext()) {
                         val newCluster = streamHelper.getNextStreamCluster(streamCluster.clusterNextPageUrl)
                         updateCluster(newCluster)
-                        devStream.streamBundle = streamBundle
+                        devStream = devStream.copy(streamBundle = streamBundle)
                         liveData.postValue(ViewState.Success(devStream))
                     } else {
                         Log.i("End of cluster")
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 91073b1ea..81f1ae4a5 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
@@ -67,10 +67,10 @@ class ReviewViewModel @Inject constructor(
             supervisorScope {
                 try {
                     val nextReviewCluster = reviewsHelper.next(nextReviewPageUrl)
-
-                    reviewsCluster.apply {
-                        reviewList.addAll(nextReviewCluster.reviewList)
+                    reviewsCluster.copy(
                         nextPageUrl = nextReviewCluster.nextPageUrl
+                    ).apply {
+                        reviewList.addAll(nextReviewCluster.reviewList)
                     }
 
                     liveData.postValue(reviewsCluster)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3832f9c26..0dd7ca372 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ composeBom = "2024.06.00"
 coreVersion = "1.13.1"
 epoxyVersion = "5.1.4"
 espressoVersion = "3.6.1"
-gplayapiVersion = "51277d20b3" #TODO: Switch to stable version on master
+gplayapiVersion = "5c81ca3f71" #TODO: Switch to stable version on master
 gsonVersion = "2.10.1"
 hiddenapibypassVersion = "4.3"
 hiltVersion = "2.51.1"