Dp 821 unbreak api due to batch payment

build.gradle

@@ -3,13 +3,13 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.41'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.2"
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'org.jacoco:org.jacoco.core:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 13 08:37:24 IDT 2019
+#Wed Aug 21 09:30:12 IDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

kin-backup-and-restore/kin-backup-and-restore-lib/build.gradle

@@ -36,18 +36,18 @@ dependencies {
     implementation project(':kin-sdk:kin-sdk-lib')
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.google.zxing:core:3.3.3'
 
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.10.0'
+    androidTestImplementation 'org.mockito:mockito-core:2.23.0'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
 
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib:1.2.71'
-    testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.0.0-RC1'
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.13.0'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
     testImplementation 'org.robolectric:robolectric:4.3'
 
 }

kin-sdk/kin-base/build.gradle

@@ -21,13 +21,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
     implementation 'com.moandjiezana.toml:toml4j:0.5.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
-    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'net.i2p.crypto:eddsa:0.3.0'
     api 'com.github.kinecosystem:oksse:93f4ef7445f9c3db3c3bc2d1ccb2691fc7246810'
 
-    testImplementation 'org.mockito:mockito-core:2.13.0'
-    testImplementation "org.robolectric:robolectric:3.6.1"
-    testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
-    testImplementation group: 'junit', name: 'junit', version: '4.11'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
+    testImplementation "org.robolectric:robolectric:4.3"
+    testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.1'
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

kin-sdk/kin-sdk-lib/build.gradle

@@ -50,24 +50,27 @@ dependencies {
     api 'com.github.kinecosystem:kin-utils-android:1.1'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.10.0'
+    testImplementation 'org.mockito:mockito-core:2.27.0'
     testImplementation 'org.hamcrest:hamcrest-library:1.3'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.9.1'
     testImplementation 'org.robolectric:robolectric:4.3'
-    testImplementation 'com.google.code.gson:gson:2.8.2'
+    testImplementation 'com.google.code.gson:gson:2.8.5'
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 
     androidTestImplementation 'junit:junit:4.12'
-    androidTestImplementation 'org.mockito:mockito-core:2.10.0'
+    androidTestImplementation 'org.mockito:mockito-core:2.23.0'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'org.mockito:mockito-android:2.10.0'
     androidTestImplementation 'org.mockito:mockito-android:2.10.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    androidTestImplementation 'com.android.support:multidex:1.0.2'
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
 }
 
 //bundle javadocs with published aar

kin-sdk/kin-sdk-lib/src/androidTest/java/kin/sdk/KinAccountTest.java

