Merge pull request #460 from tari-project/ffi-lib-14.0-rc

FFI v0.14.0-rc update.
tari-project · Jul 1, 2020 · 74646c8 · 74646c8
2 parents ff311dc + a9be956
commit 74646c8
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -147,8 +147,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     // recycler view
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    // swipe refresh
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     // the new view pager
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     // for tab layout

diff --git a/app/src/androidTest/java/com/tari/android/wallet/FFIWalletTests.kt b/app/src/androidTest/java/com/tari/android/wallet/FFIWalletTests.kt
@@ -55,6 +55,7 @@ import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeout
 import org.junit.*
 import org.junit.Assert.*
+import java.io.File
 import java.math.BigInteger
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -217,11 +218,10 @@ class FFIWalletTests {
             assertTrue(completedTxFee > BigInteger("0"))
             val completedTxTimestamp = completedTx.getTimestamp()
             completedTxTimestamp.toString()
-            val completedTxIsOutbound = wallet.isCompletedTxOutbound(completedTx)
             if (wallet.getPublicKey().toString() == completedTx.getSourcePublicKey().toString()) {
-                assertTrue(completedTxIsOutbound)
+                assertTrue(completedTx.isOutbound())
             } else {
-                assertFalse(completedTxIsOutbound)
+                assertFalse(completedTx.isOutbound())
             }
             completedTx.destroy()
         }
@@ -293,6 +293,29 @@ class FFIWalletTests {
         // TODO test listeners
     }
 
