Skip to content
This repository was archived by the owner on Jan 12, 2019. It is now read-only.

[Android] Fix some scan results not being reported correctly to JS #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Android] Fix some scan results not being reported correctly to JS #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8c6405
Fixed RESULT_CONFIRMATION_SUPPRESSED being reported as an error to JS…
Apr 26, 2017
d2cfc5f
Added error strings for missing scan results
Apr 26, 2017
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
8 changes: 6 additions & 2 deletions android/src/main/java/io/card/react/ReactCardIOModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
Log.i(TAG,"Activity Result" + requestCode + " result Code " + resultCode);
if (REQUEST_CARD_SCAN == requestCode) {
if (resultCode == CardIOActivity.RESULT_CARD_INFO) {
if (resultCode == CardIOActivity.RESULT_CARD_INFO || resultCode == CardIOActivity.RESULT_CONFIRMATION_SUPPRESSED) {
CreditCard scanResult = null;
if (intent.hasExtra(CardIOActivity.EXTRA_SCAN_RESULT)) {
scanResult = intent
Expand All @@ -90,7 +90,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
} else {
this.promise.reject("card was scanned but no result");
}
} else if (resultCode == Activity.RESULT_CANCELED) {
} else if (resultCode == CardIOActivity.RESULT_SCAN_NOT_AVAILABLE) {
this.promise.reject("card scan unavailable");
} else if (resultCode == CardIOActivity.RESULT_SCAN_SUPPRESSED) {
this.promise.reject("card scan suppressed");
} else if (resultCode == Activity.RESULT_CANCELED || resultCode == CardIOActivity.RESULT_ENTRY_CANCELED) {
this.promise.reject("card scan cancelled");
} else {
this.promise.reject(Integer.toString(resultCode));
Expand Down