android: Remove dependency on moshi

Author: hpoul

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.1.0-dev.1
+
+* Android: Remove Moshi dependency altogether. #53
+
 ## 4.0.1
 
 * Update to Moshi 1.13 for Kotlin 1.6.0 compatibility. #53 

android/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -52,7 +52,4 @@ dependencies {
     implementation "androidx.security:security-crypto:$security_version"
     implementation "androidx.biometric:biometric:$biometric_version"
     implementation "io.github.microutils:kotlin-logging:1.7.6"
-    implementation "com.squareup.moshi:moshi:1.13.0"
-    implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
-    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0")
 }

android/src/main/kotlin/design/codeux/biometric_storage/BiometricStorageFile.kt

@@ -5,15 +5,13 @@ import android.os.Build
 import android.security.keystore.KeyProperties
 import androidx.security.crypto.EncryptedFile
 import androidx.security.crypto.MasterKey
-import com.squareup.moshi.JsonClass
 import mu.KotlinLogging
 import java.io.File
 import java.io.IOException
 import javax.crypto.Cipher
 
 private val logger = KotlinLogging.logger {}
 
-@JsonClass(generateAdapter = true)
 data class InitOptions(
     val authenticationValidityDurationSeconds: Int = -1,
     val authenticationRequired: Boolean = true,

android/src/main/kotlin/design/codeux/biometric_storage/BiometricStoragePlugin.kt

@@ -8,8 +8,6 @@ import android.security.keystore.UserNotAuthenticatedException
 import androidx.biometric.*
 import androidx.biometric.BiometricManager.Authenticators.*
 import androidx.fragment.app.FragmentActivity
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.*
 import io.flutter.plugin.common.*
@@ -94,10 +92,6 @@ class BiometricStoragePlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
         const val PARAM_WRITE_CONTENT = "content"
         const val PARAM_ANDROID_PROMPT_INFO = "androidPromptInfo"
 
-        val moshi = Moshi.Builder()
-            // ... add your own JsonAdapters and factories ...
-            .build() as Moshi
-
         val executor : ExecutorService = Executors.newSingleThreadExecutor()
         private val handler: Handler = Handler(Looper.getMainLooper())
     }
@@ -136,9 +130,12 @@ class BiometricStoragePlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
             val getName = { requiredArgument<String>(PARAM_NAME) }
             val getAndroidPromptInfo = {
                 requiredArgument<Map<String, Any>>(PARAM_ANDROID_PROMPT_INFO).let {
-                    moshi.adapter(AndroidPromptInfo::class.java).fromJsonValue(it) ?: throw MethodCallException(
-                        "BadArgument",
-                        "'$PARAM_ANDROID_PROMPT_INFO' is not well formed"
+                    AndroidPromptInfo(
+                            title = it["title"] as String,
+                            subtitle = it["subtitle"] as String?,
+                            description = it["description"] as String?,
+                            negativeButton = it["negativeButton"] as String,
+                            confirmationRequired = it["confirmationRequired"] as Boolean,
                     )
                 }
             }
@@ -211,9 +208,16 @@ class BiometricStoragePlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
                         }
                     }
 
-                    val options = moshi.adapter(InitOptions::class.java)
-                        .fromJsonValue(call.argument("options") ?: emptyMap<String, Any>())
-                        ?: InitOptions()
+                    val options = call.argument<Map<String, Any>>("options")?.let { it ->
+                        InitOptions(
+                                authenticationValidityDurationSeconds = it["authenticationValidityDurationSeconds"] as Int,
+                                authenticationRequired = it["authenticationRequired"] as Boolean,
+                                androidBiometricOnly = it["androidBiometricOnly"] as Boolean,
+                        )
+                    } ?: InitOptions()
+//                    val options = moshi.adapter(InitOptions::class.java)
+//                        .fromJsonValue(call.argument("options") ?: emptyMap<String, Any>())
+//                        ?: InitOptions()
                     storageFiles[name] = BiometricStorageFile(applicationContext, name, options)
                     result.success(true)
                 }
@@ -344,7 +348,6 @@ class BiometricStoragePlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
     }
 }
 
-@JsonClass(generateAdapter = true)
 data class AndroidPromptInfo(
     val title: String,
     val subtitle: String?,

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     ndkVersion "21.0.6113669"
 
     sourceSets {

example/pubspec.lock

@@ -14,7 +14,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "4.0.0"
+    version: "4.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -135,6 +135,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -209,7 +216,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: biometric_storage
 description: |
   Secure Storage: Encrypted data store optionally secured by biometric lock with support
   for iOS, Android, MacOS. Partial support for Linux, Windows and web (localStorage).
-version: 4.0.1
+version: 4.1.0-dev.1
 homepage: https://github.com/authpass/biometric_storage/
 
 environment: