Logging and autofill improvements

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.2",
+  "flutterSdkVersion": "3.13.9",
   "flavors": {}
 }

android/app/build.gradle

@@ -108,8 +108,8 @@ android {
     defaultConfig {
         applicationId "com.keevault.keevault"
         applicationIdSuffix idSuffix
-        minSdkVersion 26
-        targetSdkVersion 33
+        minSdkVersion 29
+        targetSdk 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         resValue "string", "app_name", "Kee Vault" + nameSuffix
@@ -148,5 +148,8 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'org.tinylog:tinylog-api:2.6.2'
+    implementation 'org.tinylog:tinylog-impl:2.6.2'
+    implementation 'org.tinylog:slf4j-tinylog:2.6.2'
     androidTestUtil "androidx.test:orchestrator:1.4.2"
 }

android/app/proguard-rules.pro

@@ -1 +1,9 @@
--keep class androidx.lifecycle.DefaultLifecycleObserver
+-keep class androidx.lifecycle.DefaultLifecycleObserver
+-keepnames interface org.tinylog.**
+-keepnames class * implements org.tinylog.**
+-keepclassmembers class * implements org.tinylog.** { <init>(...); }
+
+-dontwarn dalvik.system.VMStack
+-dontwarn java.lang.**
+-dontwarn javax.naming.**
+-dontwarn sun.reflect.Reflection

android/app/src/main/AndroidManifest.xml

@@ -60,6 +60,9 @@
         <meta-data
             android:name="com.keevault.flutter_autofill_service.match_header_drawable_name"
             android:value="ic_v_light_key_24dp" />
+        <meta-data
+            android:name="com.keevault.flutter_autofill_service.pinned_drawable_name"
+            android:value="ic_v_light_key_24dp" />
 
         <service
             android:name="com.keevault.flutter_autofill_service.FlutterAutofillService"

android/app/src/main/kotlin/com/keevault/keevault/AutofillActivity.kt

@@ -4,6 +4,13 @@ import android.content.Intent
 import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
+import android.os.Bundle
 
-class AutofillActivity: FlutterFragmentActivity() {
+class AutofillActivity(): FlutterFragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        System.setProperty("logs.folder", filesDir.absolutePath + "/logs");
+
+        super.onCreate(savedInstanceState)
+    }
+
 }

android/app/src/main/kotlin/com/keevault/keevault/MainActivity.kt

@@ -4,6 +4,13 @@ import android.content.Intent
 import androidx.annotation.NonNull
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
+import android.os.Bundle
 
 class MainActivity: FlutterFragmentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        System.setProperty("logs.folder", filesDir.absolutePath + "/logs");
+
+        super.onCreate(savedInstanceState)
+    }
+
 }

android/app/src/main/resources/META-INF/services/org.tinylog.provider.LoggingProvider

@@ -0,0 +1 @@
+com.keevault.flutter_autofill_service.DynamicLevelLoggingProvider

android/app/src/main/resources/tinylog.properties

@@ -0,0 +1,14 @@
+provider    = dynamic level
+level   = trace
+
+writer1          = logcat
+
+writer2       = rolling file
+writer2.file  = #{logs.folder}/autofill-{pid}-log-{count}.txt
+writer2.charset  = UTF-8
+writer2.backups  = 30
+writer2.buffered      = true  
+writer2.policies = startup, size: 1mb, dynamic
+writer2.format = {date: yyyy-MM-dd HH:mm:ss.SSS} [{thread-id}_{thread}] {class}.{method}():{line}\n{level}: {message}
+
+writingthread = true

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()

