Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix display for update popup

Browse Source
This commit is contained in:
Manfred Karrer 2016-04-26 21:34:03 +02:00
parent ae85d4e3a7
commit 96764394bd
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/io/bitsquare/alert/Alert.java
View File

@ -67,6 +67,12 @@ public final class Alert implements StoragePayload {
return signatureAsBase64;
}
public boolean isNewVersion() {
int versionNum = Integer.valueOf(Version.VERSION.replace(".", ""));
int alertVersionNum = Integer.valueOf(version.replace(".", ""));
return versionNum < alertVersionNum;
}
@Override
public long getTTL() {
return TTL;

9
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View File

@ -823,11 +823,10 @@ public class MainViewModel implements ViewModel {
private void displayAlertIfPresent(Alert alert) {
boolean alreadyDisplayed = alert != null && alert.equals(user.getDisplayedAlert());
user.setDisplayedAlert(alert);
if (alert != null && !alreadyDisplayed) {
if (!alert.isUpdateInfo || !alert.version.equals(Version.VERSION))
new DisplayAlertMessageWindow().alertMessage(alert).show();
}
if (alert != null &&
!alreadyDisplayed &&
(!alert.isUpdateInfo || alert.isNewVersion()))
new DisplayAlertMessageWindow().alertMessage(alert).show();
}
private void swapPendingOfferFundingEntries() {