Merge pull request 'Update dependency androidx.camera:camera-view to v1.3.3' (#12) from renovate/androidx.camera-camera-view-1.x into main

Reviewed-on: #12

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks
 
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3
 
       - name: create and checkout branch
         if: github.event_name == 'pull_request'

README.md

@@ -47,7 +47,8 @@
 
 ## ⚙️ Permissions
 
-- `CAMERA`: necessary for the scanning of barcodes
+- `CAMERA`: necessary for importing barcodes from camera
+- `READ_MEDIA_VISUAL_USER_SELECTED`: necessary for the importing barcode from images
 
 ## 📝 Contribute
 

app/build.gradle

@@ -34,6 +34,7 @@ android {
     buildTypes {
         debug {
             debuggable true
+            signingConfig = signingConfigs.getByName("release")
         }
         release {
             minifyEnabled true
@@ -73,9 +74,9 @@ android {
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
 
-    implementation 'androidx.camera:camera-lifecycle:1.3.2'
+    implementation 'androidx.camera:camera-lifecycle:1.3.3'
-    implementation 'androidx.camera:camera-view:1.3.2'
+    implementation 'androidx.camera:camera-view:1.3.3'
-    runtimeOnly 'androidx.camera:camera-camera2:1.3.2'
+    runtimeOnly 'androidx.camera:camera-camera2:1.3.3'
 
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.android.material:material:1.11.0'

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="6"
+    android:versionCode="7"
-    android:versionName="1.2a">
+    android:versionName="1.2b">
 
     <uses-feature android:name="android.hardware.camera" />
 

app/src/main/java/net/helcel/fidelity/activity/fragment/CreateEntry.kt

@@ -151,6 +151,11 @@ class CreateEntry : Fragment() {
                         kpEntry.second
                     )
                 )
+                if (!binding.checkboxProtected.isChecked) {
+                    val r = KeepassWrapper.entryExtract(kpEntry.first)
+                    CacheManager.addFidelity(r)
+                }
+                activity?.supportFragmentManager?.popBackStack()
             } catch (e: ActivityNotFoundException) {
                 ErrorToaster.noKP2AFound(context)
             } catch (e: Exception) {

app/src/main/java/net/helcel/fidelity/activity/fragment/Scanner.kt

@@ -68,7 +68,7 @@ class Scanner : Fragment() {
             this.fmt = format
         }
         val isDone = this.code.isNotEmpty() && this.fmt.isNotEmpty()
-        requireActivity().runOnUiThread {
+        activity?.runOnUiThread {
             binding.btnScanDone.isEnabled = isDone
             binding.ScanActive.isEnabled = !isDone
         }

app/src/main/java/net/helcel/fidelity/pluginSDK/Kp2aControl.kt

@@ -7,8 +7,8 @@ import org.json.JSONObject
 object Kp2aControl {
 
     fun getAddEntryIntent(
-        fields: HashMap<String?, String?>,
+        fields: HashMap<String, String>,
-        protectedFields: ArrayList<String?>?
+        protectedFields: ArrayList<String>?
     ): Intent {
         val outputData = JSONObject((fields as Map<*, *>)).toString()
         val startKp2aIntent = Intent(Strings.ACTION_START_WITH_TASK)

app/src/main/java/net/helcel/fidelity/tools/KeepassWrapper.kt

@@ -21,10 +21,10 @@ object KeepassWrapper {
         code: String,
         format: String,
         protectCode: Boolean,
-    ): Pair<HashMap<String?, String?>, ArrayList<String?>> {
+    ): Pair<HashMap<String, String>, ArrayList<String>> {
 
-        val fields = HashMap<String?, String?>()
+        val fields = HashMap<String, String>()
-        val protected = ArrayList<String?>()
+        val protected = ArrayList<String>()
         fields[KeepassDef.TitleField] = title
         fields[KeepassDef.UrlField] =
             "androidapp://" + fragment.requireActivity().packageName

build.gradle

@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
+    id 'com.android.application' version '8.3.2' apply false
-    id 'com.android.library' version '8.3.1' apply false
+    id 'com.android.library' version '8.3.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
-    id 'com.autonomousapps.dependency-analysis' version '1.30.0' apply true
+    id 'com.autonomousapps.dependency-analysis' version '1.31.0' apply true
 }

metadata/en-US/permission_description.txt

@@ -0,0 +1 @@
+<ul><li><b>CAMERA:</b> necessary for importing barcodes from camera</li><li><b>READ_MEDIA_VISUAL_USER_SELECTED:</b> necessary for the importing barcode from images</li></ul>