Release 1.0.13

Author: Yevhen Podkovyrin

README.md

@@ -6,69 +6,25 @@ In the current release, Flexa offers a privacy-focused payments experience for i
 
 ## Modules structure
 
-```mermaid
-flowchart BT
-direction RL
-core([Flexa])
-direction TB
-scan([Scan])
-spend([Spend])
-scan---core
-spend---core
-```
-
 | Module        | Description                                            |
 | ------------- | ------------------------------------------------------ |
 | Flexa   | Core functionality required by all other modules       |
-| Scan  | Camera-based parsing of QR codes for payments and more |
 | Spend | Instant retail payments, powered by Flexa              |
 
 ## Installation
 
-Flexa can be integrated **locally** or using **package repository**
-
-### Local repository
-
-1. Run the next buildScript from the SDK root folder:
-
-```groovy
-./gradlew core:assembleDebug && ./gradlew core:publishToMavenLocal && ./gradlew scan:assembleDebug && ./gradlew scan:publishToMavenLocal && ./gradlew spend:assembleDebug && ./gradlew spend:publishToMavenLocal
-
-```
-
-2. Add `mavenLocal()` repository to `settings.gradle`:
-
-```groovy
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        ...
-        mavenLocal() <---
-    }
-}
-```
-
-3.  Add module dependency in your project [module-level build.gradle](https://developer.android.com/studio/build#module-level) file:
+Flexa can be integrated using **package repository** or **locally**
 
-**Identity** module:
+### Package repository
 
-```groovy
-implementation "com.flexa:core:1.0.12"
-```
-
-**Scan** module:
-
-```groovy
-implementation "com.flexa:scan:1.0.12"
-```
-
-**Spend** module:
+#### Maven Central
 
+Add module dependency in your project [module-level build.gradle](https://developer.android.com/studio/build#module-level) file:
 ```groovy
-implementation "com.flexa:spend:1.0.12"
+implementation 'co.flexa:core:1.0.13'
+implementation 'co.flexa:spend:1.0.13' // includes core library
 ```
 
-### Remote repository
 
 #### GitHub Package Registry
 
@@ -101,27 +57,55 @@ implementation "com.flexa:spend:1.0.12"
         }
     }
     ```
-    
+
 3. Add module dependency in your project [module-level build.gradle](https://developer.android.com/studio/build#module-level) file:
 
     **Identity** module:
 
     ```groovy
-    implementation "com.flexa:core:1.0.12"
+    implementation "com.flexa:core:1.0.13"
     ```
 
-    **Scan** module:
+    **Spend** module:
 
     ```groovy