ios/KdbxSwift/Sources/KdbxSwift/DatabaseFileManager.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class DatabaseFileManager {
     public enum Error {
@@ -68,7 +68,7 @@ public class DatabaseFileManager {
                 Logger.mainLog.debug("Loaded main KDBX")
 
             } catch {
-                Logger.mainLog.error("Failed to read current KDBX file [message: \(error.localizedDescription, privacy: .public)]")
+                Logger.mainLog.error("Failed to read current KDBX file", metadata: ["public:message": "\(error.localizedDescription)"])
                 Logger.fatalError("couldn't read KDBX file")
             }
         }
@@ -107,7 +107,7 @@ public class DatabaseFileManager {
             let fileData = try targetDatabase.save()
             try fileData.write(to: kdbxAutofillURL, options: .atomic)
         } catch {
-            Logger.mainLog.error("Failed to write autofill KDBX file [message: \(error.localizedDescription, privacy: .public)]")
+            Logger.mainLog.error("Failed to write autofill KDBX file", metadata: ["public:message": "\(error.localizedDescription)"])
         }
     }
 }

ios/KdbxSwift/Sources/KdbxSwift/base32/Base32.swift

@@ -25,7 +25,7 @@
 //  THE SOFTWARE.
 
 import Foundation
-import os.log
+import Logging
 
 // https://tools.ietf.org/html/rfc4648
 

ios/KdbxSwift/Sources/KdbxSwift/crypto/CryptoManager.swift

@@ -1,6 +1,6 @@
 import Foundation
 import CommonCrypto.CommonHMAC
