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

[Android] Upgrade to latest versions of react native and card.io Android SDK #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Android] Upgrade to latest versions of react native and card.io Android SDK #7

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.facebook.react:react-native:0.16.+'
compile 'io.card:android-sdk:5.3.4'
compile 'com.facebook.react:react-native:+'
compile 'io.card:android-sdk:5.5.1'
}
28 changes: 15 additions & 13 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
@@ -1,15 +1,17 @@
package io.card.react;

import android.view.Gravity;

import com.facebook.common.logging.FLog;
import com.facebook.react.bridge.*;

import android.util.Log;
import android.app.Activity;
import android.content.Intent;
import android.util.Log;

import com.facebook.react.bridge.ActivityEventListener;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

Expand Down Expand Up @@ -70,14 +72,9 @@ public void scan(ReadableMap options, Promise promise) {
getReactApplicationContext().startActivityForResult(scanIntent, REQUEST_CARD_SCAN, null);
}

@Override
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent intent) {
Log.i(TAG, "Activity "+activity+" Result " + requestCode + " result Code " + resultCode);
onActivityResult(requestCode, resultCode, intent);
}

@Override
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) {
CreditCard scanResult = null;
Expand All @@ -98,6 +95,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
}
}

@Override
public void onNewIntent(Intent intent)
{

}

private JSONObject toJSONObject(CreditCard card) {
JSONObject scanCard = new JSONObject();
Expand Down