mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed tempWalletPassword -> tempLockWalletPassword

Browse Source 
This @Nullable class level variable's name needs to specifically
describe the use case.
This commit is contained in:
ghubstan 2020-04-30 11:57:59 -03:00
parent ca68d0567f
commit c5fcafb5f6
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/bisq/core/grpc/CoreApi.java
View File

@ -46,12 +46,13 @@ import java.util.List;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static java.util.concurrent.TimeUnit.SECONDS;
/**
* Provides high level interface to functionality of core Bisq features.
* E.g. useful for different APIs to access data of different domains of Bisq.
@ -67,7 +68,7 @@ public class CoreApi {
private final User user;
@Nullable
private String tempWalletPassword;
private String tempLockWalletPassword;
@Inject
public CoreApi(Balances balances,
@ -180,7 +181,7 @@ public class CoreApi {
log::error);
}
// Provided for automated wallet encryption password testing, despite the
// Provided for automated wallet protection method testing, despite the
// security risks exposed by providing users the ability to decrypt their wallets.
public Tuple2<Boolean, String> removeWalletPassword(String password) {
if (!walletsManager.areWalletsAvailable())
@ -236,9 +237,9 @@ public class CoreApi {
}
public Tuple2<Boolean, String> lockWallet() {
if (tempWalletPassword != null) {
Tuple2<Boolean, String> encrypted = setWalletPassword(tempWalletPassword, null);
tempWalletPassword = null;
if (tempLockWalletPassword != null) {
Tuple2<Boolean, String> encrypted = setWalletPassword(tempLockWalletPassword, null);
tempLockWalletPassword = null;
if (!encrypted.first)
return encrypted;
@ -257,14 +258,15 @@ public class CoreApi {
public void run() {
log.info("Locking wallet");
setWalletPassword(password, null);
tempWalletPassword = null;
tempLockWalletPassword = null;
}
};
Timer timer = new Timer("Lock Wallet Timer");
timer.schedule(timerTask, TimeUnit.SECONDS.toMillis(timeout));
timer.schedule(timerTask, SECONDS.toMillis(timeout));
// Cache a temp password for timeout (secs) to allow user locks wallet before timeout expires.
tempWalletPassword = password;
// Cache wallet password for timeout (secs), in case
// user wants to lock the wallet for timeout expires.
tempLockWalletPassword = password;
return new Tuple2<>(true, "");
}
}