From 47cea453f57cc3add21c6dbda44a4d249687a863 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Mon, 8 Jan 2024 13:52:43 +0100
Subject: [PATCH] Use new AuthenticatorRepository to get AuthData

---
 .../splitinstall/SplitInstallBinder.kt        | 22 ++++++++++++-------
 .../splitinstall/SplitInstallService.kt       | 17 +++-----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
index fcd7528b2..a64f9d251 100644
--- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
+++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallBinder.kt
@@ -20,10 +20,11 @@ package foundation.e.apps.install.splitinstall
 
 import android.content.Context
 import androidx.core.content.pm.PackageInfoCompat
-import com.aurora.gplayapi.data.models.AuthData
 import foundation.e.apps.ISplitInstallService
 import foundation.e.apps.data.DownloadManager
 import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.login.AuthenticatorRepository
+import foundation.e.apps.data.login.exceptions.GPlayLoginException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -35,7 +36,7 @@ class SplitInstallBinder(
     private val coroutineScope: CoroutineScope,
     val applicationRepository: ApplicationRepository,
     val downloadManager: DownloadManager,
-    val authData: AuthData?,
+    val authenticatorRepository: AuthenticatorRepository,
     private var splitInstallSystemService: foundation.e.splitinstall.ISplitInstallService?
 ) : ISplitInstallService.Stub() {
 
@@ -43,16 +44,21 @@ class SplitInstallBinder(
 
     companion object {
         const val TAG = "SplitInstallerBinder"
+        const val AUTH_DATA_ERROR_MESSAGE = "Could not get auth data"
     }
 
     override fun installSplitModule(packageName: String, moduleName: String) {
-        if (authData == null) {
-            Timber.i("No authentication data. Could not install on demand module")
-            return
-        }
+        try {
+            if (authenticatorRepository.gplayAuth == null) {
+                Timber.w(AUTH_DATA_ERROR_MESSAGE)
+                return
+            }
 
-        coroutineScope.launch {
-            downloadModule(packageName, moduleName)
+            coroutineScope.launch {
+                downloadModule(packageName, moduleName)
+            }
+        } catch (exception: GPlayLoginException) {
+            Timber.w("$AUTH_DATA_ERROR_MESSAGE $exception")
         }
     }
 
diff --git a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
index 03011ea2f..89b1cd936 100644
--- a/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
+++ b/app/src/main/java/foundation/e/apps/install/splitinstall/SplitInstallService.kt
@@ -24,15 +24,14 @@ import android.content.ServiceConnection
 import android.os.IBinder
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
-import com.aurora.gplayapi.data.models.AuthData
 import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
 import foundation.e.apps.data.DownloadManager
 import foundation.e.apps.data.application.ApplicationRepository
+import foundation.e.apps.data.login.AuthenticatorRepository
 import foundation.e.apps.data.preference.AppLoungeDataStore
 import foundation.e.splitinstall.ISplitInstallService
 import foundation.e.splitinstall.SplitInstall
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -46,8 +45,8 @@ class SplitInstallService : LifecycleService() {
     @Inject lateinit var applicationRepository: ApplicationRepository
     @Inject lateinit var downloadManager: DownloadManager
     @Inject lateinit var gson: Gson
+    @Inject lateinit var authenticatorRepository: AuthenticatorRepository
     private lateinit var binder: SplitInstallBinder
-    private var authData: AuthData? = null
     private var splitInstallSystemService: ISplitInstallService? = null
 
     private val serviceConnection = object : ServiceConnection {
@@ -68,10 +67,6 @@ class SplitInstallService : LifecycleService() {
             component = SplitInstall.SPLIT_INSTALL_SYSTEM_SERVICE
         }
         bindService(intent, serviceConnection, BIND_AUTO_CREATE)
-
-        lifecycleScope.launch {
-            fetchAuthData()
-        }
     }
 
     override fun onDestroy() {
@@ -81,12 +76,6 @@ class SplitInstallService : LifecycleService() {
         super.onDestroy()
     }
 
-    private suspend fun fetchAuthData() {
-        appLoungeDataStore.authData.collect {
-            authData = gson.fromJson(it, AuthData::class.java)
-        }
-    }
-
     override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
         binder = SplitInstallBinder(
@@ -94,7 +83,7 @@ class SplitInstallService : LifecycleService() {
             lifecycleScope,
             applicationRepository,
             downloadManager,
-            authData,
+            authenticatorRepository,
             splitInstallSystemService
         )
         return binder
-- 
GitLab