From 4de65fcddbff4dde6899039aa2ad5f34f814bfa1 Mon Sep 17 00:00:00 2001
From: Tim Matthews <tim@3sidedcube.com>
Date: Wed, 26 Apr 2017 13:46:52 +0100
Subject: [PATCH] Upgrade to latest versions of react native and card.io
 Android SDK

---
 android/build.gradle                          |  4 +--
 .../java/io/card/react/ReactCardIOModule.java | 28 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c3c7187..6ec8ff4 100755
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -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'
 }
diff --git a/android/src/main/java/io/card/react/ReactCardIOModule.java b/android/src/main/java/io/card/react/ReactCardIOModule.java
index 82e511a..b3c08bc 100644
--- a/android/src/main/java/io/card/react/ReactCardIOModule.java
+++ b/android/src/main/java/io/card/react/ReactCardIOModule.java
@@ -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;
 
@@ -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;
@@ -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();