-import os.log
+import Logging
 
 public enum CryptoError: Error {
     case invalidKDFParam(kdfName: String, paramName: String)
@@ -37,7 +37,7 @@ public final class CryptoManager {
             return SecRandomCopyBytes(kSecRandomDefault, outBytes.count, &outBytes)
         }
         if status != errSecSuccess {
-            Logger.mainLog.warning("Failed to generate random bytes [count: \(count, privacy: .public), status: \(status, privacy: .public)]")
+            Logger.mainLog.warning("Failed to generate random bytes", metadata: ["public:count": "\(count)", "public:status": "\(status)"])
             throw CryptoError.rngError(code: Int(status))
         }
         return output

ios/KdbxSwift/Sources/KdbxSwift/db/Database.swift

@@ -1,5 +1,6 @@
 import Foundation
-import os.log
+import Logging
+
 
 public struct SearchQuery {
     public let includeSubgroups: Bool

ios/KdbxSwift/Sources/KdbxSwift/db/DatabaseItem.swift

@@ -1,4 +1,4 @@
-import os.log
+import Logging
 
 open class DatabaseItem {
     public enum TouchMode {

ios/KdbxSwift/Sources/KdbxSwift/db/Entry.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class EntryField: Eraseable {
     public static let title    = "Title"

ios/KdbxSwift/Sources/KdbxSwift/db/EntryFieldReference.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class EntryFieldReference {
     public enum Status {
@@ -226,7 +226,7 @@ public class EntryFieldReference {
                 _uuid = UUID(uuidString: String(value)) 
             }
             guard let uuid = _uuid else {
-                Logger.mainLog.debug("Malformed UUID: \(value)")
+                Logger.mainLog.debug("Malformed UUID", metadata: ["value": "\(value)"])
                 return nil
             }
             result = entries.first(where: { $0.uuid == uuid })

ios/KdbxSwift/Sources/KdbxSwift/db/Group.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class Group: DatabaseItem, Eraseable {
     public static let defaultIconID = IconID.folder

ios/KdbxSwift/Sources/KdbxSwift/db/KeyHelper.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class KeyHelper {
     public static let compositeKeyLength = 32

ios/KdbxSwift/Sources/KdbxSwift/db/cipher/DataCipher.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 protocol DataCipher: AnyObject {
     var uuid: UUID { get }

ios/KdbxSwift/Sources/KdbxSwift/db/cipher/DataCipherFactory.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 final class DataCipherFactory {
     public static let instance = DataCipherFactory()

ios/KdbxSwift/Sources/KdbxSwift/db/cipher/StreamCipherFactory.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 internal enum ProtectedStreamAlgorithm: UInt32 {
     case Null      = 0

ios/KdbxSwift/Sources/KdbxSwift/db/kdf/Argon2KDF.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 class AbstractArgon2KDF {
     public static let saltParam        = "S" 

ios/KdbxSwift/Sources/KdbxSwift/db/kdf/KDFParams.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 final class KDFParams: VarDict {
     public static let uuidParam = "$UUID"

ios/KdbxSwift/Sources/KdbxSwift/db/kp2/Attachment2.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class Attachment2: Attachment {
     public var id: Int
@@ -56,7 +56,7 @@ public class Attachment2: Attachment {
                     )
                 }
             default:
-                Logger.mainLog.error("Unexpected XML tag in Entry/Binary: \(tag.name)")
+                Logger.mainLog.error("Unexpected XML tag in Entry/Binary", metadata: ["name": "\(tag.name)"])
                 throw Xml2.ParsingError.unexpectedTag(actual: tag.name, expected: "Entry/Binary/*")
             }
         }

ios/KdbxSwift/Sources/KdbxSwift/db/kp2/Binary2.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class Binary2: Eraseable {
     public typealias ID = Int

ios/KdbxSwift/Sources/KdbxSwift/db/kp2/CustomData2.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class CustomData2: Eraseable {
 
@@ -71,7 +71,7 @@ public class CustomData2: Eraseable {
                 )
                 Logger.mainLog.trace("Item loaded OK")
             default:
-                Logger.mainLog.error("Unexpected XML tag in CustomData: \(tag.name)")
+                Logger.mainLog.error("Unexpected XML tag in CustomData", metadata: ["name": "\(tag.name)"])
                 throw Xml2.ParsingError.unexpectedTag(
                     actual: tag.name,
                     expected: xmlParentName + "/CustomData/*")
@@ -98,20 +98,20 @@ public class CustomData2: Eraseable {
             case Xml2.lastModificationTime:
                 optionalTimestamp = timeParser.xmlStringToDate(tag.value)
             default:
-                Logger.mainLog.error("Unexpected XML tag in CustomData/Item: \(tag.name)")
+                Logger.mainLog.error("Unexpected XML tag in CustomData/Item", metadata: ["name": "\(tag.name)"])
                 throw Xml2.ParsingError.unexpectedTag(
                     actual: tag.name,
                     expected: xmlParentName + "/CustomData/Item/*")
             }
         }
         guard let _key = key else {
-            Logger.mainLog.error("Missing \(xmlParentName)/CustomData/Item/Key")
+            Logger.mainLog.error("Missing parent/CustomData/Item/Key", metadata: ["parent": "\(xmlParentName)"])
             throw Xml2.ParsingError.malformedValue(
                 tag: xmlParentName + "/CustomData/Item/Key",
                 value: nil)
         }
         guard let _value = value else {
-            Logger.mainLog.error("Missing \(xmlParentName)/CustomData/Item/Value")
+            Logger.mainLog.error("Missing parent/CustomData/Item/Value", metadata: ["parent": "\(xmlParentName)"])
             throw Xml2.ParsingError.malformedValue(
                 tag: xmlParentName + "/CustomData/Item/Value",
                 value: nil)

ios/KdbxSwift/Sources/KdbxSwift/db/kp2/CustomIcon2.swift

@@ -1,5 +1,5 @@
 import Foundation
-import os.log
+import Logging
 
 public class CustomIcon2: Eraseable {
     public private(set) var uuid: UUID
@@ -73,7 +73,7 @@ public class CustomIcon2: Eraseable {
             case Xml2.lastModificationTime:
                 xmlLastModificationTime = timeParser.xmlStringToDate(tag.value)
             default:
-                Logger.mainLog.error("Unexpected XML tag in CustomIcon: \(tag.name)")
+                Logger.mainLog.error("Unexpected XML tag in CustomIcon", metadata: ["name": "\(tag.name)"])
                 throw Xml2.ParsingError.unexpectedTag(actual: tag.name, expected: "CustomIcon/*")
             }
         }