From 47e8250ad96aa9d229ad2c8c8afb64ff8bd75914 Mon Sep 17 00:00:00 2001 From: Frederico Hansel dos Santos Gassen Date: Thu, 6 Aug 2020 17:51:19 -0300 Subject: [PATCH] update: PassiveFaceLiveness v0.4.1 --- android/build.gradle | 2 +- .../PassiveFaceLivenessPlugin.java | 22 +++++++++++++------ .../SwiftPassiveFaceLivenessPlugin.swift | 4 ++-- ....podspec => passive_face_liveness.podspec} | 2 +- lib/src/passive_face_liveness.dart | 4 ++++ lib/src/sdk_result.dart | 4 ++++ 6 files changed, 27 insertions(+), 11 deletions(-) rename ios/{passiveface_liveness.podspec => passive_face_liveness.podspec} (95%) diff --git a/android/build.gradle b/android/build.gradle index 15aee4e6..6f5362a5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - implementation 'com.combateafraude.sdk:passive-face-liveness:3.2.3' + implementation 'com.combateafraude.sdk:passive-face-liveness:3.3.4' } } diff --git a/android/src/main/java/com/combateafraude/passive_face_liveness/PassiveFaceLivenessPlugin.java b/android/src/main/java/com/combateafraude/passive_face_liveness/PassiveFaceLivenessPlugin.java index a613c623..3c5f09f9 100644 --- a/android/src/main/java/com/combateafraude/passive_face_liveness/PassiveFaceLivenessPlugin.java +++ b/android/src/main/java/com/combateafraude/passive_face_liveness/PassiveFaceLivenessPlugin.java @@ -11,6 +11,7 @@ import com.combateafraude.helpers.sdk.failure.LibraryReason; import com.combateafraude.helpers.sdk.failure.NetworkReason; import com.combateafraude.helpers.sdk.failure.PermissionReason; +import com.combateafraude.helpers.sdk.failure.AvailabilityReason; import com.combateafraude.helpers.sdk.failure.ServerReason; import com.combateafraude.helpers.sdk.failure.StorageReason; import com.combateafraude.passivefaceliveness.PassiveFaceLiveness; @@ -187,15 +188,19 @@ private void getDocuments(MethodCall call, final Result result) { if (idStyle == 0) throw new IllegalArgumentException("Invalid Style name"); } - PassiveFaceLiveness mPassiveFaceLiveness = new PassiveFaceLiveness.Builder(mobileToken) - .setLayout(idLayout, idGreenMask, idWhiteMask, idRedMask) - .enableSound(enableSound) - .setStyle(idStyle) - .setRequestTimeout(requestTimeout) - .build(); + PassiveFaceLiveness.Builder mPassiveFaceLivenessBuilder = new PassiveFaceLiveness.Builder(mobileToken) + .setLayout(idLayout, idGreenMask, idWhiteMask, idRedMask); + + if (enableSound != null){ + mPassiveFaceLivenessBuilder.enableSound(enableSound); + } + + if (idStyle != null){ + mPassiveFaceLivenessBuilder.setStyle(idStyle); + } Intent mIntent = new Intent(context, PassiveFaceLivenessActivity.class); - mIntent.putExtra(PassiveFaceLiveness.PARAMETER_NAME, (Serializable) mPassiveFaceLiveness); + mIntent.putExtra(PassiveFaceLiveness.PARAMETER_NAME, (Serializable) mPassiveFaceLivenessBuilder.build()); activity.startActivityForResult(mIntent, REQUEST_CODE_PASSIVEFACE_LIVENESS); } @@ -238,6 +243,9 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent data) { } else if (mPassiveFaceLivenessResult.getSdkFailure() instanceof LibraryReason) { response.put("errorType", "LibraryReason"); response.put("errorMessage", mPassiveFaceLivenessResult.getSdkFailure().getMessage()); + } else if (mPassiveFaceLivenessResult.getSdkFailure() instanceof AvailabilityReason) { + response.put("errorType", "AvailabilityReason"); + response.put("errorMessage", mPassiveFaceLivenessResult.getSdkFailure().getMessage()); } else { response.put("errorType", "SDKFailure"); response.put("errorMessage", mPassiveFaceLivenessResult.getSdkFailure().getMessage()); diff --git a/ios/Classes/SwiftPassiveFaceLivenessPlugin.swift b/ios/Classes/SwiftPassiveFaceLivenessPlugin.swift index cb82b61b..42a7da5a 100644 --- a/ios/Classes/SwiftPassiveFaceLivenessPlugin.swift +++ b/ios/Classes/SwiftPassiveFaceLivenessPlugin.swift @@ -117,8 +117,8 @@ public class SwiftPassiveFaceLivenessPlugin: NSObject, FlutterPlugin, PassiveFac } let passiveFacelivenessConfiguration = PassiveFaceLivenessBuilder(apiToken: mobileToken) - .setRequestTimeout(seconds: TimeInterval(requestTimeout)) - .setHasSound(hasSound: enableSound) + .setNetworkSettings(requestTimeout: TimeInterval(requestTimeout)) + .enableSound(enableSound: enableSound) .showStepLabel(show: showStepLabel) .showStatusLabel(show: showStatusLabel) .setColorTheme(color: colorTheme) diff --git a/ios/passiveface_liveness.podspec b/ios/passive_face_liveness.podspec similarity index 95% rename from ios/passiveface_liveness.podspec rename to ios/passive_face_liveness.podspec index 41f234a3..65ecef54 100644 --- a/ios/passiveface_liveness.podspec +++ b/ios/passive_face_liveness.podspec @@ -15,7 +15,7 @@ Flutter plugin for PassiveFaceLiveness s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'PassiveFaceLiveness', '1.3.1' + s.dependency 'PassiveFaceLiveness', '1.4.0' s.platform = :ios, '11.0' # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported. diff --git a/lib/src/passive_face_liveness.dart b/lib/src/passive_face_liveness.dart index 101bdf01..5e662364 100644 --- a/lib/src/passive_face_liveness.dart +++ b/lib/src/passive_face_liveness.dart @@ -95,6 +95,10 @@ class PassiveFaceLiveness { return PassiveFaceLivenessResult( sdkFailure: LibraryReason(response['errorMessage'])); break; + case 'AvailabilityReason': + return PassiveFaceLivenessResult( + sdkFailure: AvailabilityReason(response['errorMessage'])); + break; default: return PassiveFaceLivenessResult( sdkFailure: (SDKFailure(response['errorMessage']))); diff --git a/lib/src/sdk_result.dart b/lib/src/sdk_result.dart index c175e516..ebc41aa2 100644 --- a/lib/src/sdk_result.dart +++ b/lib/src/sdk_result.dart @@ -51,3 +51,7 @@ class StorageReason extends SDKFailure { class LibraryReason extends SDKFailure { LibraryReason(String libraryMessage) : super(libraryMessage); } + +class AvailabilityReason extends SDKFailure { + AvailabilityReason(String availabilityMessage) : super(availabilityMessage); +} \ No newline at end of file