Rename wallet-sdk to mobile-sdk (#19)

.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/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 constructor(private val 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,14 +1,14 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log
-import com.spruceid.wallet.sdk.rs.ItemsRequest
-import com.spruceid.wallet.sdk.rs.SessionManager
-import com.spruceid.wallet.sdk.rs.SessionManagerEngaged
-import com.spruceid.wallet.sdk.rs.initialiseSession
-import com.spruceid.wallet.sdk.rs.handleRequest
-import com.spruceid.wallet.sdk.rs.submitResponse
-import com.spruceid.wallet.sdk.rs.submitSignature
+import com.spruceid.mobile.sdk.rs.ItemsRequest
+import com.spruceid.mobile.sdk.rs.SessionManager
+import com.spruceid.mobile.sdk.rs.SessionManagerEngaged
+import com.spruceid.mobile.sdk.rs.initialiseSession
+import com.spruceid.mobile.sdk.rs.handleRequest
+import com.spruceid.mobile.sdk.rs.submitResponse
+import com.spruceid.mobile.sdk.rs.submitSignature
 import java.security.KeyStore
 import java.security.Signature
 import java.util.UUID

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"),

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

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

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

@@ -1,14 +1,14 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.bluetooth.BluetoothManager
 import android.util.Log
 import androidx.lifecycle.ViewModel
-import com.spruceid.wallet.sdk.rs.RequestData
-import com.spruceid.wallet.sdk.rs.SessionData
-import com.spruceid.wallet.sdk.rs.handleRequest
-import com.spruceid.wallet.sdk.rs.initialiseSession
-import com.spruceid.wallet.sdk.rs.submitResponse
-import com.spruceid.wallet.sdk.rs.submitSignature
+import com.spruceid.mobile.sdk.rs.RequestData
+import com.spruceid.mobile.sdk.rs.SessionData
+import com.spruceid.mobile.sdk.rs.handleRequest
+import com.spruceid.mobile.sdk.rs.initialiseSession
+import com.spruceid.mobile.sdk.rs.submitResponse
+import com.spruceid.mobile.sdk.rs.submitSignature
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import java.security.KeyStore

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,7 +1,7 @@
-package com.spruceid.wallet.sdk
+package com.spruceid.mobile.sdk
 
 import android.util.Log
-import com.spruceid.wallet.sdk.rs.MDoc as InnerMDoc
+import com.spruceid.mobile.sdk.rs.MDoc as InnerMDoc
 
 class MDoc(id: String, issuerAuth: ByteArray, val keyAlias: String) : BaseCredential(id) {
      val inner: 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 {

WalletSdk/src/main/java/com/spruceid/wallet/sdk/ui/QRCodeAnalyzer.kt → MobileSdk/src/main/java/com/spruceid/mobile/sdk/ui/QRCodeAnalyzer.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.content.res.Resources
 import android.util.Range

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)
     }
 }

example/src/main/AndroidManifest.xml

@@ -27,13 +27,13 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.WalletSdk"
+        android:theme="@style/Theme.MobileSdk"
         tools:targetApi="31">
 
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.WalletSdk">
+            android:theme="@style/Theme.MobileSdk">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

example/src/main/java/com/spruceid/walletsdkexample/BleCentralCallbackHandler.kt → example/src/main/java/com/spruceid/mobilesdkexample/BleCentralCallbackHandler.kt

@@ -1,8 +1,8 @@
-package com.spruceid.walletsdkexample
+package com.spruceid.mobilesdkexample
 
 import android.bluetooth.le.ScanResult
 import android.util.Log
-import com.spruceid.wallet.sdk.BleCentralCallback
+import com.spruceid.mobile.sdk.BleCentralCallback
 
 class BleCentralCallbackHandler: BleCentralCallback() {
     override fun onScanResult(callbackType: Int, result: ScanResult) {

example/src/main/java/com/spruceid/walletsdkexample/MainActivity.kt → example/src/main/java/com/spruceid/mobilesdkexample/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.spruceid.walletsdkexample
+package com.spruceid.mobilesdkexample
 
 import android.content.Context
 import android.content.pm.PackageManager
@@ -35,14 +35,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
-import com.spruceid.wallet.sdk.ConnectionLiveData
-import com.spruceid.wallet.sdk.CredentialsViewModel
-import com.spruceid.wallet.sdk.MDoc
-import com.spruceid.wallet.sdk.PresentmentState
-import com.spruceid.wallet.sdk.getBluetoothManager
-import com.spruceid.wallet.sdk.getPermissions
-import com.spruceid.walletsdkexample.ui.theme.WalletSdkTheme
-import com.spruceid.walletsdkexample.ui.theme.rememberQrBitmapPainter
+import com.spruceid.mobile.sdk.ConnectionLiveData
+import com.spruceid.mobile.sdk.CredentialsViewModel
+import com.spruceid.mobile.sdk.MDoc
+import com.spruceid.mobile.sdk.PresentmentState
+import com.spruceid.mobile.sdk.getBluetoothManager
+import com.spruceid.mobile.sdk.getPermissions
+import com.spruceid.mobilesdkexample.ui.theme.MobileSdkTheme
+import com.spruceid.mobilesdkexample.ui.theme.rememberQrBitmapPainter
 import java.security.KeyFactory
 import java.security.KeyStore
 import java.security.cert.Certificate
@@ -70,7 +70,7 @@ class MainActivity : ComponentActivity() {
 
             viewModel.storeCredential(generateMDoc())
 
-            WalletSdkTheme {
+            MobileSdkTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.fillMaxSize(),

example/src/main/java/com/spruceid/walletsdkexample/NamespaceField.kt → example/src/main/java/com/spruceid/mobilesdkexample/NamespaceField.kt

@@ -1,4 +1,4 @@
-package com.spruceid.walletsdkexample
+package com.spruceid.mobilesdkexample
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -10,11 +10,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.spruceid.walletsdkexample.ui.theme.WalletSdkTheme
+import com.spruceid.mobilesdkexample.ui.theme.MobileSdkTheme
 
 @Composable
 fun NamespaceField(namespace: Map.Entry<String, Boolean>, isChecked: Boolean, onCheck: (Boolean) -> Unit) {
-    WalletSdkTheme {
+    MobileSdkTheme {
         Row(
             horizontalArrangement = Arrangement.SpaceBetween,
             verticalAlignment = Alignment.CenterVertically,

example/src/main/java/com/spruceid/walletsdkexample/ui/theme/Color.kt → example/src/main/java/com/spruceid/mobilesdkexample/ui/theme/Color.kt

@@ -1,4 +1,4 @@
-package com.spruceid.walletsdkexample.ui.theme
+package com.spruceid.mobilesdkexample.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

example/src/main/java/com/spruceid/walletsdkexample/ui/theme/QRPainter.kt → example/src/main/java/com/spruceid/mobilesdkexample/ui/theme/QRPainter.kt

@@ -1,4 +1,4 @@
-package com.spruceid.walletsdkexample.ui.theme
+package com.spruceid.mobilesdkexample.ui.theme
 
 import android.graphics.Bitmap
 import android.graphics.Color