refactor(EWM-589): replace NtpTime.now() with NtpService.now()

Author: Egor Komarov

lib/app/service/connection/data/connection_data/connection_data.dart

@@ -1,5 +1,4 @@
 import 'package:app/app/service/connection/data/network_type.dart';
-import 'package:app/utils/utils.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:uuid/uuid.dart';
 
@@ -55,7 +54,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: nativeTokenTicker,
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     latencyDetectionInterval: latencyDetectionInterval,
     maxLatency: maxLatency,
     endpointSelectionRetryCount: endpointSelectionRetryCount,
@@ -118,7 +117,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: '',
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     latencyDetectionInterval: latencyDetectionInterval,
     maxLatency: maxLatency,
     endpointSelectionRetryCount: endpointSelectionRetryCount,
@@ -164,7 +163,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: nativeTokenTicker,
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     isUsedOnStart: isUsedOnStart,
     nativeTokenDecimals: nativeTokenDecimals,
   );
@@ -212,7 +211,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: '',
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     isUsedOnStart: isUsedOnStart,
     nativeTokenDecimals: nativeTokenDecimals,
   );
@@ -255,7 +254,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: nativeTokenTicker,
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     isUsedOnStart: isUsedOnStart,
     nativeTokenDecimals: nativeTokenDecimals,
   );
@@ -303,7 +302,7 @@ sealed class ConnectionData with _$ConnectionData {
     nativeTokenTicker: '',
     isPreset: false,
     canBeEdited: true,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
     isUsedOnStart: isUsedOnStart,
     nativeTokenDecimals: nativeTokenDecimals,
   );

lib/app/service/password_service.dart

@@ -2,20 +2,24 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:app/app/service/service.dart';
-import 'package:app/utils/utils.dart';
 import 'package:injectable/injectable.dart';
 import 'package:logging/logging.dart';
 import 'package:nekoton_repository/nekoton_repository.dart';
 import 'package:rxdart/rxdart.dart';
 
 @singleton
 final class PasswordService {
-  PasswordService(this._storageService, this._nekotonRepository);
+  PasswordService(
+    this._storageService,
+    this._nekotonRepository,
+    this._ntpService,
+  );
 
   static final _logger = Logger('PasswordService');
 
   final NekotonRepository _nekotonRepository;
   final SecureStorageService _storageService;
+  final NtpService _ntpService;
 
   /// Master key to state map
   final _state = <PublicKey, _State>{};
@@ -31,7 +35,14 @@ final class PasswordService {
         for (final entry in map.entries) {
           try {
             final masterKey = PublicKey(publicKey: entry.key);
-            final state = _State.fromJson(entry.value as Map<String, dynamic>);
+            final json = entry.value as Map<String, dynamic>;
+            final state = _State(
+              _ntpService,
+              attempts: json['attempts'] as int,
+              lastAttempt: json['lastAttempt'] != null
+                  ? DateTime.tryParse(json['lastAttempt'] as String)
+                  : null,
+            );
 
             _state[masterKey] = state;
           } catch (e, s) {
@@ -77,7 +88,7 @@ final class PasswordService {
     final masterKey = _getMasterKey(publicKey);
 
     // invalid state, should not happen
-    if (masterKey == null) return _State.unlocked();
+    if (masterKey == null) return _State(_ntpService);
 
     return _getLockState(masterKey);
   }
@@ -123,7 +134,7 @@ final class PasswordService {
   }
 
   _State _getLockState(PublicKey masterKey) {
-    return _state[masterKey] ??= _State.unlocked();
+    return _state[masterKey] ??= _State(_ntpService);
   }
 
   PublicKey? _getMasterKey(PublicKey publicKey) => _nekotonRepository.seedList
@@ -151,20 +162,11 @@ abstract class PasswordLockState {
 }
 
 final class _State implements PasswordLockState {
-  _State._({this.lastAttempt, this.attempts = 0}) {
+  _State(this._ntpService, {this.lastAttempt, this.attempts = 0}) {
     _update();
   }
 
-  factory _State.unlocked() = _State._;
-
-  factory _State.fromJson(Map<String, dynamic> json) {
-    return _State._(
-      attempts: json['attempts'] as int,
-      lastAttempt: json['lastAttempt'] != null
-          ? DateTime.tryParse(json['lastAttempt'] as String)
-          : null,
-    );
-  }
+  final NtpService _ntpService;
 
   @override
   int attempts;
@@ -202,7 +204,7 @@ final class _State implements PasswordLockState {
   bool get isLocked {
     final lockUntil = this.lockUntil;
     if (lockUntil == null) return false;
-    return NtpTime.now().isBefore(lockUntil);
+    return _ntpService.now().isBefore(lockUntil);
   }
 
   @override
@@ -216,7 +218,7 @@ final class _State implements PasswordLockState {
   }
 
   void attempt() {
-    lastAttempt = NtpTime.now();
+    lastAttempt = _ntpService.now();
     attempts += 1;
 
     _update();
@@ -243,7 +245,7 @@ final class _State implements PasswordLockState {
     _unlockTimer = null;
 
     if (isLocked && lockUntil != null) {
-      final now = NtpTime.now();
+      final now = _ntpService.now();
       final timeToWait = lockUntil.difference(now) + const Duration(seconds: 1);
 
       if (!timeToWait.isNegative) {

lib/data/models/browser_bookmark_item.dart

@@ -1,10 +1,8 @@
 import 'package:app/data/models/browser_item.dart';
-import 'package:app/utils/utils.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:uuid/uuid.dart';
 
 part 'browser_bookmark_item.freezed.dart';
-
 part 'browser_bookmark_item.g.dart';
 
 @freezed
@@ -28,6 +26,6 @@ abstract class BrowserBookmarkItem
     id: const Uuid().v4(),
     title: title,
     url: url,
-    sortingOrder: NtpTime.now().millisecondsSinceEpoch.toDouble(),
+    sortingOrder: DateTime.now().millisecondsSinceEpoch.toDouble(),
   );
 }

lib/data/models/browser_history_item.dart

@@ -1,5 +1,4 @@
 import 'package:app/data/models/browser_item.dart';
-import 'package:app/utils/utils.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:uuid/uuid.dart';
 
@@ -22,7 +21,7 @@ abstract class BrowserHistoryItem
     id: const Uuid().v4(),
     title: url.host,
     url: url,
-    visitTime: NtpTime.now(),
+    visitTime: DateTime.now(),
   );
 
   const BrowserHistoryItem._();