Merge branch 'main' into main_android

TalaoDAO · May 31, 2024 · c0ef3d8 · c0ef3d8
2 parents 339c51f + c0fec39
commit c0ef3d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2,740 deletions.
diff --git a/lib/dashboard/home/tab_bar/credentials/models/credential/credential.dart b/lib/dashboard/home/tab_bar/credentials/models/credential/credential.dart
@@ -1,6 +1,7 @@
 import 'package:altme/app/app.dart';
 import 'package:altme/dashboard/dashboard.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:uuid/uuid.dart';
 
 part 'credential.g.dart';
 
@@ -50,7 +51,7 @@ class Credential {
       [Evidence.emptyEvidence()],
     );
   }
-
+  @JsonKey(fromJson: fromJsonId)
   final String id;
   @JsonKey(name: '@context')
   final List<dynamic>? context;
@@ -147,4 +148,12 @@ class Credential {
       return Credential.dummy();
     }
   }
+
+  static String fromJsonId(dynamic json) {
+    if (json == null || json == '') {
+      return const Uuid().v4();
+    } else {
+      return json.toString();
+    }
+  }
 }