wip

kee-org · Jul 9, 2024 · 4be3bd6 · 4be3bd6
1 parent 690cb6d
commit 4be3bd6
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 86 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,3 @@
 {
-  "flutterSdkVersion": "3.16.5",
-  "flavors": {}
+  "flutterSdkVersion": "3.22.2"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -0,0 +1,4 @@
+{
+  "flutter": "3.22.2",
+  "flavors": {}
+}
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@
 .pub/
 /build/
 .gradle/
-.fvm/flutter_sdk
 integration_test/test_bundle.dart
 
 # Web related
@@ -57,3 +56,6 @@ ios/Flutter/KeeVault-generated.xcconfig
 ios/fastlane/report.xml
 ios/Runner.app.dSYM.zip
 ios/Runner.ipa
+
+# FVM Version Cache
+.fvm/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,69 +1,67 @@
 {
-    "dart.lineLength": 120,
-    "[dart]": {
-        "editor.rulers": [
-            80,
-            120
-        ],
-    },
-    "cSpell.words": [
-        "analyzer",
-        "analyzes",
-        "applocker",
-        "Autofilling",
-        "Autovalidate",
-        "Behavior",
-        "bloclistener",
-        "color",
-        "Colors",
-        "Compat",
-        "creds",
-        "Derivator",
-        "derivators",
-        "Dialog",
-        "FFTpassword",
-        "FFTtext",
-        "FFTusername",
-        "fluro",
-        "fromLTRB",
-        "kdbxstring",
-        "keepass",
-        "keevault",
-        "keevaultpendingautofillassociations",
-        "keyfile",
-        "keyvalue",
-        "oneplus",
-        "otpauth",
-        "Parcelable",
-        "pointycastle",
-        "quickunlock",
-        "Rect",
-        "reemit",
-        "reenter",
-        "Signup",
-        "sipi",
-        "textfield",
-        "treeview",
-        "unfocus",
-        "Unlocker",
-        "unprotect",
-        "yMMMMEEEEd",
-        "zxcvbn"
-    ],
-    "cSpell.ignorePaths": [
-        "**/generated/**",
-        "phonetic.dart",
-        ".git",                // Ignore the .git directory
-        "*.dll",               // Ignore all .dll files.
-        "**/*.dll"             // Ignore all .dll files
-    ],
-    "dart.flutterSdkPath": ".fvm/flutter_sdk",
-    // Remove .fvm files from search
-    "search.exclude": {
-        "**/.fvm": true
-    },
-    // Remove from file watching
-    "files.watcherExclude": {
-        "**/.fvm": true
-    }
+  "dart.lineLength": 120,
+  "[dart]": {
+    "editor.rulers": [
+      80,
+      120
+    ]
+  },
+  "cSpell.words": [
+    "analyzer",
+    "analyzes",
+    "applocker",
+    "Autofilling",
+    "Autovalidate",
+    "Behavior",
+    "bloclistener",
+    "color",
+    "Colors",
+    "Compat",
+    "creds",
+    "Derivator",
+    "derivators",
+    "Dialog",
+    "FFTpassword",
+    "FFTtext",
+    "FFTusername",
+    "fluro",
+    "fromLTRB",
+    "kdbxstring",
+    "keepass",
+    "keevault",
+    "keevaultpendingautofillassociations",
+    "keyfile",
+    "keyvalue",
+    "oneplus",
+    "otpauth",
+    "Parcelable",
+    "pointycastle",
+    "quickunlock",
+    "Rect",
+    "reemit",
+    "reenter",
+    "Signup",
+    "sipi",
+    "textfield",
+    "treeview",
+    "unfocus",
+    "Unlocker",
+    "unprotect",
+    "yMMMMEEEEd",
+    "zxcvbn"
+  ],
+  "cSpell.ignorePaths": [
+    "**/generated/**",
+    "phonetic.dart",
+    ".git",
+    "*.dll",
+    "**/*.dll"
+  ],
+  "dart.flutterSdkPath": ".fvm/versions/3.22.2",
+  "search.exclude": {
+    "**/.fvm": true
+  },
+  "files.watcherExclude": {
+    "**/.fvm": true
+  }
 }
diff --git a/lib/widgets/vault.dart b/lib/widgets/vault.dart
@@ -45,6 +45,7 @@ class _VaultWidgetState extends State<VaultWidget> with WidgetsBindingObserver {
     }
     final AutofillState autofillState = BlocProvider.of<AutofillCubit>(context).state;
     if (autofillState is AutofillModeActive) {
+      //TODO: Maybe proceed if AutofillSaved? Or clear that state after applifecyclestate resumes? Until then, ...................
       l.t('Skip refresh due to state: ${autofillState.runtimeType}');
       return;
     }

diff --git a/pubspec.lock b/pubspec.lock
@@ -481,10 +481,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -505,10 +505,10 @@ packages:
     dependency: "direct main"
     description:
       name: jiffy
-      sha256: cc1d4b75016a9156c29b5d61f0c9176c3e0fb0580cc5a0e0422b5d2cab3fbfff
+      sha256: "3497caaa36d36a29033e66803c9739ce6bccbc7e241ca46070f76ee9e6f6eb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.3.1"
   js:
     dependency: transitive
     description:
@@ -534,6 +534,30 @@ packages:
       url: "https://github.com/kee-org/kdbx.dart.git"
     source: git
     version: "0.6.0+4"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -579,18 +603,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   matomo_tracker:
     dependency: "direct main"
     description:
@@ -604,10 +628,10 @@ packages:
     dependency: "direct main"
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
   mime:
     dependency: "direct main"
     description:
@@ -660,10 +684,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -1027,10 +1051,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   timezone:
     dependency: transitive
     description:
@@ -1151,6 +1175,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.1"
   web:
     dependency: transitive
     description:
@@ -1208,5 +1240,5 @@ packages:
     source: hosted
     version: "1.0.0"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"