Ebsi nft

lib/app/shared/constants/altme_strings.dart

@@ -37,6 +37,6 @@ class AltMeStrings {
   //Don't send address
   static const List<String> contractDontSendAddress = [
     'KT1VuCBGQW4WakHj1PXhFC1G848dKyNy34kB',
-    'KT1Wv4dPiswWYj2H9UrSrVNmcMd9w5NtzczG'
+    'KT1Wv4dPiswWYj2H9UrSrVNmcMd9w5NtzczG',
   ];
 }

lib/app/shared/dio_client/dio_client.dart

@@ -5,8 +5,8 @@ import 'package:dio/dio.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 part 'logging.dart';
 
-const _defaultConnectTimeout = Duration.millisecondsPerMinute;
-const _defaultReceiveTimeout = Duration.millisecondsPerMinute;
+const _defaultConnectTimeout = Duration(minutes: 1);
+const _defaultReceiveTimeout = Duration(minutes: 1);
 
 class DioClient {
   DioClient(this.baseUrl, this.dio) {
@@ -68,7 +68,7 @@ class DioClient {
         ResponseString.RESPONSE_STRING_UNABLE_TO_PROCESS_THE_DATA,
       );
     } catch (e) {
-      if (e is DioError) {
+      if (e is DioException) {
         throw NetworkException.getDioException(error: e);
       } else {
         rethrow;
@@ -135,7 +135,7 @@ class DioClient {
         ResponseString.RESPONSE_STRING_UNABLE_TO_PROCESS_THE_DATA,
       );
     } catch (e) {
-      if (e is DioError) {
+      if (e is DioException) {
         throw NetworkException.getDioException(error: e);
       } else {
         rethrow;

lib/app/shared/dio_client/logging.dart

@@ -21,7 +21,7 @@ class Logging extends Interceptor {
   }
 
   @override
-  void onError(DioError err, ErrorInterceptorHandler handler) {
+  void onError(DioException err, ErrorInterceptorHandler handler) {
     log.e(
       'ERROR[${err.response?.statusCode}] TYPE[${err.type}],=> PATH:'
       ' ${err.requestOptions.path} data: ${err.response?.data}',

lib/app/shared/message_handler/network_exception.dart

@@ -10,7 +10,7 @@ class NetworkException with MessageHandler {
   final NetworkError message;
   final dynamic data;
 
-  static NetworkException handleResponse(int? statusCode, DioError? error) {
+  static NetworkException handleResponse(int? statusCode, DioException? error) {
     switch (statusCode) {
       // case 200: //No Error
       // case 201: //No Error
@@ -87,43 +87,48 @@ class NetworkException with MessageHandler {
   }) {
     if (error is Exception) {
       NetworkException networkException;
-      if (error is DioError) {
+      if (error is DioException) {
         switch (error.type) {
-          case DioErrorType.cancel:
+          case DioExceptionType.cancel:
             networkException = NetworkException(
               message: NetworkError.NETWORK_ERROR_REQUEST_CANCELLED,
               data: error.response?.data,
             );
-
-          case DioErrorType.connectTimeout:
+          case DioExceptionType.connectionTimeout:
             networkException = NetworkException(
               message: NetworkError.NETWORK_ERROR_REQUEST_TIMEOUT,
               data: error.response?.data,
             );
-
-          case DioErrorType.other:
+          case DioExceptionType.unknown:
             networkException = NetworkException(
               message: NetworkError.NETWORK_ERROR_NO_INTERNET_CONNECTION,
               data: error.response?.data,
             );
-
-          case DioErrorType.receiveTimeout:
+          case DioExceptionType.receiveTimeout:
             networkException = NetworkException(
               message: NetworkError.NETWORK_ERROR_SEND_TIMEOUT,
               data: error.response?.data,
             );
-
-          case DioErrorType.response:
+          case DioExceptionType.badResponse:
             networkException = handleResponse(
               error.response?.statusCode,
               error,
             );
-
-          case DioErrorType.sendTimeout:
+          case DioExceptionType.sendTimeout:
             networkException = NetworkException(
               message: NetworkError.NETWORK_ERROR_SEND_TIMEOUT,
               data: error.response?.data,
             );
+          case DioExceptionType.badCertificate:
+            networkException = NetworkException(
+              message: NetworkError.NETWORK_ERROR_UNEXPECTED_ERROR,
+              data: error.response?.data,
+            );
+          case DioExceptionType.connectionError:
+            networkException = NetworkException(
+              message: NetworkError.NETWORK_ERROR_UNEXPECTED_ERROR,
+              data: error.response?.data,
+            );
         }
       } else if (error is SocketException) {
         networkException = NetworkException(

lib/app/shared/widget/base/page.dart

@@ -89,7 +89,6 @@ class _BasePageState extends State<BasePage> with WidgetsBindingObserver {
       case AppLifecycleState.hidden:
       case AppLifecycleState.detached:
         break;
-      // TODO(all): Handle this case.
     }
   }
 

lib/chat_room/matrix_chat/matrix_chat_impl.dart

@@ -167,6 +167,14 @@ class MatrixChatImpl extends MatrixChatInterface {
   @override
   Message mapEventToMessage(Event event) {
     late final Message message;
+    num size = 0;
+    if (event.content['info'] != null) {
+      final info = event.content['info']! as Map;
+      if (info['size'] != null) {
+        size = info['size'] as num;
+      }
+    }
+
     if (event.messageType == 'm.text') {
       message = TextMessage(
         id: event.unsigned?['transaction_id'] as String? ?? const Uuid().v4(),
@@ -183,7 +191,7 @@ class MatrixChatImpl extends MatrixChatInterface {
         id: const Uuid().v4(),
         remoteId: event.eventId,
         name: event.plaintextBody,
-        size: event.content['info']['size'] as num? ?? 0,
+        size: size,
         uri: getUrlFromUri(uri: event.content['url'] as String? ?? ''),
         status: mapEventStatusToMessageStatus(event.status),
         createdAt: event.originServerTs.millisecondsSinceEpoch,
@@ -196,7 +204,7 @@ class MatrixChatImpl extends MatrixChatInterface {
         id: const Uuid().v4(),
         remoteId: event.eventId,
         name: event.plaintextBody,
-        size: event.content['info']['size'] as num? ?? 0,
+        size: size,
         uri: getUrlFromUri(uri: event.content['url'] as String? ?? ''),
         status: mapEventStatusToMessageStatus(event.status),
         createdAt: event.originServerTs.millisecondsSinceEpoch,
@@ -205,14 +213,25 @@ class MatrixChatImpl extends MatrixChatInterface {
         ),
       );
     } else if (event.messageType == 'm.audio') {
+      var duration = 0;
+      var size = 0;
+      if (event.content['info'] != null) {
+        final info = event.content['info']! as Map;
+        if (info['duration'] != null) {
+          duration = info['duration'] as int;
+        }
+        if (info['size'] != null) {
+          size = info['size'] as int;
+        }
+      }
       message = AudioMessage(
         id: const Uuid().v4(),
         remoteId: event.eventId,
         duration: Duration(
-          milliseconds: event.content['info']['duration'] as int? ?? 0,
+          milliseconds: duration,
         ),
         name: event.plaintextBody,
-        size: event.content['info']['size'] as num? ?? 0,
+        size: size,
         uri: getUrlFromUri(uri: event.content['url'] as String? ?? ''),
         status: mapEventStatusToMessageStatus(event.status),
         createdAt: event.originServerTs.millisecondsSinceEpoch,

lib/dashboard/home/tab_bar/credentials/present/pick/credential_manifest/cubit/credential_manifest_pick_cubit.dart

@@ -51,7 +51,7 @@ class CredentialManifestPickCubit extends Cubit<CredentialManifestPickState> {
             id: '${currentFirst.id},${descriptorsWithSameGroup.map((e) => e.id).join(",")}', // ignore: lines_longer_than_80_chars
             name: [
               currentFirst.name,
-              ...descriptorsWithSameGroup.map((e) => e.name)
+              ...descriptorsWithSameGroup.map((e) => e.name),
             ].where((e) => e != null).join(','),
             constraints: Constraints([
               ...?currentFirst.constraints?.fields,
@@ -61,7 +61,7 @@ class CredentialManifestPickCubit extends Cubit<CredentialManifestPickState> {
             group: currentFirst.group,
             purpose: [
               currentFirst.purpose,
-              ...descriptorsWithSameGroup.map((e) => e.purpose)
+              ...descriptorsWithSameGroup.map((e) => e.purpose),
             ].where((e) => e != null).join(','),
           );
           newInputDescriptor.add(mergedDescriptor);
@@ -108,7 +108,7 @@ class CredentialManifestPickCubit extends Cubit<CredentialManifestPickState> {
       /// selecting the credential
       selected = [
         ...state.selected,
-        ...[index]
+        ...[index],
       ];
     }
 

lib/dashboard/home/tab_bar/credentials/widgets/credential_widget/proof_of_twitter_stats_widget.dart

@@ -12,9 +12,6 @@ class ProofOfTwitterStatsWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // final proofOfTwitterStatsModel = credentialModel
-    //     .credentialPreview.credentialSubjectModel as ProofOfTwitterStatsModel;
-
     return CredentialBaseWidget(
       cardBackgroundImagePath: ImageStrings.twitterStatsCard,
       issuerName: credentialModel

lib/dashboard/src/view/dashboard_page.dart

@@ -251,7 +251,7 @@ class _DashboardViewState extends State<DashboardView> {
                                   isSelected: state.selectedIndex == 3,
                                 );
                               },
-                            )
+                            ),
                           ],
                         ),
                       ),

packages/credential_manifest/pubspec.yaml

@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.16.0 <3.0.0"
 
 dependencies:
-  dio: ^4.0.0 #tezart from git depends on dio ^4.0.0
+  dio: ^5.3.2
   flutter:
     sdk: flutter
   json_annotation: ^4.8.1

packages/key_generator/pubspec.yaml

@@ -17,7 +17,7 @@ dependencies:
   tezart:
     git:
       url: https://github.com/autonomy-system/tezart.git
-      ref: 0cd68a902c8d2554227738594c62046571e57b4c
+      ref: e53e4ab9eaabea53cbf70e814efd2245b4659f48
 
 dependency_overrides:
   pinenacl: ^0.5.1 # tezart from git depends on pinenacl ^0.3.3

packages/oidc4vc/pubspec.yaml

@@ -14,19 +14,19 @@ dependencies:
   dart_bip32_bip44: ^0.2.0
   dart_jsonwebtoken: ^2.8.0
   dart_web3: ^0.0.3
-  dio: ^4.0.0 #tezart from git depends on dio ^4.0.0
+  dio: ^5.3.2
   fast_base58: ^0.2.1
   flutter:
     sdk: flutter
   hex: ^0.2.0
-  http_mock_adapter: ^0.3.3 #http_mock_adapter 0.4.4 depends on dio ^5.0.0
+  http_mock_adapter: ^0.6.0
   jose: ^0.3.3
   json_path: ^0.4.4 #latest version creates test issue
   secp256k1: ^0.3.0
   tezart:
     git:
       url: https://github.com/autonomy-system/tezart.git
-      ref: 0cd68a902c8d2554227738594c62046571e57b4c
+      ref: e53e4ab9eaabea53cbf70e814efd2245b4659f48
   uuid: ^3.0.7
 
 dependency_overrides:

packages/oidc4vc/test/src/oidc4vc_test.dart

@@ -566,7 +566,7 @@
 //             tokenUrl,
 //             (request) => request.throws(
 //               401,
-//               DioError(requestOptions: RequestOptions(path: tokenUrl)),
+//               DioException(requestOptions: RequestOptions(path: tokenUrl)),
 //             ),
 //           );
 //           final oidc4vc = OIDC4VC(client);
@@ -656,7 +656,7 @@
 //               url,
 //               (request) => request.throws(
 //                 401,
-//                 DioError(requestOptions: RequestOptions(path: tokenUrl)),
+//                 DioException(requestOptions: RequestOptions(path: tokenUrl)),
 //               ),
 //             );
 //             final oidc4vc = OIDC4VC(client);