+    @Test
+    fun testPartialBackup() {
+        val transport = FFITransportType()
+        val commsConfig = FFICommsConfig(
+            transport.getAddress(),
+            transport,
+            FFITestUtil.WALLET_DB_NAME,
+            walletDir,
+            Constants.Wallet.discoveryTimeoutSec
+        )
+        val wallet = FFIWallet(commsConfig, "")
+        wallet.listenerAdapter = TestListener()
+
+        val backupDir = File(walletDir, "backup")
+        backupDir.mkdir()
+        val backupFile = File(backupDir, "backupfile.sqlite3")
+        wallet.doPartialBackup(backupFile.absolutePath)
+        assertTrue(backupFile.exists())
+        transport.destroy()
+        commsConfig.destroy()
+        wallet.destroy()
+    }
+
     class TestListener : FFIWalletListenerAdapter {
         override fun onTxBroadcast(completedTx: CompletedTx) {
             Logger.i("Tx Broadcast :: completed tx id %s", completedTx.id.toString())

diff --git a/app/src/main/cpp/jniCompletedTransaction.cpp b/app/src/main/cpp/jniCompletedTransaction.cpp
@@ -169,6 +169,21 @@ Java_com_tari_android_wallet_ffi_FFICompletedTx_jniGetStatus(
     return result;
 }
 
+extern "C"
+JNIEXPORT jboolean JNICALL
+Java_com_tari_android_wallet_ffi_FFICompletedTx_jniIsOutbound(
+        JNIEnv *jEnv,
+        jobject jThis,
+        jobject error) {
+    int i = 0;
+    int *r = &i;
+    jlong lCompletedTx = GetPointerField(jEnv,jThis);
+    TariCompletedTransaction *pCompletedTx = reinterpret_cast<TariCompletedTransaction *>(lCompletedTx);
+    jboolean result = static_cast<jboolean>(completed_transaction_is_outbound(pCompletedTx, r) != 0);
+    setErrorCode(jEnv, error, i);
+    return result;
+}
+
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_tari_android_wallet_ffi_FFICompletedTx_jniDestroy(

diff --git a/app/src/main/cpp/jniWallet.cpp b/app/src/main/cpp/jniWallet.cpp
@@ -562,25 +562,6 @@ Java_com_tari_android_wallet_ffi_FFIWallet_jniRemoveContact(
     return result;
 }
 
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_tari_android_wallet_ffi_FFIWallet_jniIsCompletedTxOutbound(
-        JNIEnv *jEnv,
-        jobject jThis,
-        jobject jpCompletedTx,
-        jobject error) {
-    int i = 0;
-    int *r = &i;
-    jlong lWallet = GetPointerField(jEnv, jThis);
-    TariWallet *pWallet = reinterpret_cast<TariWallet *>(lWallet);
-    jlong lCompletedTx = GetPointerField(jEnv, jpCompletedTx);
-    TariCompletedTransaction *pTransaction = reinterpret_cast<TariCompletedTransaction *>(lCompletedTx);
-    jboolean result = static_cast<jboolean>(
-            wallet_is_completed_transaction_outbound(pWallet, pTransaction, r) != 0);
-    setErrorCode(jEnv, error, i);
-    return result;
-}
-
 extern "C"
 JNIEXPORT jlong JNICALL
 Java_com_tari_android_wallet_ffi_FFIWallet_jniGetCompletedTxs(
@@ -1131,4 +1112,21 @@ Java_com_tari_android_wallet_ffi_FFIWallet_jniGetSeedWords(
     return reinterpret_cast<jlong>(pSeedwords);
 }
 
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_tari_android_wallet_ffi_FFIWallet_jniDoPartialBackup(
+        JNIEnv *jEnv,
+        jobject jThis,
+        jstring jBackupFileTargetPath,
+        jobject error) {
+    int i = 0;
+    int *r = &i;
+    jlong lWallet = GetPointerField(jEnv, jThis);
+    TariWallet *pWallet = reinterpret_cast<TariWallet *>(lWallet);
+    const char *pTargetPath = jEnv->GetStringUTFChars(jBackupFileTargetPath, JNI_FALSE);
+    wallet_partial_backup(pWallet, pTargetPath, r);
+    setErrorCode(jEnv, error, i);
+    jEnv->ReleaseStringUTFChars(jBackupFileTargetPath, pTargetPath);
+}
+
 //endregion
diff --git a/app/src/main/java/com/tari/android/wallet/ffi/FFICompletedTx.kt b/app/src/main/java/com/tari/android/wallet/ffi/FFICompletedTx.kt
@@ -62,6 +62,10 @@ internal class FFICompletedTx constructor(pointer: FFICompletedTxPtr) : FFIBase(
 
     private external fun jniGetMessage(libError: FFIError): String
     private external fun jniGetStatus(libError: FFIError): Int
+    private external fun jniIsOutbound(
+        libError: FFIError
+    ): Boolean
+
     private external fun jniDestroy()
 
     // endregion
@@ -141,6 +145,13 @@ internal class FFICompletedTx constructor(pointer: FFICompletedTxPtr) : FFIBase(
         }
     }
 
+    fun isOutbound(): Boolean {
+        val error = FFIError()
+        val result = jniIsOutbound(error)
+        throwIf(error)
+        return result
+    }
+
     override fun destroy() {
         jniDestroy()
     }

diff --git a/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt b/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt
@@ -157,11 +157,6 @@ internal class FFIWallet(
         libError: FFIError
     ): Boolean
 
-    private external fun jniIsCompletedTxOutbound(
-        completedTx: FFICompletedTx,
-        libError: FFIError
-    ): Boolean
-
     private external fun jniSendTx(
         publicKeyPtr: FFIPublicKey,
         amount: String,
@@ -225,6 +220,11 @@ internal class FFIWallet(
         libError: FFIError
     ): FFISeedWordsPtr
 
+    private external fun jniDoPartialBackup(
+        backupFileTargetPath: String,
+        libError: FFIError
+    )
+
     private external fun jniDestroy()
 
     // endregion
@@ -309,13 +309,6 @@ internal class FFIWallet(
         return result
     }
 
-    fun isCompletedTxOutbound(completedTx: FFICompletedTx): Boolean {
-        val error = FFIError()
-        val result = jniIsCompletedTxOutbound(completedTx, error)
-        throwIf(error)
-        return result
-    }
-
     fun getCompletedTxs(): FFICompletedTxs {
         val error = FFIError()
         val result = FFICompletedTxs(jniGetCompletedTxs(error))
@@ -721,6 +714,12 @@ internal class FFIWallet(
         return result
     }
 
+    fun doPartialBackup(backupFileTargetPath: String) {
+        val error = FFIError()
+        jniDoPartialBackup(backupFileTargetPath, error)
+        throwIf(error)
+    }
+
     override fun destroy() {
         jniDestroy()
     }

diff --git a/app/src/main/java/com/tari/android/wallet/service/WalletService.kt b/app/src/main/java/com/tari/android/wallet/service/WalletService.kt
@@ -923,7 +923,7 @@ internal class WalletService : Service(), FFIWalletListenerAdapter, LifecycleObs
                 throw FFIException(message = error.message)
             }
 
-            if (wallet.isCompletedTxOutbound(completedTxFFI)) {
+            if (completedTxFFI.isOutbound()) {
                 direction = OUTBOUND
                 val userPublicKey = PublicKey(
                     destinationPublicKeyFFI.toString(),
@@ -985,7 +985,7 @@ internal class WalletService : Service(), FFIWalletListenerAdapter, LifecycleObs
                 throw FFIException(message = error.message)
             }
 
-            if (wallet.isCompletedTxOutbound(completedTxFFI)) {
+            if (completedTxFFI.isOutbound()) {
                 direction = OUTBOUND
                 val userPublicKey = PublicKey(
                     destinationPublicKeyFFI.toString(),

diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,11 @@ buildscript {
     ext.buildNumber = 121
     ext.versionNumber = "0.2.1"
 
+    // JNI libs
+    ext.jniLibsVersion = "0.14.0-rc"
+    ext.jniLibsHostURL = "https://tari-binaries.s3.amazonaws.com/libwallet/"
+    ext.supportedABIs = ["arm64-v8a", "armeabi-v7a", "x86_64"]
+
     repositories {
         google()
         jcenter()

diff --git a/download-jni-binaries.gradle b/download-jni-binaries.gradle
@@ -1,9 +1,3 @@
-ext {
-    jniLibsVersion = "0.13.1"
-    jniLibsHostURL = "https://tari-binaries.s3.amazonaws.com/libwallet/"
-    supportedABIs = ["arm64-v8a", "armeabi-v7a", "x86_64"]
-}
-
 /**
  * Downloads JNI binaries as version specified in the project-level gradle file.
  */

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip