From d43de1c7f4a0c071c2ce6fedd163f9b0a469ab59 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 27 Mar 2023 12:13:40 -0500 Subject: [PATCH 1/3] remove android platform check for wownero store delay --- cw_monero/lib/api/wallet.dart | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart index e05a80f758..aa8252d390 100644 --- a/cw_monero/lib/api/wallet.dart +++ b/cw_monero/lib/api/wallet.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'dart:ffi'; -import 'dart:io'; import 'package:cw_monero/api/convert_utf8_to_string.dart'; import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart'; @@ -368,25 +367,23 @@ bool priorityInQueue = false; Future store({bool prioritySave = false}) async { // Delay saves - if (Platform.isAndroid) { - if (priorityInQueue) { - return false; - } - print( - "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue"); - if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && - prioritySave) { - priorityInQueue = true; - await Future.delayed(Duration(seconds: 1)); - priorityInQueue = false; - return store(prioritySave: prioritySave); - } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && - !prioritySave) { - return false; - } - print("released $storeTime"); - storeTime = DateTime.now().millisecondsSinceEpoch; + if (priorityInQueue) { + return false; + } + print( + "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue"); + if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && + prioritySave) { + priorityInQueue = true; + await Future.delayed(Duration(seconds: 1)); + priorityInQueue = false; + return store(prioritySave: prioritySave); + } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && + !prioritySave) { + return false; } + print("released $storeTime"); + storeTime = DateTime.now().millisecondsSinceEpoch; await compute(_storeSync, 0); return true; } From b770a2478e31506be88301408328cf4ccf4474a6 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 27 Mar 2023 12:13:40 -0500 Subject: [PATCH 2/3] Revert "remove android platform check for wownero store delay" This reverts commit d43de1c7f4a0c071c2ce6fedd163f9b0a469ab59. --- cw_monero/lib/api/wallet.dart | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart index aa8252d390..e05a80f758 100644 --- a/cw_monero/lib/api/wallet.dart +++ b/cw_monero/lib/api/wallet.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:ffi'; +import 'dart:io'; import 'package:cw_monero/api/convert_utf8_to_string.dart'; import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart'; @@ -367,23 +368,25 @@ bool priorityInQueue = false; Future store({bool prioritySave = false}) async { // Delay saves - if (priorityInQueue) { - return false; - } - print( - "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue"); - if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && - prioritySave) { - priorityInQueue = true; - await Future.delayed(Duration(seconds: 1)); - priorityInQueue = false; - return store(prioritySave: prioritySave); - } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && - !prioritySave) { - return false; + if (Platform.isAndroid) { + if (priorityInQueue) { + return false; + } + print( + "${DateTime.now().millisecondsSinceEpoch} $prioritySave $priorityInQueue"); + if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && + prioritySave) { + priorityInQueue = true; + await Future.delayed(Duration(seconds: 1)); + priorityInQueue = false; + return store(prioritySave: prioritySave); + } else if (DateTime.now().millisecondsSinceEpoch < storeTime + 90000 && + !prioritySave) { + return false; + } + print("released $storeTime"); + storeTime = DateTime.now().millisecondsSinceEpoch; } - print("released $storeTime"); - storeTime = DateTime.now().millisecondsSinceEpoch; await compute(_storeSync, 0); return true; } From cddfa48f4ff5557a441df682c225818eafbd8f1b Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 27 Mar 2023 12:26:10 -0500 Subject: [PATCH 3/3] add isDesktop check to store() delay logic import util --- cw_monero/lib/api/wallet.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart index e05a80f758..f048751207 100644 --- a/cw_monero/lib/api/wallet.dart +++ b/cw_monero/lib/api/wallet.dart @@ -11,6 +11,7 @@ import 'package:cw_monero/api/types.dart'; import 'package:ffi/ffi.dart'; import 'package:ffi/ffi.dart' as pkgffi; import 'package:flutter/foundation.dart'; +import 'package:stackwallet/utilities/util.dart'; int _boolToInt(bool value) => value ? 1 : 0; @@ -368,7 +369,7 @@ bool priorityInQueue = false; Future store({bool prioritySave = false}) async { // Delay saves - if (Platform.isAndroid) { + if (Platform.isAndroid || Util.isDesktop) { if (priorityInQueue) { return false; }