From a147faef70551b4d3f1b3bc75e1c6ecd52885ec6 Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@tutanota.de>
Date: Wed, 1 Feb 2023 18:24:15 -0600
Subject: [PATCH] Revert to simplified sync

---
 .../java/net/mynero/wallet/MainActivity.java  |  4 +--
 .../wallet/service/BlockchainService.java     |  5 ++--
 .../wallet/service/MoneroHandlerThread.java   | 26 ++++++-------------
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/net/mynero/wallet/MainActivity.java b/app/src/main/java/net/mynero/wallet/MainActivity.java
index e59a2b5..9886403 100644
--- a/app/src/main/java/net/mynero/wallet/MainActivity.java
+++ b/app/src/main/java/net/mynero/wallet/MainActivity.java
@@ -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();
     }
diff --git a/app/src/main/java/net/mynero/wallet/service/BlockchainService.java b/app/src/main/java/net/mynero/wallet/service/BlockchainService.java
index ad14d63..0897cf8 100644
--- a/app/src/main/java/net/mynero/wallet/service/BlockchainService.java
+++ b/app/src/main/java/net/mynero/wallet/service/BlockchainService.java
@@ -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() {
diff --git a/app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java b/app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java
index 8ff9315..00242ea 100644
--- a/app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java
+++ b/app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java
@@ -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();
     }
 }