Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Not show warning popup for imported payment accounts #2316

Merged
merged 1 commit into from
Jan 24, 2019
Merged

Not show warning popup for imported payment accounts #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/app/BisqSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ private void initDomainServices() {
private void maybeShowSecurityRecommendation() {
String key = "remindPasswordAndBackup";
user.getPaymentAccountsAsObservable().addListener((SetChangeListener<PaymentAccount>) change -> {
if (!walletsManager.areWalletsEncrypted() && preferences.showAgain(key) && change.wasAdded() &&
if (!walletsManager.areWalletsEncrypted() && !user.isPaymentAccountImport() && preferences.showAgain(key) && change.wasAdded() &&
displaySecurityRecommendationHandler != null)
displaySecurityRecommendationHandler.accept(key);
});
Expand Down
17 changes: 17 additions & 0 deletions core/src/main/java/bisq/core/user/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import javafx.collections.SetChangeListener;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -71,6 +72,7 @@ public class User implements PersistedDataHost {
private ObjectProperty<PaymentAccount> currentPaymentAccountProperty;

private UserPayload userPayload = new UserPayload();
private boolean isPaymentAccountImport = false;

@Inject
public User(Storage<UserPayload> storage, KeyRing keyRing) {
Expand Down Expand Up @@ -201,6 +203,17 @@ public void addPaymentAccount(PaymentAccount paymentAccount) {
persist();
}

public void addImportedPaymentAccounts(Collection<PaymentAccount> paymentAccounts) {
isPaymentAccountImport = true;

boolean changed = paymentAccountsAsObservable.addAll(paymentAccounts);
setCurrentPaymentAccount(paymentAccounts.stream().findFirst().get());
if (changed)
persist();

isPaymentAccountImport = false;
}

public void removePaymentAccount(PaymentAccount paymentAccount) {
boolean changed = paymentAccountsAsObservable.remove(paymentAccount);
if (changed)
Expand Down Expand Up @@ -436,4 +449,8 @@ public List<MarketAlertFilter> getMarketAlertFilters() {
public PriceAlertFilter getPriceAlertFilter() {
return userPayload.getPriceAlertFilter();
}

public boolean isPaymentAccountImport() {
return isPaymentAccountImport;
}
}
5 changes: 4 additions & 1 deletion desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -211,15 +212,17 @@ public static void importAccounts(User user, String fileName, Preferences prefer
PaymentAccountList persisted = paymentAccountsStorage.initAndGetPersistedWithFileName(fileName, 100);
if (persisted != null) {
final StringBuilder msg = new StringBuilder();
final HashSet<PaymentAccount> paymentAccounts = new HashSet<>();
persisted.getList().forEach(paymentAccount -> {
final String id = paymentAccount.getId();
if (user.getPaymentAccount(id) == null) {
user.addPaymentAccount(paymentAccount);
paymentAccounts.add(paymentAccount);
msg.append(Res.get("guiUtil.accountExport.tradingAccount", id));
} else {
msg.append(Res.get("guiUtil.accountImport.noImport", id));
}
});
user.addImportedPaymentAccounts(paymentAccounts);
new Popup<>().feedback(Res.get("guiUtil.accountImport.imported", path, msg)).show();

} else {
Expand Down