Merge main

.gitignore

@@ -335,3 +335,5 @@ $RECYCLE.BIN/
 !gradle/wrapper/gradle-wrapper.jar
 
 # End of https://www.gitignore.io/api/java,linux,macos,windows,android,intellij,androidstudio
+
+kls_database.db

WalletSdk/build.gradle.kts → MobileSdk/build.gradle.kts

@@ -10,7 +10,7 @@ publishing {
     repositories {
         maven {
             name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/spruceid/wallet-sdk-kt")
+            url = uri("https://maven.pkg.github.com/spruceid/mobile-sdk-kt")
             credentials {
                 username = System.getenv("GITHUB_ACTOR")
                 password = System.getenv("GITHUB_TOKEN")
@@ -20,8 +20,8 @@ publishing {
     publications {
         // Creates a Maven publication called "release".
         create<MavenPublication>("release") {
-            groupId = "com.spruceid.wallet.sdk"
-            artifactId = "walletsdk"
+            groupId = "com.spruceid.mobile.sdk"
+            artifactId = "mobilesdk"
             version = System.getenv("VERSION")
 
             afterEvaluate {
@@ -30,9 +30,9 @@ publishing {
 
             pom {
                 packaging = "aar"
-                name.set("walletsdk")
-                description.set("Android SpruceID Wallet SDK")
-                url.set("https://github.com/spruceid/wallet-sdk-kt")
+                name.set("mobilesdk")
+                description.set("Android SpruceID Mobile SDK")
+                url.set("https://github.com/spruceid/mobile-sdk-kt")
                 licenses {
                     license {
                         name.set("MIT License")
@@ -76,7 +76,7 @@ nmcp {
 
 
 android {
-    namespace = "com.spruceid.wallet.sdk"
+    namespace = "com.spruceid.mobile.sdk"
     compileSdk = 33
 
     defaultConfig {
@@ -118,7 +118,7 @@ android {
 }
 
 dependencies {
-    api("com.spruceid.wallet.sdk.rs:walletsdkrs:0.0.25")
+    api("com.spruceid.mobile.sdk.rs:mobilesdkrs:0.0.26")
     //noinspection GradleCompatible
     implementation("com.android.support:appcompat-v7:28.0.0")
     /* Begin UI dependencies */

WalletSdk/src/main/AndroidManifest.xml → MobileSdk/src/main/AndroidManifest.xml

@@ -15,5 +15,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="android.permission.CAMERA" />
-
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BaseCredential.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BaseCredential.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 open class BaseCredential {
     private var id: String?

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BleCentral.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleCentral.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.le.*
 import android.os.Handler

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BleCentralCallback.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleCentralCallback.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.le.ScanResult
 

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BlePeripheral.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BlePeripheral.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.le.AdvertiseCallback

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BleSessionManager.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleSessionManager.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log

WalletSdk/src/main/java/com/spruceid/wallet/sdk/BleStates.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleStates.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 enum class BleStates(val string: String) {
     Scanning("scanning"),

MobileSdk/src/main/java/com/spruceid/mobile/sdk/ConnectionLiveData.kt

@@ -0,0 +1,86 @@
+package com.spruceid.mobile.sdk
+
+import android.content.Context
+import android.content.Context.CONNECTIVITY_SERVICE
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
+import android.net.NetworkCapabilities.TRANSPORT_CELLULAR
+import android.net.NetworkCapabilities.TRANSPORT_WIFI
+import android.net.NetworkRequest
+import androidx.lifecycle.LiveData
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+import java.net.InetSocketAddress
+import javax.net.SocketFactory
+
+class ConnectionLiveData(context: Context) : LiveData<Boolean>() {
+
+    private lateinit var networkCallback: ConnectivityManager.NetworkCallback
+    private val connectivityManager =
+        context.getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
+    private val validNetworks: MutableSet<Network> = HashSet()
+
+    private fun checkValidNetworks() {
+        postValue(validNetworks.size > 0)
+    }
+
+    override fun onActive() {
+        networkCallback = createNetworkCallback()
+        val networkRequest = NetworkRequest.Builder()
+            .addCapability(NET_CAPABILITY_INTERNET)
+            .addTransportType(TRANSPORT_WIFI)
+            .addTransportType(TRANSPORT_CELLULAR)
+            .build()
+        connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
+    }
+
+    override fun onInactive() {
+        connectivityManager.unregisterNetworkCallback(networkCallback)
+    }
+
+    private fun createNetworkCallback() = object : ConnectivityManager.NetworkCallback() {
+
+        override fun onAvailable(network: Network) {
+            val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
+            val hasInternetCapability = networkCapabilities?.hasCapability(NET_CAPABILITY_INTERNET)
+
+            if (hasInternetCapability == true) {
+                // Check if this network actually has internet
+                CoroutineScope(Dispatchers.IO).launch {
+                    val hasInternet = DoesNetworkHaveInternet.execute(network.socketFactory)
+                    if (hasInternet) {
+                        withContext(Dispatchers.Main) {
+                            validNetworks.add(network)
+                            checkValidNetworks()
+                        }
+                    }
+                }
+            }
+        }
+
+        override fun onLost(network: Network) {
+            validNetworks.remove(network)
+            checkValidNetworks()
+        }
+    }
+
+    object DoesNetworkHaveInternet {
+        suspend fun execute(socketFactory: SocketFactory): Boolean {
+            // Make sure to execute this on a background thread.
+            delay(1000)
+            return try {
+                val socket = socketFactory.createSocket() ?: throw IOException("Socket is null.")
+                socket.connect(InetSocketAddress("8.8.8.8", 53), 1500)
+                socket.close()
+                true
+            } catch (e: IOException) {
+                false
+            }
+        }
+    }
+}

WalletSdk/src/main/java/com/spruceid/wallet/sdk/CredentialPack.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/CredentialPack.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import java.security.KeyFactory
 import java.security.KeyStore

WalletSdk/src/main/java/com/spruceid/wallet/sdk/CredentialsViewModel.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/CredentialsViewModel.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log

WalletSdk/src/main/java/com/spruceid/wallet/sdk/GattClient.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/GattClient.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt

WalletSdk/src/main/java/com/spruceid/wallet/sdk/GattClientCallback.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/GattClientCallback.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 abstract class GattClientCallback {
     open fun onPeerConnected() {}

WalletSdk/src/main/java/com/spruceid/wallet/sdk/GattServer.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/GattServer.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 
 import android.bluetooth.*

WalletSdk/src/main/java/com/spruceid/wallet/sdk/GattServerCallback.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/GattServerCallback.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 abstract class GattServerCallback {
     open fun onPeerConnected() {}

WalletSdk/src/main/java/com/spruceid/wallet/sdk/KeyManager.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/KeyManager.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.os.Build
 import android.security.keystore.KeyGenParameterSpec

WalletSdk/src/main/java/com/spruceid/wallet/sdk/KeyManagerEnvironment.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/KeyManagerEnvironment.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 /**
  * The Keystore environment used for the key generation.

WalletSdk/src/main/java/com/spruceid/wallet/sdk/MDoc.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/MDoc.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.util.Log
 import com.spruceid.mobile.sdk.rs.MDoc as InnerMDoc

WalletSdk/src/main/java/com/spruceid/wallet/sdk/Transport.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/Transport.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log

WalletSdk/src/main/java/com/spruceid/wallet/sdk/TransportBle.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/TransportBle.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log

WalletSdk/src/main/java/com/spruceid/wallet/sdk/TransportBleCentralClientHolder.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/TransportBleCentralClientHolder.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter

WalletSdk/src/main/java/com/spruceid/wallet/sdk/TransportBlePeripheralServerHolder.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/TransportBlePeripheralServerHolder.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager

WalletSdk/src/main/java/com/spruceid/wallet/sdk/Utils.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/Utils.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 
 fun hexToByteArray(value: String): ByteArray {
@@ -27,4 +27,4 @@ enum class PresentmentState {
 
     /// App should display a success message and offer to close the page
     SUCCESS,
-}
+}

WalletSdk/src/main/java/com/spruceid/wallet/sdk/W3CVC.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/W3CVC.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import org.json.JSONObject
 

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/BaseCard.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/BaseCard.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk.ui
+package com.spruceid.mobile.sdk.ui
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import com.spruceid.wallet.sdk.CredentialPack
+import com.spruceid.mobile.sdk.CredentialPack
 
 /**
  * Data class with the specification to display the credential pack in a list view

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/GenericCameraXScanner.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/GenericCameraXScanner.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk.ui
+package com.spruceid.mobile.sdk.ui
 
 import android.content.Context
 import android.util.Range

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/MRZScanner.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/MRZScanner.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk.ui
+package com.spruceid.mobile.sdk.ui
 
 import androidx.camera.core.ImageAnalysis.COORDINATE_SYSTEM_ORIGINAL
 import androidx.camera.mlkit.vision.MlKitAnalyzer

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/PDF417Scanner.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/PDF417Scanner.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk.ui
+package com.spruceid.mobile.sdk.ui
 
 import android.graphics.ImageFormat
 import android.os.Build

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/QRCodeScanner.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/QRCodeScanner.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk.ui
+package com.spruceid.mobile.sdk.ui
 
 import android.graphics.ImageFormat
 import android.os.Build

WalletSdk/src/test/java/com/spruceid/wallet/sdk/KeyManagerTest.kt → MobileSdk/src/test/java/com/spruceid/mobile/sdk/KeyManagerTest.kt

@@ -1,4 +1,4 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import org.junit.Test
 

README.md

@@ -1,8 +1,8 @@
-# Kotlin Wallet SDK
+# Kotlin Mobile SDK
 
 ## Maturity Disclaimer
 
-In its current version, Wallet SDK has not yet undergone a formal security audit
+In its current version, Mobile SDK has not yet undergone a formal security audit
 to desired levels of confidence for suitable use in production systems. This
 implementation is currently suitable for exploratory work and experimentation
 only. We welcome feedback on the usability, architecture, and security of this
@@ -11,7 +11,7 @@ security firm before the v1.0 release.
 
 ## Architecture
 
-Our Wallet SDKs use shared code, with most of the logic being written once in
+Our Mobile SDKs use shared code, with most of the logic being written once in
 Rust, and when not possible, native APIs (e.g. Bluetooth, OS Keychain) are
 called in native SDKs.
 
@@ -30,6 +30,6 @@ called in native SDKs.
       │Rust│
       └────┘
 ```
-- [Kotlin SDK](https://github.com/spruceid/wallet-sdk-kt)
-- [Swift SDK](https://github.com/spruceid/wallet-sdk-swift)
-- [Rust layer](https://github.com/spruceid/wallet-sdk-rs)
+- [Kotlin SDK](https://github.com/spruceid/mobile-sdk-kt)
+- [Swift SDK](https://github.com/spruceid/mobile-sdk-swift)
+- [Rust layer](https://github.com/spruceid/mobile-sdk-rs)

example/build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    namespace = "com.spruceid.walletsdkexample"
+    namespace = "com.spruceid.mobilesdkexample"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.spruceid.walletsdkexample"
+        applicationId = "com.spruceid.mobilesdkexample"
         minSdk = 26
         targetSdk = 34
         versionCode = 1
@@ -59,7 +59,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation(project(mapOf("path" to ":WalletSdk")))
+    implementation(project(mapOf("path" to ":MobileSdk")))
     implementation("com.google.zxing:core:3.5.1")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")

example/src/androidTest/java/com/spruceid/walletsdkexample/ExampleInstrumentedTest.kt → example/src/androidTest/java/com/spruceid/mobilesdkexample/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.spruceid.walletsdkexample
+package com.spruceid.mobilesdkexample
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.spruceid.walletsdk", appContext.packageName)
+        assertEquals("com.spruceid.mobilesdk", appContext.packageName)
     }
 }