17 Commits

Author SHA1 Message Date
340789989c Update plugin com.android.application to v8.4.0 2024-05-04 00:04:58 +00:00
2428f4e50b Update dependency com.google.android.material:material to v1.12.0 2024-05-03 00:02:26 +00:00
f4c9eddd22 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
2024-04-21 02:36:39 +02:00
6a5e971619 Update dependency androidx.camera:camera-view to v1.3.3 2024-04-21 00:04:40 +00:00
5829f18908 Update dependency androidx.camera:camera-lifecycle to v1.3.3 2024-04-20 00:04:38 +00:00
426d94ba81 Update dependency androidx.camera:camera-camera2 to v1.3.3 2024-04-17 19:25:16 +00:00
a58d208d49 Merge pull request 'Update plugin com.android.application to v8.3.2' (#7) from renovate/com.android.application-8.x into main
Reviewed-on: #7
2024-04-13 01:08:03 +02:00
069edaf6a2 Update plugin com.android.application to v8.3.2 2024-04-12 23:07:08 +00:00
d0aa2fbeb9 Merge pull request 'Update plugin com.android.library to v8.3.2' (#8) from renovate/com.android.library-8.x into main
Reviewed-on: #8
2024-04-13 01:05:24 +02:00
17c75f27bc Merge pull request 'Update gradle/wrapper-validation-action action to v3' (#9) from renovate/gradle-wrapper-validation-action-3.x into main
Reviewed-on: #9
2024-04-13 01:05:09 +02:00
1738664f83 Update gradle/wrapper-validation-action action to v3 2024-04-12 23:02:34 +00:00
a5b55fe214 Update plugin com.android.library to v8.3.2 2024-04-11 00:01:50 +00:00
0cd90413d1 Update app/src/main/AndroidManifest.xml 2024-04-06 19:26:33 +02:00
653ee1ccc1 Fix camera crash & autosave 2024-04-06 19:24:59 +02:00
9b6a69e227 Update plugin com.autonomousapps.dependency-analysis to v1.31.0 2024-04-05 00:02:16 +00:00
e40305b680 Updated icon and permissions 2024-03-29 15:49:10 +01:00
668e9d653f Scaled icon down 2024-03-29 13:47:22 +01:00
11 changed files with 25 additions and 17 deletions

View File

@ -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 keystore.asc > app/keystore.properties
gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks 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 - name: create and checkout branch
if: github.event_name == 'pull_request' if: github.event_name == 'pull_request'

View File

@ -47,7 +47,8 @@
## ⚙️ Permissions ## ⚙️ 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 ## 📝 Contribute

View File

@ -34,6 +34,7 @@ android {
buildTypes { buildTypes {
debug { debug {
debuggable true debuggable true
signingConfig = signingConfigs.getByName("release")
} }
release { release {
minifyEnabled true minifyEnabled true
@ -73,11 +74,11 @@ android {
dependencies { dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4' 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.code.gson:gson:2.10.1'
implementation 'com.google.android.material:material:1.11.0' implementation 'com.google.android.material:material:1.12.0'
implementation 'com.google.zxing:core:3.5.3' implementation 'com.google.zxing:core:3.5.3'
} }

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" 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" /> <uses-feature android:name="android.hardware.camera" />

View File

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

View File

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

View File

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

View File

@ -21,10 +21,10 @@ object KeepassWrapper {
code: String, code: String,
format: String, format: String,
protectCode: Boolean, 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.TitleField] = title
fields[KeepassDef.UrlField] = fields[KeepassDef.UrlField] =
"androidapp://" + fragment.requireActivity().packageName "androidapp://" + fragment.requireActivity().packageName

View File

@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '8.3.1' apply false id 'com.android.application' version '8.4.0' 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 '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
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -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>