Skip to content

Use proper event handling for activity result on Android #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Use proper event handling for activity result on Android #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/fingerprint-auth.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as app from "tns-core-modules/application";
import * as utils from "tns-core-modules/utils/utils";
import { AndroidActivityResultEventData } from "tns-core-modules/application";
import {
BiometricIDAvailableResult, ERROR_CODES,
FingerprintAuthApi,
Expand Down Expand Up @@ -142,9 +143,10 @@ export class FingerprintAuth implements FingerprintAuthApi {
this.verifyWithCustomAndroidUI(resolve, reject, callback);

} else {
this.getActivity().onActivityResult = (requestCode, resultCode, data) => {
if (requestCode === REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
if (resultCode === android.app.Activity.RESULT_OK) { // OK = -1

const onActivityResult = (data: AndroidActivityResultEventData) => {
if (data.requestCode === REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
if (data.resultCode === android.app.Activity.RESULT_OK) { // OK = -1
// the user has just authenticated via the ConfirmDeviceCredential activity
resolve();
} else {
Expand All @@ -155,8 +157,11 @@ export class FingerprintAuth implements FingerprintAuthApi {
});
}
}
app.android.off(app.AndroidApplication.activityResultEvent, onActivityResult);
};

app.android.on(app.AndroidApplication.activityResultEvent, onActivityResult);

if (!this.keyguardManager) {
reject({
code: ERROR_CODES.NOT_AVAILABLE,
Expand Down