rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-10 05:03:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert to simplified sync

Browse Source
This commit is contained in:
pokkst 2023-02-01 18:24:15 -06:00
parent 55a0c3b5ce
commit a147faef70
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/net/mynero/wallet/MainActivity.java
View File

@ -113,10 +113,10 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
}
@Override
public void onRefresh(long height) {
public void onRefresh() {
this.historyService.refreshHistory();
this.balanceService.refreshBalance();
this.blockchainService.refreshBlockchain(height);
this.blockchainService.refreshBlockchain();
this.addressService.refreshAddresses();
this.utxoService.refreshUtxos();
}

5
app/src/main/java/net/mynero/wallet/service/BlockchainService.java
View File

@ -14,7 +14,6 @@ public class BlockchainService extends ServiceBase {
public LiveData<Wallet.ConnectionStatus> connectionStatus = _connectionStatus;
private long daemonHeight = 0;
private long lastDaemonHeightUpdateTimeMs = 0;
public static long GETHEIGHT_FETCH = -1;
public BlockchainService(MoneroHandlerThread thread) {
super(thread);
@ -25,8 +24,8 @@ public class BlockchainService extends ServiceBase {
return instance;
}
public void refreshBlockchain(long height) {
_currentHeight.postValue(height == GETHEIGHT_FETCH ? getCurrentHeight() : height);
public void refreshBlockchain() {
_currentHeight.postValue(getCurrentHeight());
}
public long getCurrentHeight() {

26
app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java
View File

@ -57,7 +57,7 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
@Override
public synchronized void start() {
super.start();
this.listener.onRefresh(BlockchainService.GETHEIGHT_FETCH);
this.listener.onRefresh();
}
@Override
@ -92,17 +92,13 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
@Override
public void newBlock(long height) {
if(isEveryNthBlock(height, 1)) { // refresh services every 5 blocks downloaded
refresh(height);
} else if(isEveryNthBlock(height, 5)) { // save wallet every 5 blocks (~10 minutes), we also save upon finishing sync (in refreshed())
wallet.store();
}
refresh();
BlockchainService.getInstance().setDaemonHeight(wallet.isSynchronized() ? height : 0);
}
@Override
public void updated() {
refresh(BlockchainService.GETHEIGHT_FETCH);
refresh();
}
@Override
@ -116,20 +112,19 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
listener.onConnectionFail();
}
} else {
long height = wallet.getDaemonBlockChainHeight();
BlockchainService.getInstance().setDaemonHeight(height);
BlockchainService.getInstance().setDaemonHeight(wallet.getDaemonBlockChainHeight());
wallet.setSynchronized();
wallet.store();
refresh(height);
refresh();
}
BlockchainService.getInstance().setConnectionStatus(status);
}
private void refresh(long height) {
private void refresh() {
wallet.refreshHistory();
wallet.refreshCoins();
listener.onRefresh(height);
listener.onRefresh();
}
public PendingTransaction createTx(String address, String amountStr, boolean sendAll, PendingTransaction.Priority feePriority, ArrayList<String> selectedUtxos) throws Exception {
@ -226,10 +221,6 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
return pendingTx.commit("", true);
}
private boolean isEveryNthBlock(long height, long interval) {
return height % interval == 0;
}
private float getRandomDonateAmount(float min, float max) {
SecureRandom rand = new SecureRandom();
return rand.nextFloat() * (max - min) + min;
@ -241,8 +232,7 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
}
public interface Listener {
void onRefresh(long height);
void onRefresh();
void onConnectionFail();
}
}