From e8c981464839d3e238cf7c0518be0550a47432f3 Mon Sep 17 00:00:00 2001
From: Angel Anton <hello@monday8am.com>
Date: Wed, 7 Nov 2018 13:58:54 +0100
Subject: [PATCH 1/2] Move setTimeOut from connect to constructor.

---
 android/build.sbt                              | 2 +-
 android/src/main/java/nordpol/AndroidCard.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.sbt b/android/build.sbt
index e598ecd..cd2a2af 100644
--- a/android/build.sbt
+++ b/android/build.sbt
@@ -2,7 +2,7 @@ import android.Keys._
 
 android.Plugin.androidBuildAar
 
-platformTarget in Android := "android-23"
+platformTarget in Android := "android-27"
 
 name := "nordpol-android"
 
diff --git a/android/src/main/java/nordpol/AndroidCard.java b/android/src/main/java/nordpol/AndroidCard.java
index 7021038..435a76b 100644
--- a/android/src/main/java/nordpol/AndroidCard.java
+++ b/android/src/main/java/nordpol/AndroidCard.java
@@ -20,6 +20,7 @@ public class AndroidCard implements IsoCard {
 
     private AndroidCard(IsoDep card) {
         this.card = card;
+        card.setTimeout(DEFAULT_TIMEOUT);
     }
 
     public static AndroidCard get(Tag tag) throws IOException {
@@ -60,7 +61,6 @@ public boolean isConnected() {
     public void connect() throws IOException {
         try {
             card.connect();
-            card.setTimeout(DEFAULT_TIMEOUT);
         } catch(IOException e) {
             notifyListeners(e);
             throw e;

From 58044e9e54de57fdfa3984b1b488616a2ffbd369 Mon Sep 17 00:00:00 2001
From: Angel Anton <hello@monday8am.com>
Date: Wed, 7 Nov 2018 14:16:58 +0100
Subject: [PATCH 2/2] Updated android sdk up to 27.

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa30d4d..b062542 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,14 @@ language: android
 android:
   components:
     # The BuildTools version used by your project
-    - build-tools-23.0.2
+    - build-tools-27.0.3
 
     # The SDK version used to compile your project
-    - android-23
+    - android-27
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 before_install:
+  - yes | sdkmanager "platforms;android-27"
   - echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list
   - sudo apt-get update -qq
   - sudo apt-get install -qq -y --force-yes sbt