Replace volley with ktor + okhttp

Allows downloading large applications
e-foundation · Sep 25, 2024 · ec18cdb · ec18cdb
1 parent 2e1dfec
commit ec18cdb
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 154 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,6 +27,8 @@ buildscript {
 
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'
+    ext.okHttpVersion = '4.12.0'
+    ext.ktorVersion = '2.3.12'
     ext.wireVersion = '4.9.9'
 
     ext.androidBuildGradleVersion = '8.2.2'

diff --git a/vending-app/build.gradle b/vending-app/build.gradle
@@ -26,6 +26,7 @@ android {
                 removeUnusedResources false
                 obfuscate false
                 optimizeCode false
+                proguardFile 'proguard-rules.pro'
             }
         }
         release {
@@ -34,6 +35,7 @@ android {
                 removeUnusedResources true
                 obfuscate false
                 optimizeCode true
+                proguardFile 'proguard-rules.pro'
             }
         }
     }
@@ -96,7 +98,9 @@ dependencies {
     implementation "com.squareup.wire:wire-runtime:$wireVersion"
     implementation "com.squareup.wire:wire-grpc-client:$wireVersion"
 
-    implementation "com.android.volley:volley:$volleyVersion"
+    implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
+    implementation "io.ktor:ktor-client-core:$ktorVersion"
+    implementation "io.ktor:ktor-client-okhttp:$ktorVersion"
 
     implementation "androidx.webkit:webkit:$webkitVersion"
 

diff --git a/vending-app/proguard-rules.pro b/vending-app/proguard-rules.pro
@@ -0,0 +1,6 @@
+# OKHttp rules
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/vending-app/src/main/java/com/android/vending/licensing/LicenseChecker.kt b/vending-app/src/main/java/com/android/vending/licensing/LicenseChecker.kt
@@ -10,7 +10,6 @@ import android.util.Log
 import com.android.vending.AUTH_TOKEN_SCOPE
 import com.android.vending.buildRequestHeaders
 import com.android.vending.getAuthToken
-import com.android.volley.VolleyError
 import org.microg.vending.billing.core.HttpClient
 import org.microg.vending.billing.proto.GoogleApiResponse
 import java.io.IOException
@@ -126,11 +125,8 @@ suspend fun HttpClient.checkLicense(
                 packageName, auth, packageInfo.versionCode, decodedAndroidId
             )
         } ?: ErrorResponse(NOT_LICENSED)
-    } catch (e: VolleyError) {
-        Log.e(TAG, "License request failed with $e")
-        ErrorResponse(ERROR_CONTACTING_SERVER)
     } catch (e: IOException) {
-        Log.e(TAG, "Encountered a network error during operation ($e)")
+        Log.e(TAG, "Encountered a network error during operation", e)
         ErrorResponse(ERROR_CONTACTING_SERVER)
     } catch (e: OperationCanceledException) {
         ErrorResponse(ERROR_CONTACTING_SERVER)

diff --git a/vending-app/src/main/java/com/android/vending/licensing/LicensingService.kt b/vending-app/src/main/java/com/android/vending/licensing/LicensingService.kt
@@ -16,16 +16,13 @@ import android.os.RemoteException
 import android.util.Log
 import com.android.vending.VendingPreferences.isLicensingEnabled
 import com.android.vending.VendingPreferences.isLicensingPurchaseFreeAppsEnabled
-import com.android.volley.RequestQueue
-import com.android.volley.toolbox.Volley
 import kotlinx.coroutines.runBlocking
 import org.microg.gms.auth.AuthConstants
 import org.microg.gms.profile.ProfileManager.ensureInitialized
 import org.microg.vending.billing.acquireFreeAppLicense
 import org.microg.vending.billing.core.HttpClient
 
 class LicensingService : Service() {
-    private lateinit var queue: RequestQueue
     private lateinit var accountManager: AccountManager
     private lateinit var androidId: String
     private lateinit var httpClient: HttpClient
@@ -199,9 +196,8 @@ class LicensingService : Service() {
                 androidId = java.lang.Long.toHexString(cursor.getLong(0))
             }
         }
-        queue = Volley.newRequestQueue(this)
         accountManager = AccountManager.get(this)
-        httpClient = HttpClient(this)
+        httpClient = HttpClient()
 
         return mLicenseService
     }

diff --git a/vending-app/src/main/java/org/microg/vending/billing/AcquireFreeAppLicense.kt b/vending-app/src/main/java/org/microg/vending/billing/AcquireFreeAppLicense.kt
@@ -3,7 +3,7 @@ package org.microg.vending.billing
 import android.accounts.Account
 import android.content.Context
 import android.util.Log
-import com.android.volley.VolleyError
+import io.ktor.utils.io.errors.IOException
 import org.microg.vending.billing.core.GooglePlayApi.Companion.URL_DETAILS
 import org.microg.vending.billing.core.GooglePlayApi.Companion.URL_PURCHASE
 import org.microg.vending.billing.core.HeaderProvider
@@ -29,8 +29,8 @@ suspend fun HttpClient.acquireFreeAppLicense(context: Context, account: Account,
             params = mapOf("doc" to packageName),
             adapter = GoogleApiResponse.ADAPTER
         ).payload?.detailsResponse
-    } catch (e: VolleyError) {
-        Log.e(TAG, "Unable to auto-purchase $packageName because of a network error or unexpected response when gathering app data")
+    } catch (e: IOException) {
+        Log.e(TAG, "Unable to auto-purchase $packageName because of a network error or unexpected response when gathering app data", e)
         return false
     }
 
@@ -67,8 +67,8 @@ suspend fun HttpClient.acquireFreeAppLicense(context: Context, account: Account,
             params = parameters,
             adapter = GoogleApiResponse.ADAPTER
         ).payload?.buyResponse
-    } catch (e: VolleyError) {
-        Log.e(TAG, "Unable to auto-purchase $packageName because of a network error or unexpected response during purchase")
+    } catch (e: IOException) {
+        Log.e(TAG, "Unable to auto-purchase $packageName because of a network error or unexpected response during purchase", e)
         return false
     }