Merge branch 'main' into feature/17-pub-dependencies

# Conflicts:
#	pubspec.lock

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## NEXT - 1.1.0(36)
+
+- Update AGP and Gradle version for latest Android Studio Ladybug (2024.2.1 Patch 1)
+- #35 | Android - opening only specific file types
+- #39 | When sharing document, set file name
+- #36 | Implement first version of Document validation
+
 ## 2024-07-16 - v1.0.4(35)
 
 - #32 | Cleanup

android/app/build.gradle

@@ -32,12 +32,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
@@ -49,7 +49,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 28
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         ndk {
@@ -59,7 +59,10 @@ android {
 
     signingConfigs {
         release {
-            storeFile file(System.getenv("AVM_KEYSTORE_FILE"))
+            def keystorePath = System.getenv("AVM_KEYSTORE_FILE")
+            if (keystorePath != null) {
+                storeFile file(keystorePath)
+            }
             storePassword System.getenv("AVM_KEYSTORE_PASSWORD")
             keyAlias System.getenv("AVM_KEY_ALIAS")
             keyPassword System.getenv("AVM_KEY_PASSWORD")
@@ -69,21 +72,21 @@ android {
     buildTypes {
         release {
             signingConfig signingConfigs.release
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+
+        debug {
+            // no signing config for debug builds
         }
     }
+    ndkVersion "25.1.8937393"
 }
 
 repositories {
     google()
     mavenCentral()
-    maven {
-        // Local distribution
-        url = uri("../../../eidmsdk_flutter/android/libs")
-    }
 }
 
 flutter {
     source '../..'
 }
-
-dependencies {}

android/app/proguard-rules.pro

@@ -0,0 +1,38 @@
+-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallException
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallManager
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallManagerFactory
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest$Builder
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallRequest
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallSessionState
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
+-dontwarn com.google.android.play.core.tasks.OnFailureListener
+-dontwarn com.google.android.play.core.tasks.OnSuccessListener
+-dontwarn com.google.android.play.core.tasks.Task
+-dontwarn com.google.api.client.http.GenericUrl
+-dontwarn com.google.api.client.http.HttpHeaders
+-dontwarn com.google.api.client.http.HttpRequest
+-dontwarn com.google.api.client.http.HttpRequestFactory
+-dontwarn com.google.api.client.http.HttpResponse
+-dontwarn com.google.api.client.http.HttpTransport
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
+-dontwarn com.google.api.client.http.javanet.NetHttpTransport
+-dontwarn javax.naming.Binding
+-dontwarn javax.naming.NamingEnumeration
+-dontwarn javax.naming.NamingException
+-dontwarn javax.naming.directory.Attribute
+-dontwarn javax.naming.directory.Attributes
+-dontwarn javax.naming.directory.DirContext
+-dontwarn javax.naming.directory.InitialDirContext
+-dontwarn javax.naming.directory.SearchControls
+-dontwarn javax.naming.directory.SearchResult
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.joda.time.Instant
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

android/settings.gradle

@@ -23,7 +23,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
+    id "com.android.application" version "8.3.2" apply false
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.3.15" apply false
     id "com.google.firebase.crashlytics" version "2.8.1" apply false

devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

lib/bloc/document_validation_cubit.dart

@@ -0,0 +1,53 @@
+import 'dart:async';
+
+import 'package:autogram_sign/autogram_sign.dart';
+import 'package:flutter_bloc/flutter_bloc.dart' show Cubit;
+import 'package:injectable/injectable.dart';
+import 'package:logging/logging.dart';
+
+import '../ui/fragment/document_validation_fragment.dart';
+import 'document_validation_state.dart';
+import 'preview_document_cubit.dart';
+
+export 'document_validation_state.dart';
+
+/// Cubit for the [DocumentValidationFragment] with [validateDocument] function.
+///
+/// See also:
+///  - [PreviewDocumentCubit]
+@injectable
+class DocumentValidationCubit extends Cubit<DocumentValidationState> {
+  static final _log = Logger((DocumentValidationCubit).toString());
+
+  final IAutogramService _service;
+
+  DocumentValidationCubit({
+    required IAutogramService service,
+  })  : _service = service,
+        super(const DocumentValidationInitialState());
+
+  Future<void> validateDocument(String documentId) async {
+    _log.info("Requesting to validate Document Id: '$documentId'.");
+    emit(const DocumentValidationLoadingState());
+
+    try {
+      final response = await _service.getDocumentValidation(documentId);
+
+      _log.info(
+          "Got Document validation: (signatureForm: ${response.signatureForm?.value}, signatures: ${response.signatures?.map((e) => e.validationResult.value)}).");
+
+      emit(DocumentValidationSuccessState(response));
+    } catch (error, stackTrace) {
+      if (error is ServiceException &&
+          error.errorCode == "DOCUMENT_NOT_SIGNED") {
+        _log.info("Cannot validate unsigned Document.");
+
+        emit(const DocumentValidationNotSignedState());
+      } else {
+        _log.severe("Error validating Document.", error, stackTrace);
+
+        emit(DocumentValidationErrorState(error));
+      }
+    }
+  }
+}

lib/bloc/document_validation_state.dart

@@ -0,0 +1,50 @@
+import 'package:autogram_sign/autogram_sign.dart'
+    show DocumentValidationResponseBody;
+import 'package:flutter/foundation.dart';
+
+import 'document_validation_cubit.dart';
+
+/// State for [DocumentValidationCubit].
+@immutable
+sealed class DocumentValidationState {
+  const DocumentValidationState();
+
+  @override
+  String toString() {
+    return "$runtimeType()";
+  }
+}
+
+class DocumentValidationInitialState extends DocumentValidationState {
+  const DocumentValidationInitialState();
+}
+
+class DocumentValidationLoadingState extends DocumentValidationState {
+  const DocumentValidationLoadingState();
+}
+
+class DocumentValidationErrorState extends DocumentValidationState {
+  final Object error;
+
+  const DocumentValidationErrorState(this.error);
+
+  @override
+  String toString() {
+    return "$runtimeType(error: $error)";
+  }
+}
+
+class DocumentValidationNotSignedState extends DocumentValidationState {
+  const DocumentValidationNotSignedState();
+}
+
+class DocumentValidationSuccessState extends DocumentValidationState {
+  final DocumentValidationResponseBody response;
+
+  const DocumentValidationSuccessState(this.response);
+
+  @override
+  String toString() {
+    return "$runtimeType(response: $response)";
+  }
+}

lib/bloc/present_signed_document_cubit.dart

@@ -11,6 +11,7 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 
 import '../app_service.dart';
+import '../data/document_signing_type.dart';
 import '../file_extensions.dart';
 import '../file_system_entity_extensions.dart';
 import '../ui/screens/present_signed_document_screen.dart';
@@ -34,8 +35,14 @@ class PresentSignedDocumentCubit extends Cubit<PresentSignedDocumentState> {
   PresentSignedDocumentCubit({
     required AppService appService,
     @factoryParam required this.signedDocument,
+    @factoryParam required DocumentSigningType signingType,
   })  : _appService = appService,
-        super(const PresentSignedDocumentInitialState());
+        super(
+          signingType == DocumentSigningType.local
+              ? const PresentSignedDocumentInitialState()
+              // Remote documents are not saved locally, so we go directly to success state
+              : const PresentSignedRemoteDocumentSuccessState(),
+        );
 
   /// Saves [signedDocument] into public directory.
   Future<void> saveDocument() async {
@@ -67,7 +74,7 @@ class PresentSignedDocumentCubit extends Cubit<PresentSignedDocumentState> {
   Future<File> getShareableFile() async {
     final state = this.state;
 
-    if (state is PresentSignedDocumentSuccessState) {
+    if (state is PresentSignedLocalDocumentSuccessState) {
       final file = state.file;
 
       if (await file.exists()) {
@@ -103,6 +110,7 @@ class PresentSignedDocumentCubit extends Cubit<PresentSignedDocumentState> {
   }
 
   /// Saves [signedDocument] content into given [file].
+  // TODO As extension function on SignDocumentResponseBody type
   Future<void> _saveDocumentIntoFile(File file) {
     return Future.microtask(() => base64Decode(signedDocument.content))
         .then((bytes) => file.writeAsBytes(bytes, flush: true));

lib/bloc/present_signed_document_state.dart

@@ -2,6 +2,8 @@ import 'dart:io' show File;
 
 import 'package:flutter/foundation.dart';
 
+import 'present_signed_document_cubit.dart';
+
 /// State for [PresentSignedDocumentCubit].
 @immutable
 sealed class PresentSignedDocumentState {
@@ -15,8 +17,8 @@ sealed class PresentSignedDocumentState {
     return PresentSignedDocumentErrorState(error);
   }
 
-  PresentSignedDocumentSuccessState toSuccess(File file) {
-    return PresentSignedDocumentSuccessState(file);
+  PresentSignedLocalDocumentSuccessState toSuccess(File file) {
+    return PresentSignedLocalDocumentSuccessState(file);
   }
 
   @override
@@ -44,13 +46,19 @@ class PresentSignedDocumentErrorState extends PresentSignedDocumentState {
   }
 }
 
-class PresentSignedDocumentSuccessState extends PresentSignedDocumentState {
+class PresentSignedLocalDocumentSuccessState
+    extends PresentSignedDocumentState {
   final File file;
 
-  const PresentSignedDocumentSuccessState(this.file);
+  const PresentSignedLocalDocumentSuccessState(this.file);
 
   @override
   String toString() {
     return "$runtimeType(file: $file)";
   }
 }
+
+class PresentSignedRemoteDocumentSuccessState
+    extends PresentSignedDocumentState {
+  const PresentSignedRemoteDocumentSuccessState();
+}

lib/bloc/preview_document_cubit.dart

@@ -31,7 +31,7 @@ class PreviewDocumentCubit extends Cubit<PreviewDocumentState> {
     emit(state.toLoading());
 
     try {
-      _log.info("Getting Document Visualisation for DocumentId: $documentId");
+      _log.info("Getting Document Visualisation for Document Id: $documentId");
 
       final visualization = await _service.getDocumentVisualization(documentId);