Merge pull request #48 from m1ga/master

feat(android): Use reason (+ subtitle and text) and cancelTitle
tidev · Apr 11, 2022 · a925024 · a925024
2 parents 58f7667 + c364aab
commit a925024
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 10 deletions.
diff --git a/android/src/ti/identity/FingerPrintHelper.java b/android/src/ti/identity/FingerPrintHelper.java
@@ -142,8 +142,10 @@ public void startListening(KrollFunction callback, KrollObject obj)
 			mSelfCancelled = false;
 
 			final BiometricPrompt.PromptInfo.Builder promptInfo = new BiometricPrompt.PromptInfo.Builder();
-			promptInfo.setTitle("Scan Fingerprint");
-			promptInfo.setNegativeButtonText("Cancel");
+			promptInfo.setTitle(TitaniumIdentityModule.reason);
+			promptInfo.setDescription(TitaniumIdentityModule.reasonText);
+			promptInfo.setSubtitle(TitaniumIdentityModule.reasonSubtitle);
+			promptInfo.setNegativeButtonText(TitaniumIdentityModule.negativeButtonText);
 
 			final Executor executor = Executors.newSingleThreadExecutor();
 			final BiometricPrompt prompt =

diff --git a/android/src/ti/identity/KeychainItemProxy.java b/android/src/ti/identity/KeychainItemProxy.java
@@ -153,8 +153,10 @@ public void onAuthenticationFailed()
 				};
 
 				final BiometricPrompt.PromptInfo.Builder promptInfo = new BiometricPrompt.PromptInfo.Builder();
-				promptInfo.setTitle("Scan Fingerprint");
-				promptInfo.setNegativeButtonText("Cancel");
+				promptInfo.setTitle(TitaniumIdentityModule.reason);
+				promptInfo.setSubtitle(TitaniumIdentityModule.reasonSubtitle);
+				promptInfo.setDescription(TitaniumIdentityModule.reasonText);
+				promptInfo.setNegativeButtonText(TitaniumIdentityModule.negativeButtonText);
 				biometricPromptInfo = promptInfo.build();
 			}
 

diff --git a/android/src/ti/identity/TitaniumIdentityModule.java b/android/src/ti/identity/TitaniumIdentityModule.java
@@ -25,6 +25,10 @@ public class TitaniumIdentityModule extends KrollModule
 	public static final int PERMISSION_CODE_FINGERPRINT = 99;
 
 	public static final String PROPERTY_AUTHENTICATION_POLICY = "authenticationPolicy";
+	public static final String PROPERTY_REASON = "reason";
+	public static final String PROPERTY_REASON_SUBTITLE = "reasonSubtitle";
+	public static final String PROPERTY_REASON_TEXT = "reasonText";
+	public static final String PROPERTY_CANCEL_TITLE = "cancelTitle";
 
 	@Kroll.constant
 	public static final int SUCCESS = 0;
@@ -87,6 +91,10 @@ public class TitaniumIdentityModule extends KrollModule
 	private Throwable fingerprintHelperException;
 
 	private static int authenticationPolicy = AUTHENTICATION_POLICY_BIOMETRICS;
+	public static String reason = "Biometric authentication";
+	public static String reasonSubtitle = "";
+	public static String reasonText = "";
+	public static String negativeButtonText = "Cancel";
 
 	public TitaniumIdentityModule()
 	{
@@ -138,6 +146,19 @@ public void authenticate(HashMap params)
 		if (params == null || mfingerprintHelper == null) {
 			return;
 		}
+		if (params.containsKey(PROPERTY_REASON)) {
+			reason = TiConvert.toString(params.get(PROPERTY_REASON), reason);
+		}
+		if (params.containsKey(PROPERTY_REASON_TEXT)) {
+			reasonText = TiConvert.toString(params.get(PROPERTY_REASON_TEXT), "");
+		}
+		if (params.containsKey(PROPERTY_REASON_SUBTITLE)) {
+			reasonSubtitle = TiConvert.toString(params.get(PROPERTY_REASON_SUBTITLE), "");
+		}
+		if (params.containsKey(PROPERTY_CANCEL_TITLE)) {
+			negativeButtonText = TiConvert.toString(params.get(PROPERTY_CANCEL_TITLE), negativeButtonText);
+		}
+
 		if (params.containsKey("callback")) {
 			Object callback = params.get("callback");
 			if (callback instanceof KrollFunction) {

diff --git a/apidoc/Identity.yml b/apidoc/Identity.yml
@@ -64,7 +64,6 @@ description: |
         authPhrase = 'Touch ID';
     }
     ```
-        
     ## Face ID Requirements (iOS only)
 
     For Face ID to work properly, you need to add a **`<key>`** item to the
@@ -550,11 +549,23 @@ properties:
   - name: reason
     optional: false
     summary: |
-        Note: This property is iOS only!
-
         Message displayed in the authentication dialog describing why the
-        application is requesting authentication.
+        application is requesting authentication. Android: The title of the dialog.
+    type: String
+
+  - name: reasonSubtitle
+    optional: true
+    summary: |
+        Subtitle of the authentication dialog (2nd line).
     type: String
+    platforms: [android]
+
+  - name: reasonText
+    optional: true
+    summary: |
+        Text of the authentication dialog (3rd line).
+    type: String
+    platforms: [android]
 
   - name: allowableReuseDuration
     summary: |
@@ -591,12 +602,12 @@ properties:
 
   - name: cancelTitle
     summary: |
-        Note: This property is iOS only!
-
         Allows cancel button title customization. A default localized title "Cancel"
         is used when this property is not defined or is set to empty string.
+        Android: The default value will be "Cancel".
     type: String
     since: "6.1.0"
+    platforms: [android, iphone, ipad]
     osver: {ios: {min: "10.0"}}
 
   - name: keepAlive