@@ -53,7 +53,7 @@ public void getStatusSync_DeletedAccount_AccountDeletedException() throws Except
     public void sendTransactionSync_DeletedAccount_AccountDeletedException() throws Exception {
         KinAccount kinAccount = kinClient.addAccount();
         kinClient.deleteAccount(0);
-        PaymentTransaction transaction = kinAccount.buildTransactionSync(
+        Transaction transaction = kinAccount.buildTransactionSync(
                 "GBA2XHZRUAHEL4DZX7XNHR7HLBAUYPRNKLD2PIUKWV2LVVE6OJT4NDLM",
                 new BigDecimal(10), FEE);
         kinAccount.sendTransactionSync(transaction);
@@ -63,10 +63,11 @@ public void sendTransactionSync_DeletedAccount_AccountDeletedException() throws
     public void sendWhitelistTransaction_DeletedAccount_AccountDeletedException() throws Exception {
         KinAccount kinAccount = kinClient.addAccount();
         kinClient.deleteAccount(0);
-        PaymentTransaction transaction = kinAccount.buildTransactionSync("GBA2XHZRUAHEL4DZX7XNHR7HLBAUYPRNKLD2PIUKWV2LVVE6OJT4NDLM",
+        Transaction transaction = kinAccount.buildTransactionSync("GBA2XHZRUAHEL4DZX7XNHR7HLBAUYPRNKLD2PIUKWV2LVVE6OJT4NDLM",
                 new BigDecimal(10), 0);
 
-        String whitelist = new WhitelistServiceForTest().whitelistTransaction(transaction.whitelistPayload());
+        String whitelist = new WhitelistServiceForTest().whitelistTransaction(transaction.getWhitelistableTransaction().getTransactionPayload(),
+            transaction.getWhitelistableTransaction().getNetworkPassphrase());
         kinAccount.sendWhitelistTransactionSync(whitelist);
     }
 

kin-sdk/kin-sdk-lib/src/androidTest/java/kin/sdk/WhitelistServiceForTest.java

@@ -21,8 +21,8 @@ public class WhitelistServiceForTest {
                 .build();
     }
 
-    String whitelistTransaction(WhitelistPayload whitelistPayload) throws Exception {
-        RequestBody requestBody = RequestBody.create(JSON, toJson(whitelistPayload));
+    String whitelistTransaction(String txPayload, String passphrase) throws Exception {
+        RequestBody requestBody = RequestBody.create(JSON, toJson(txPayload, passphrase));
         okhttp3.Request request = new Request.Builder()
                 .url(IntegConsts.URL_WHITELISTING_SERVICE)
                 .post(requestBody)
@@ -40,10 +40,10 @@ String whitelistTransaction(WhitelistPayload whitelistPayload) throws Exception
         return whitelist;
     }
 
-    private String toJson(WhitelistPayload whitelistPayload) throws JSONException {
+    private String toJson(String txPayload, String passphrase) throws JSONException {
         JSONObject jo = new JSONObject();
-        jo.put("envelop", whitelistPayload.getTransactionPayload());
-        jo.put("network_id", whitelistPayload.getNetworkPassphrase());
+        jo.put("envelop", txPayload);
+        jo.put("network_id", passphrase);
         return jo.toString();
     }
 

kin-sdk/kin-sdk-lib/src/androidTest/kotlin/kin/sdk/KinAccountIntegrationTest.kt

@@ -208,7 +208,8 @@ class KinAccountIntegrationTest {
         expectedEx.expectMessage(kinAccountSender.publicAddress)
 
         val transaction = kinAccountSender.buildTransactionSync(kinAccountReceiver.publicAddress.orEmpty(), BigDecimal("21.123"), fee)
-        val whitelist = WhitelistServiceForTest().whitelistTransaction(transaction.whitelistPayload())
+        val whitelist = WhitelistServiceForTest().whitelistTransaction(
+                transaction.whitelistableTransaction.transactionPayload, transaction.whitelistableTransaction.networkPassphrase)
         kinAccountSender.sendWhitelistTransactionSync(whitelist)
     }
 
@@ -225,7 +226,8 @@ class KinAccountIntegrationTest {
         expectedEx.expectMessage(kinAccountReceiver.publicAddress)
 
         val transaction = kinAccountSender.buildTransactionSync(kinAccountReceiver.publicAddress.orEmpty(), BigDecimal("21.123"), fee)
-        val whitelist = WhitelistServiceForTest().whitelistTransaction(transaction.whitelistPayload())
+        val whitelist = WhitelistServiceForTest().whitelistTransaction(
+                transaction.whitelistableTransaction.transactionPayload, transaction.whitelistableTransaction.networkPassphrase)
         kinAccountSender.sendWhitelistTransactionSync(whitelist)
 
     }
@@ -251,7 +253,8 @@ class KinAccountIntegrationTest {
         val minFee: Int = Math.toIntExact(kinClient.minimumFeeSync)
         val transaction = kinAccountSender.buildTransactionSync(kinAccountReceiver.publicAddress.orEmpty(),
                 BigDecimal("20"), minFee + 100000)
-        val whitelist = WhitelistServiceForTest().whitelistTransaction(transaction.whitelistPayload())
+         val whitelist = WhitelistServiceForTest().whitelistTransaction(
+                transaction.whitelistableTransaction.transactionPayload, transaction.whitelistableTransaction.networkPassphrase)
         kinAccountSender.sendWhitelistTransactionSync(whitelist)
         assertThat(kinAccountSender.balanceSync.value(), equalTo(BigDecimal("80.00000")))
     }
@@ -265,7 +268,8 @@ class KinAccountIntegrationTest {
         val minFee: Int = Math.toIntExact(kinClient.minimumFeeSync)
         val transaction = kinAccountSender.buildTransactionSync(kinAccountReceiver.publicAddress.orEmpty(),
                 BigDecimal("20"), minFee)
-        val whitelist = WhitelistServiceForTest().whitelistTransaction(transaction.whitelistPayload())
+        val whitelist = WhitelistServiceForTest().whitelistTransaction(
+                transaction.whitelistableTransaction.transactionPayload, transaction.whitelistableTransaction.networkPassphrase)
         kinAccountSender.sendWhitelistTransactionSync(whitelist)
         assertThat(kinAccountSender.balanceSync.value(), equalTo(BigDecimal("80.00000")))
         assertThat(kinAccountReceiver.balanceSync.value(), equalTo(BigDecimal("20.00000")))

kin-sdk/kin-sdk-lib/src/androidTest/kotlin/kin/sdk/internal/queue/FakeQueueScheduler.kt

@@ -0,0 +1,57 @@
+package kin.sdk.internal.queue
+
+import java.util.*
+import kotlin.concurrent.schedule
+
+open class FakeIntegrationTestQueueScheduler : QueueScheduler {
+
+    private var timer: Timer? = Timer()
+    private val futureTasks: HashMap<Runnable?, TimerTask?> = HashMap()
+
+    //TODO what is better? one of the commented one or the non commented one. Which one?
+
+//    override fun scheduleDelayed(runnable: Runnable?, delayInMillis: Long) {
+//        Handler().postDelayed({
+//            runnable?.run()
+//        }, delayInMillis)
+//    }
+
+//    override fun scheduleDelayed(runnable: Runnable?, delayInMillis: Long) {
+//        val timer = Timer()
+//        timer.schedule(object: TimerTask() {
+//            override fun run() {
+//                runnable?.run()
+//            }
+//        }, delayInMillis)
+//    }
+
+//    override fun scheduleDelayed(runnable: Runnable?, delayInMillis: Long) {
+//        val timer = Timer()
+//        timer.schedule(timerTask {runnable?.run() }, delayInMillis)
+//    }
+
+    override fun scheduleDelayed(runnable: Runnable?, delayInMillis: Long) {
+        val task = timer?.schedule(delayInMillis) {
+            runnable?.run()
+        }
+        futureTasks[runnable] = task
+    }
+
+    override fun removeAllPendingTasks() {
+        // killing all future futureTasks not including the current running task if there is one.
+        timer?.cancel()
+        timer?.purge()
+        futureTasks.clear()
+        timer = Timer()
+    }
+
+    override fun removePendingTask(runnable: Runnable?) {
+        futureTasks[runnable]?.cancel()
+    }
+
+    override fun schedule(runnable: Runnable?) {
+        runnable?.run()
+    }
+
+
+}