From 668cefb357e400ad2a49b05a9403656ecc1d0be4 Mon Sep 17 00:00:00 2001
From: m2049r <miner2049er@women-at-work.org>
Date: Fri, 12 Oct 2018 23:03:53 +0200
Subject: [PATCH] explicit check pw (#439)
also, revert device type query changes
---
.../java/com/m2049r/xmrwallet/model/WalletManager.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
index cac7ece6..c2ab4dd1 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
@@ -178,16 +178,12 @@ public class WalletManager {
public native boolean verifyWalletPassword(String keys_file_name, String password, boolean watch_only);
public boolean verifyWalletPasswordOnly(String keys_file_name, String password) {
- return queryWalletDevice(keys_file_name, password) != Wallet.Device.Device_Undefined;
+ return queryWalletDeviceJ(keys_file_name, password) >= 0;
}
public Wallet.Device queryWalletDevice(String keys_file_name, String password) {
int device = queryWalletDeviceJ(keys_file_name, password);
- Wallet.Device[] types = Wallet.Device.values();
- // mapping is monero+1=android
- if ((device < 0) || (device > types.length - 2))
- device = -1;
- return types[device + 1];
+ return Wallet.Device.values()[device + 1]; // mapping is monero+1=android
}
private native int queryWalletDeviceJ(String keys_file_name, String password);