Removed context references

XYOracleNetwork · Dec 4, 2024 · bbda03b · bbda03b
1 parent 09da683
commit bbda03b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/sdk/src/androidTest/java/network/xyo/client/settings/XyoSdkTest.kt b/sdk/src/androidTest/java/network/xyo/client/settings/XyoSdkTest.kt
@@ -57,7 +57,7 @@ class XyoSdkTest {
     fun testGetAccount() {
         runBlocking {
             val instance = XyoSdk.getInstance(appContext)
-            val account = instance.getAccount()
+            val account = instance.getAccount(appContext)
             assertInstanceOf<AccountInstance>(account)
         }
     }
@@ -68,7 +68,7 @@ class XyoSdkTest {
         runBlocking {
             val instance = XyoSdk.getInstance(appContext)
 
-            val testAccount = instance.getAccount()
+            val testAccount = instance.getAccount(appContext)
             val panel = XyoPanel(appContext, testAccount, fun(_:Context): List<XyoEventPayload> {
                 return listOf(XyoEventPayload("test_event"))
             })

diff --git a/sdk/src/main/java/network/xyo/client/settings/XyoSdk.kt b/sdk/src/main/java/network/xyo/client/settings/XyoSdk.kt
@@ -8,18 +8,17 @@ import network.xyo.client.account.model.AccountInstance
 import network.xyo.client.datastore.accounts.AccountPrefsRepository
 import network.xyo.client.datastore.previous_hash_store.PreviousHashStorePrefsRepository
 
-class XyoSdk private constructor(context: Context, val settings: SettingsInterface) {
-    private val appContext = context.applicationContext
+class XyoSdk private constructor(val settings: SettingsInterface) {
     private var _account: AccountInstance? = null
 
     @RequiresApi(Build.VERSION_CODES.M)
-    suspend fun getAccount(): AccountInstance {
+    suspend fun getAccount(context: Context): AccountInstance {
         if (INSTANCE !== null) {
             val validInstance = INSTANCE!!
             if (validInstance._account !== null) {
                 return validInstance._account!!
             } else {
-                val repository = AccountPrefsRepository.getInstance(validInstance.appContext)
+                val repository = AccountPrefsRepository.getInstance(context.applicationContext)
                 validInstance._account = repository.getAccount()
                 return _account!!
             }
@@ -39,16 +38,16 @@ class XyoSdk private constructor(context: Context, val settings: SettingsInterfa
             Account.previousHashStore = PreviousHashStorePrefsRepository.getInstance(context.applicationContext)
 
             val newInstance = INSTANCE ?: synchronized(this) {
-                INSTANCE ?: XyoSdk(context.applicationContext, settings).also { INSTANCE = it }
+                INSTANCE ?: XyoSdk(settings).also { INSTANCE = it }
             }
             return newInstance
         }
 
         fun refresh(context: Context, settings: SettingsInterface = DefaultXyoSdkSettings()): XyoSdk {
             synchronized(this) {
                 // Initialize the singleton with the users accountPreferences
-                AccountPrefsRepository.getInstance(context.applicationContext, settings)
-                INSTANCE = XyoSdk(context.applicationContext, settings)
+                AccountPrefsRepository.getInstance(context, settings)
+                INSTANCE = XyoSdk(settings)
             }
             return INSTANCE!!
         }

diff --git a/sdk/src/main/java/network/xyo/client/witness/location/info/Handler.kt b/sdk/src/main/java/network/xyo/client/witness/location/info/Handler.kt
@@ -17,7 +17,7 @@ import network.xyo.client.settings.XyoSdk
 open class WitnessLocationHandler : WitnessHandlerInterface<Triple<XyoBoundWitnessJson?, XyoPayload?, XyoPayload?>> {
     @RequiresApi(Build.VERSION_CODES.M)
     override suspend fun witness(context: Context, nodeUrlsAndAccounts: ArrayList<Pair<String, AccountInstance?>>): WitnessResult<Triple<XyoBoundWitnessJson?, XyoPayload?, XyoPayload?>> {
-        val account = XyoSdk.getInstance(context.applicationContext).getAccount()
+        val account = XyoSdk.getInstance(context.applicationContext).getAccount(context)
         val panel = XyoPanel(context, account, nodeUrlsAndAccounts, listOf(
             XyoLocationWitness(account)
         ))