Julian/various fixes contd

Dockerfile

@@ -63,11 +63,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "build-tools;36.0.0" \
+      "build-tools;37.0.0" \
       "platforms;android-32" \
       "platforms;android-33" \
       "platforms;android-34" \
       "platforms;android-35" \
       "platforms;android-36" \
+      "platforms;android-37" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \
@@ -148,11 +151,14 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
  && sdkmanager \
       "platform-tools" \
       "build-tools;35.0.0" \
+      "build-tools;36.0.0" \
+      "build-tools;37.0.0" \
       "platforms;android-32" \
       "platforms;android-33" \
       "platforms;android-34" \
       "platforms;android-35" \
       "platforms;android-36" \
+      "platforms;android-37" \
       "ndk;28.0.13004108" \
       "ndk;28.2.13676358" \
       "cmake;3.22.1" \

android/gradle.properties

@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+# Jetifier removed in AGP 9; all deps are AndroidX already.
+# Preserve Flutter's legacy Kotlin and Android DSL compatibility on AGP 9.
+android.newDsl=false
+android.builtInKotlin=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.11.1' apply false
-    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
+    id "com.android.application" version '9.1.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.3.20" apply false
 }
 
 include ":app"

lib/db/isar/main_db.dart

@@ -10,7 +10,6 @@
 
 import 'dart:io';
 
-import 'package:decimal/decimal.dart';
 import 'package:isar_community/isar.dart';
 import 'package:tuple/tuple.dart';
 