-    implementation "com.flexa:scan:1.0.12"
+    implementation "com.flexa:spend:1.0.13"
     ```
 
-    **Spend** module:
+### Local repository
 
-    ```groovy
-    implementation "com.flexa:spend:1.0.12"
-    ```
+1. Run the next buildScript from the SDK root folder:
+
+```groovy
+./gradlew core:assembleDebug && ./gradlew core:publishToMavenLocal && ./gradlew spend:assembleDebug && ./gradlew spend:publishToMavenLocal
+
+```
+
+2. Add `mavenLocal()` repository to `settings.gradle`:
+
+```groovy
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        ...
+        mavenLocal() <---
+    }
+}
+```
+
+3.  Add module dependency in your project [module-level build.gradle](https://developer.android.com/studio/build#module-level) file:
 
+**Identity** module:
+
+```groovy
+implementation "com.flexa:core:1.0.13"
+```
+
+**Spend** module:
+
+```groovy
+implementation "com.flexa:spend:1.0.13"
+```
 
 ## Usage
 

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlinVersion = '1.9.21'
 
-        sdk_version = '1.0.12'
+        sdk_version = '1.0.13'
         groupId = 'com.flexa'
         core_version = sdk_version
         scan_version = sdk_version

core/src/main/java/com/flexa/core/Flexa.kt

@@ -23,6 +23,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.serialization.encodeToString
 import java.util.UUID
 
 
@@ -76,7 +77,7 @@ object Flexa {
     fun init(config: FlexaClientConfiguration) {
         context = config.context.applicationContext
         themeConfig = config.theme
-        setAppAccounts(config.assetAccounts)
+        setAssetAccounts(config.assetAccounts)
         setUniqueIdentifier()
         saveApiKeys(
             publishableKey = config.publishableKey,
@@ -85,7 +86,8 @@ object Flexa {
     }
 
     fun updateAssetAccounts(assetAccounts: ArrayList<AssetAccount>) {
-        setAppAccounts(assetAccounts)
+        setAssetAccounts(assetAccounts)
+        storeAssetAccounts(assetAccounts)
     }
 
     fun selectedAsset(appAccountId: String, assetId: String) {
@@ -122,9 +124,22 @@ object Flexa {
         }
     }
 
-    private fun setAppAccounts(appAccounts: List<AssetAccount>?) {
+    private fun setAssetAccounts(appAccounts: List<AssetAccount>?) {
         scope.launch {
-            appAccounts?.let { _appAccounts.emit(it) }
+            appAccounts?.let {
+                _appAccounts.emit(it)
+                storeAssetAccounts(it)
+            }
+        }
+    }
+
+    private fun storeAssetAccounts(appAccounts: List<AssetAccount>) {
+        scope.launch {
+            runCatching {
+                json.encodeToString<List<AssetAccount>>(appAccounts)
+            }.getOrNull()?.let { accountsJson ->
+                preferences.saveString(FlexaConstants.ASSET_ACCOUNTS, accountsJson)
+            }
         }
     }
 

core/src/main/java/com/flexa/core/shared/AssetAccount.kt

@@ -2,32 +2,51 @@ package com.flexa.core.shared
 
 import android.graphics.Color
 
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
 data class AssetAccount(
     /**
      * SHA256 hash of Account ID string
      */
+    @SerialName("asset_account_hash")
     val assetAccountHash: String,
+    @SerialName("custody_model")
     val custodyModel: CustodyModel,
+    @SerialName("display_name")
     val displayName: String? = null,
+    @SerialName("icon")
     val icon: String? = null,
+    @SerialName("available_assets")
     val availableAssets: List<AvailableAsset>,
 )
 
+@Serializable
 data class AvailableAsset(
+    @SerialName("asset_id")
     val assetId: String,
+    @SerialName("balance")
     val balance: Double,
     /**
      * Due to the nature of the UTXO model used on Bitcoin and Zcash,
      * spendable balance can fluctuate, sometimes to zero temporarily
      * as the transaction is being mined and confirmed on-chain
      */
+    @SerialName("balance_available")
     val balanceAvailable: Double? = null,
+    @SerialName("icon")
     val icon: String? = null,
+    @SerialName("display_name")
     val displayName: String? = null,
+    @SerialName("symbol")
     val symbol: String? = null,
+    @SerialName("accent_color")
+    @Serializable(with = ColorSerializer::class)
     val accentColor: Color? = null,
 )
 
+@Serializable
 enum class CustodyModel {
     LOCAL, MANAGED
 }

core/src/main/java/com/flexa/core/shared/ConnectionHandler.kt

@@ -5,7 +5,6 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
-import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
@@ -22,7 +21,7 @@ sealed class ConnectionState {
     data object Unavailable : ConnectionState()
 }
 
-val Context.currentConnectivityState: ConnectionState
+private val Context.currentConnectivityState: ConnectionState
     get() {
         val connectivityManager =
             getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
@@ -32,18 +31,10 @@ val Context.currentConnectivityState: ConnectionState
 private fun getCurrentConnectionState(
     connectivityManager: ConnectivityManager
 ): ConnectionState {
+    val network = connectivityManager.activeNetwork
+    val actNetwork = runCatching { connectivityManager.getNetworkCapabilities(network) }
     val connected =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            val network = connectivityManager.activeNetwork
-            val actNetwork = runCatching { connectivityManager.getNetworkCapabilities(network) }
-            actNetwork.getOrNull()?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
-        } else {
-            @Suppress("DEPRECATION")
-            connectivityManager.allNetworks.any { network ->
-                connectivityManager.getNetworkCapabilities(network)
-                    ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
-            }
-        }
+        actNetwork.getOrNull()?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) == true
     return if (connected) ConnectionState.Available else ConnectionState.Unavailable
 }
 
@@ -56,19 +47,20 @@ fun Context.observeConnectionAsFlow() = callbackFlow {
         .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
         .build()
     connectivityManager.registerNetworkCallback(networkRequest, callback)
-    val currentState = getCurrentConnectionState(connectivityManager)
-    trySend(currentState)
     awaitClose { connectivityManager.unregisterNetworkCallback(callback) }
 }
 
+private val typesSet = HashSet<String>(2)
 fun networkCallback(callback: (ConnectionState) -> Unit): ConnectivityManager.NetworkCallback {
     return object : ConnectivityManager.NetworkCallback() {
         override fun onAvailable(network: Network) {
+            typesSet.add(network.toString())
             callback(ConnectionState.Available)
         }
 
         override fun onLost(network: Network) {
-            callback(ConnectionState.Unavailable)
+            typesSet.remove(network.toString())
+            if (typesSet.isEmpty()) callback(ConnectionState.Unavailable)
         }
     }
 }

core/src/main/java/com/flexa/core/shared/FlexaConstants.kt

@@ -6,14 +6,14 @@ class FlexaConstants {
         const val RETRY_DELAY = 500L
         const val RETRY_COUNT = 3
         const val FILE = "flexa"
-        const val ANDROID = "android"
         const val PUBLISHABLE_KEY = "publishable.key"
         const val UNIQUE_IDENTIFIER = "unique.identifier"
         const val PLACES_TO_PAY_THEME = "places.to.pay.theme"
         const val VERIFIER = "verifier"
         const val TOKEN = "token"
         const val TOKEN_EXPIRATION = "token.expiration"
         const val APP_ACCOUNTS = "app.accounts"
+        const val ASSET_ACCOUNTS = "asset.accounts"
         const val TOKEN_ID = "token.id"
         const val EMAIL = "email"
         const val EMPTY = ""

core/src/main/java/com/flexa/core/shared/SerializerProvider.kt

@@ -1,6 +1,13 @@
 package com.flexa.core.shared
 
+import android.graphics.Color
 import com.google.gson.Gson
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 
 class SerializerProvider {
@@ -10,3 +17,17 @@ class SerializerProvider {
         Gson()
     }
 }
+
+object ColorSerializer : KSerializer<Color> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("com.flexa.core.shared.Color", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: Color) {
+        val raw = value.toArgb()
+        encoder.encodeInt(raw)
+    }
+
+    override fun deserialize(decoder: Decoder): Color {
+        val raw = decoder.decodeInt()
+        return Color.valueOf(raw)
+    }
+}