From 1360640d52502bc6094520c38d7d235008cbb1fd Mon Sep 17 00:00:00 2001 From: m2049r Date: Mon, 13 Sep 2021 23:54:23 +0200 Subject: [PATCH] updates & adjust unlock blocks --- app/src/main/cpp/monerujo.cpp | 2 +- .../main/java/com/m2049r/xmrwallet/model/TransactionInfo.java | 2 +- external-libs/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp index de0d068..33f6941 100644 --- a/app/src/main/cpp/monerujo.cpp +++ b/app/src/main/cpp/monerujo.cpp @@ -916,7 +916,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_refreshAsync(JNIEnv *env, jobject instanc //virtual void rescanBlockchainAsync() = 0; JNIEXPORT void JNICALL Java_com_m2049r_xmrwallet_model_Wallet_rescanBlockchainAsyncJ(JNIEnv *env, jobject instance) { - Bitmonero::Wallet *wallet = getHandle(env, instance); + Monero::Wallet *wallet = getHandle(env, instance); wallet->rescanBlockchainAsync(); } diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java b/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java index 4b904e1..5e73c64 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java +++ b/app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java @@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor; // this is not the TransactionInfo from the API as that is owned by the TransactionHistory // this is a POJO for the TransactionInfoAdapter public class TransactionInfo implements Parcelable, Comparable { - public static final int CONFIRMATION = 10; // blocks + public static final int CONFIRMATION = 4; // CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE @RequiredArgsConstructor public enum Direction { diff --git a/external-libs/Makefile b/external-libs/Makefile index e0ccdda..98dfb9f 100644 --- a/external-libs/Makefile +++ b/external-libs/Makefile @@ -2,7 +2,7 @@ FLAVOUR=wownero all: arm64-v8a x86_64 include/wallet2_api.h VERSION -arm64-v8a: $(FLAVOUR) android64.Dockerfile +arm64-v8a: $(FLAVOUR) android64.Dockerfile include/wallet2_api.h -rm -rf arm64-v8a -docker container rm $(FLAVOUR)-android-arm64 -f docker build -f android64.Dockerfile -t $(FLAVOUR)-android-arm64 $(FLAVOUR) @@ -10,7 +10,7 @@ arm64-v8a: $(FLAVOUR) android64.Dockerfile docker cp $(FLAVOUR)-android-arm64:/opt/android/prefix/lib/. arm64-v8a/ docker cp $(FLAVOUR)-android-arm64:/src/build/release/lib/. arm64-v8a/$(FLAVOUR) -x86_64: $(FLAVOUR) android64_x86.Dockerfile +x86_64: $(FLAVOUR) android64_x86.Dockerfile include/wallet2_api.h -rm -rf x86_64 -docker container rm $(FLAVOUR)-android-x86_64 -f docker build -f android64_x86.Dockerfile -t $(FLAVOUR)-android-x86_64 $(FLAVOUR)