@@ -349,6 +348,7 @@ class MainDB {
               blockTime: utxo.blockTime,
               blockHeight: utxo.blockHeight,
               blockHash: utxo.blockHash,
+              otherData: utxo.otherData,
               // passing null keeps the stored value
               isBlocked: applyAutoBlock ? true : null,
               blockedReason: applyAutoBlock ? utxo.blockedReason : null,
@@ -463,52 +463,14 @@ class MainDB {
   //
   Future<void> deleteWalletBlockchainData(String walletId) async {
     await isar.writeTxn(() async {
-      final transactionCount = await getTransactions(walletId).count();
-      final transactionCountV2 = await isar.transactionV2s
-          .where()
-          .walletIdEqualTo(walletId)
-          .count();
-      final addressCount = await getAddresses(walletId).count();
-      final utxoCount = await getUTXOs(walletId).count();
-
-      const paginateLimit = 100;
-
       // transactions
-      for (int i = 0; i < transactionCount; i += paginateLimit) {
-        final txnIds = await getTransactions(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.transactions.deleteAll(txnIds);
-      }
-
+      await getTransactions(walletId).deleteAll();
       // transactions V2
-      for (int i = 0; i < transactionCountV2; i += paginateLimit) {
-        final txnIds = await isar.transactionV2s
-            .where()
-            .walletIdEqualTo(walletId)
-            .offset(i)
-            .limit(paginateLimit)
-            .idProperty()
-            .findAll();
-        await isar.transactionV2s.deleteAll(txnIds);
-      }
-
+      await isar.transactionV2s.where().walletIdEqualTo(walletId).deleteAll();
       // addresses
-      for (int i = 0; i < addressCount; i += paginateLimit) {
-        final addressIds = await getAddresses(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.addresses.deleteAll(addressIds);
-      }
-
+      await getAddresses(walletId).deleteAll();
       // utxos
-      for (int i = 0; i < utxoCount; i += paginateLimit) {
-        final utxoIds = await getUTXOs(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.utxos.deleteAll(utxoIds);
-      }
-
+      await getUTXOs(walletId).deleteAll();
       // spark coins
       await isar.sparkCoins
           .where()
@@ -518,28 +480,14 @@ class MainDB {
   }
 
   Future<void> deleteAddressLabels(String walletId) async {
-    final addressLabelCount = await getAddressLabels(walletId).count();
     await isar.writeTxn(() async {
-      const paginateLimit = 50;
-      for (int i = 0; i < addressLabelCount; i += paginateLimit) {
-        final labelIds = await getAddressLabels(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.addressLabels.deleteAll(labelIds);
-      }
+      await getAddressLabels(walletId).deleteAll();
     });
   }
 
   Future<void> deleteTransactionNotes(String walletId) async {
-    final noteCount = await getTransactionNotes(walletId).count();
     await isar.writeTxn(() async {
-      const paginateLimit = 50;
-      for (int i = 0; i < noteCount; i += paginateLimit) {
-        final labelIds = await getTransactionNotes(
-          walletId,
-        ).offset(i).limit(paginateLimit).idProperty().findAll();
-        await isar.transactionNotes.deleteAll(labelIds);
-      }
+      await getTransactionNotes(walletId).deleteAll();
     });
   }
 

lib/db/queries/queries.dart

@@ -42,12 +42,11 @@ extension MainDBQueries on MainDB {
     required CCFilter filter,
     required CCSortDescriptor sort,
     required String searchTerm,
+    required String locale,
     required CryptoCurrency cryptoCurrency,
   }) {
     var preSort = getUTXOs(walletId).filter().group((q) {
-      final qq = q.group(
-        (q) => q.usedIsNull().or().usedEqualTo(false),
-      );
+      final qq = q.group((q) => q.usedIsNull().or().usedEqualTo(false));
       switch (filter) {
         case CCFilter.frozen:
           return qq.and().isBlockedEqualTo(true);
@@ -59,39 +58,36 @@ extension MainDBQueries on MainDB {
     });
 
     if (searchTerm.isNotEmpty) {
-      preSort = preSort.and().group(
-        (q) {
-          var qq = q.addressContains(searchTerm, caseSensitive: false);
-
-          qq = qq.or().nameContains(searchTerm, caseSensitive: false);
-          qq = qq.or().group(
-                (q) => q
-                    .isBlockedEqualTo(true)
-                    .and()
-                    .blockedReasonContains(searchTerm, caseSensitive: false),
-              );
-
-          qq = qq.or().txidContains(searchTerm, caseSensitive: false);
-          qq = qq.or().blockHashContains(searchTerm, caseSensitive: false);
-
-          final maybeDecimal = Decimal.tryParse(searchTerm);
-          if (maybeDecimal != null) {
-            qq = qq.or().valueEqualTo(
-                  Amount.fromDecimal(
-                    maybeDecimal,
-                    fractionDigits: cryptoCurrency.fractionDigits,
-                  ).raw.toInt(),
-                );
-          }
-
-          final maybeInt = int.tryParse(searchTerm);
-          if (maybeInt != null) {
-            qq = qq.or().valueEqualTo(maybeInt);
-          }
-
-          return qq;
-        },
-      );
+      preSort = preSort.and().group((q) {
+        var qq = q.addressContains(searchTerm, caseSensitive: false);
+
+        qq = qq.or().nameContains(searchTerm, caseSensitive: false);
+        qq = qq.or().group(
+          (q) => q
+              .isBlockedEqualTo(true)
+              .and()
+              .blockedReasonContains(searchTerm, caseSensitive: false),
+        );
+
+        qq = qq.or().txidContains(searchTerm, caseSensitive: false);
+        qq = qq.or().blockHashContains(searchTerm, caseSensitive: false);
+
+        final maybeAmount = Amount.tryParseEditableAmount(
+          searchTerm,
+          locale: locale,
+          fractionDigits: cryptoCurrency.fractionDigits,
+        );
+        if (maybeAmount != null) {
+          qq = qq.or().valueEqualTo(maybeAmount.raw.toInt());
+        }
+
+        final maybeInt = int.tryParse(searchTerm);
+        if (maybeInt != null) {
+          qq = qq.or().valueEqualTo(maybeInt);
+        }
+
+        return qq;
+      });
     }
 
     final List<Id> ids;
@@ -114,12 +110,11 @@ extension MainDBQueries on MainDB {
     required CCFilter filter,
     required CCSortDescriptor sort,
     required String searchTerm,
+    required String locale,
     required CryptoCurrency cryptoCurrency,
   }) {
     var preSort = getUTXOs(walletId).filter().group((q) {
-      final qq = q.group(
-        (q) => q.usedIsNull().or().usedEqualTo(false),
-      );
+      final qq = q.group((q) => q.usedIsNull().or().usedEqualTo(false));
       switch (filter) {
         case CCFilter.frozen:
           return qq.and().isBlockedEqualTo(true);
@@ -131,39 +126,36 @@ extension MainDBQueries on MainDB {
     });
 
     if (searchTerm.isNotEmpty) {
-      preSort = preSort.and().group(
-        (q) {
-          var qq = q.addressContains(searchTerm, caseSensitive: false);
-
-          qq = qq.or().nameContains(searchTerm, caseSensitive: false);
-          qq = qq.or().group(
-                (q) => q
-                    .isBlockedEqualTo(true)
-                    .and()
-                    .blockedReasonContains(searchTerm, caseSensitive: false),
-              );
-
-          qq = qq.or().txidContains(searchTerm, caseSensitive: false);
-          qq = qq.or().blockHashContains(searchTerm, caseSensitive: false);
-
-          final maybeDecimal = Decimal.tryParse(searchTerm);
-          if (maybeDecimal != null) {
-            qq = qq.or().valueEqualTo(
-                  Amount.fromDecimal(
-                    maybeDecimal,
-                    fractionDigits: cryptoCurrency.fractionDigits,
-                  ).raw.toInt(),
-                );
-          }
-
-          final maybeInt = int.tryParse(searchTerm);
-          if (maybeInt != null) {
-            qq = qq.or().valueEqualTo(maybeInt);
-          }
-
-          return qq;
-        },
-      );
+      preSort = preSort.and().group((q) {
+        var qq = q.addressContains(searchTerm, caseSensitive: false);
+
+        qq = qq.or().nameContains(searchTerm, caseSensitive: false);
+        qq = qq.or().group(
+          (q) => q
+              .isBlockedEqualTo(true)
+              .and()
+              .blockedReasonContains(searchTerm, caseSensitive: false),
+        );
+
+        qq = qq.or().txidContains(searchTerm, caseSensitive: false);
+        qq = qq.or().blockHashContains(searchTerm, caseSensitive: false);
+
+        final maybeAmount = Amount.tryParseEditableAmount(
+          searchTerm,
+          locale: locale,
+          fractionDigits: cryptoCurrency.fractionDigits,
+        );
+        if (maybeAmount != null) {
+          qq = qq.or().valueEqualTo(maybeAmount.raw.toInt());
+        }
+
+        final maybeInt = int.tryParse(searchTerm);
+        if (maybeInt != null) {
+          qq = qq.or().valueEqualTo(maybeInt);
+        }
+
+        return qq;
+      });
     }
 
     final List<UTXO> utxos;

lib/db/special_migrations.dart

@@ -43,7 +43,9 @@ abstract class CampfireMigration {
       final myHive = HiveImpl();
       myHive.init(appDirectory.path);
       _wallets = await myHive.openBox<dynamic>('wallets');
-      _secureStore = const FlutterSecureStorage();
+      _secureStore = const FlutterSecureStorage(
+        aOptions: AndroidOptions(resetOnError: false, migrateWithBackup: true),
+      );
     } else {
       await setDidRun();
     }

lib/electrumx_rpc/electrumx_client.dart

@@ -210,8 +210,9 @@ class ElectrumXClient {
 
   Future<bool> _allow() async {
     if (_prefs.wifiOnly) {
-      return (await Connectivity().checkConnectivity()) ==
-          ConnectivityResult.wifi;
+      return (await Connectivity().checkConnectivity()).contains(
+        ConnectivityResult.wifi,
+      );
     }
     return true;
   }
@@ -519,7 +520,11 @@ class ElectrumXClient {
   /// Ping the server to ensure it is responding
   ///
   /// Returns true if ping succeeded
-  Future<bool> ping({String? requestID, int retryCount = 1}) async {
+  Future<bool> ping({
+    String? requestID,
+    int retryCount = 1,
+    Duration timeout = const Duration(seconds: 30),
+  }) async {
     try {
       // This doesn't work because electrum_adapter only returns the result:
       // (which is always `null`).
@@ -535,14 +540,15 @@ class ElectrumXClient {
       return await request(
             requestID: requestID,
             command: 'server.ping',
-            requestTimeout: const Duration(seconds: 30),
+            requestTimeout: timeout,
             retries: retryCount,
           ).timeout(
-            const Duration(seconds: 30),
+            timeout,
             onTimeout: () {
               Logging.instance.d(
                 "ElectrumxClient.ping timed out with retryCount=$retryCount, host=$_host",
               );
+              return false;
             },
           )
           as bool;

lib/main.dart

@@ -303,7 +303,12 @@ void main(List<String> args) async {
         await DbVersionMigrator().migrate(
           dbVersion,
           secureStore: const SecureStorageWrapper(
-            store: FlutterSecureStorage(),
+            store: FlutterSecureStorage(
+              aOptions: AndroidOptions(
+                resetOnError: false,
+                migrateWithBackup: true,
+              ),
+            ),
             isDesktop: false,
           ),
         );