Merge branch 'main' into TALAO

TalaoDAO · Oct 6, 2023 · 244e154 · 244e154
2 parents a0aea14 + 5abb9e3
commit 244e154
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 10 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -111,6 +111,18 @@
 				<category android:name="android.intent.category.BROWSABLE" />
 				<data android:scheme="openid-credential-offer" />
 			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="openid-credential-offer-hedera" />
+			</intent-filter>
+            <intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="openid-hedera" />
+			</intent-filter>
         </activity><meta-data
             android:name="flutterEmbedding"
             android:value="2" />

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -66,6 +66,26 @@
 				<string>openid-credential-offer</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>openid-credential-offer-hedera</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>openid-credential-offer-hedera</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>openid-hedera</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>openid-hedera</string>
+			</array>
+		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>

diff --git a/lib/splash/bloclisteners/blocklisteners.dart b/lib/splash/bloclisteners/blocklisteners.dart
@@ -232,19 +232,17 @@ final qrCodeBlocListener = BlocListener<QRCodeScanCubit, QRCodeScanState>(
                   .startsWith(Parameters.authorizeEndPoint) ||
               state.uri.toString().startsWith(Parameters.oidc4vcUniversalLink);
 
-          OIDC4VCType? oidc4vcTypeForIssuance;
+          final OIDC4VCType? oidc4vcTypeForIssuance =
+              await getOIDC4VCTypeForIssuance(
+            url: state.uri.toString(),
+            client: DioClient('', Dio()),
+          );
 
           if (showPrompt) {
             if (isOpenIDUrl || isFromDeeplink) {
               /// OIDC4VCI Case
-              final OIDC4VCType? oidc4vcType = await getOIDC4VCTypeForIssuance(
-                url: state.uri.toString(),
-                client: DioClient('', Dio()),
-              );
-
-              oidc4vcTypeForIssuance = oidc4vcType;
 
-              if (oidc4vcType != null) {
+              if (oidc4vcTypeForIssuance != null) {
                 /// issuance case
                 if (!userConsentForIssuerAccess) showPrompt = false;
               } else {

diff --git a/pubspec.lock b/pubspec.lock
@@ -1485,10 +1485,10 @@ packages:
     dependency: transitive
     description:
       name: matrix_api_lite
-      sha256: e5304b33b16d60863533836717be808845bf94cd0e3a339ef146d9321e6b59b7
+      sha256: "62bdd1dffb956e956863ba21e52109157502342b749e4728f4105f0c6d73a254"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.1"
+    version: "1.7.2"
   memoize:
     dependency: transitive
     description: