Merge pull request #885 from SatoshiPortal/develop

5.0.3

Author: i5hi

android/app/build.gradle

@@ -23,7 +23,7 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '
 
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     ndkVersion flutter.ndkVersion
     compileOptions {
@@ -43,7 +43,7 @@ android {
         applicationId = 'com.bullbitcoin.mobile'
         minSdkVersion 24
         // TODO: targetSdkVersion flutter.targetSdkVersion
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/build.gradle

@@ -8,8 +8,8 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
             project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdk = 34
-                buildToolsVersion "34.0.0"
+                compileSdk = 35
+                buildToolsVersion "35.0.0"
             }
         }
         if (project.hasProperty('android')) {

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.5.0" apply false
+    id "com.android.application" version "8.6.0" apply false
     id "org.jetbrains.kotlin.android" version "1.9.20" apply false
 }
 

assets/QR-Placeholder.png

@@ -16,6 +16,8 @@ PODS:
   - boltz (0.1.6)
   - camera_avfoundation (0.0.1):
     - Flutter
+  - dart_bbqr (0.0.1):
+    - Flutter
   - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
@@ -140,6 +142,7 @@ DEPENDENCIES:
   - bip85 (from `.symlinks/plugins/bip85/ios`)
   - boltz (from `.symlinks/plugins/boltz/ios`)
   - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`)
+  - dart_bbqr (from `.symlinks/plugins/dart_bbqr/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
@@ -183,6 +186,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/boltz/ios"
   camera_avfoundation:
     :path: ".symlinks/plugins/camera_avfoundation/ios"
+  dart_bbqr:
+    :path: ".symlinks/plugins/dart_bbqr/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
@@ -221,39 +226,40 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
   AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
-  bdk_flutter: cef9180019b4c6b67a3e3dfb74611683fe140107
-  bip85: 3059e217a3a606a100dd244f21d2fc61b0a1aa83
+  bdk_flutter: 86c9ba59ee282dee08c3a29599abe867d10a8b10
+  bip85: f656a7e6b23afda4960efb11c87d51d68e8be3db
   boltz: 6388ec2412f3753b63a9e65c97f87ea26f43bddc
-  camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
+  camera_avfoundation: adb0207d868b2d873e895371d88448399ab78d87
+  dart_bbqr: 10143a83ef3919f9ac06974e3bbe23cac4abc39b
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
+  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  google_sign_in_ios: b48bb9af78576358a168361173155596c845f0b9
+  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
+  google_sign_in_ios: 7411fab6948df90490dc4620ecbcabdc3ca04017
   GoogleSignIn: ce8c89bb9b37fb624b92e7514cc67335d1e277e4
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   lwk: 22e06bc5664247d6b2dac91cfe209b63b70dd580
-  no_screenshot: 6d183496405a3ab709a67a54e5cd0f639e94729e
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  no_screenshot: 67d110f12466f4913b488803d4e498d03ef2889e
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   payjoin_flutter: 6397d7b698cdad6453be4949ab6aca1863f6c5e5
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   ScreenProtectorKit: 83a6281b02c7a5902ee6eac4f5045f674e902ae4
   SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   sqlite3: 3c950dc86011117c307eb0b28c4a7bb449dce9f1
-  sqlite3_flutter_libs: 74334e3ef2dbdb7d37e50859bb45da43935779c4
+  sqlite3_flutter_libs: e702a3214d49107c89b40bd2777c14057531d149
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  tor: 767208930250ef7be241963b75568c55c0a81890
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  webview_cookie_manager: d63a76cabdf42a7ea3d92768ac67d4853a1367f8
-  webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
+  tor: 662a9f5b980b5c86decb8ba611de9bcd4c8286eb
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
+  webview_flutter_wkwebview: a4af96a051138e28e29f60101d094683b9f82188
 
 PODFILE CHECKSUM: 38934b16624b4fa72035a092e777e96d352e7058
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2

ios/Podfile.lock

@@ -1,18 +1,21 @@
-import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
+import 'dart:io' show SecureSocket;
 
+import 'package:bb_mobile/core/electrum/data/models/electrum_server_model.dart';
 import 'package:convert/convert.dart';
 
-class ElectrumService {
-  final String host;
-  final int port;
+class ElectrumRemoteDatasource {
+  final ElectrumServerModel _server;
+  late Uri _uri;
 
-  ElectrumService({required this.host, this.port = 50001});
+  ElectrumRemoteDatasource({required ElectrumServerModel server})
+    : _server = server {
+    _uri = Uri.parse(_server.url);
+  }
 
   Future<List<int>> getTransaction(String txid) async {
     try {
-      final socket = await SecureSocket.connect(host, port);
+      final socket = await SecureSocket.connect(_uri.host, _uri.port);
 
       final request = {
         'id': 1,

…e/transaction/data/electrum_service.dart …asources/electrum_remote_datasource.dartlib/core/transaction/data/electrum_service.dart renamed to lib/core/electrum/data/datasources/electrum_remote_datasource.dart lib/core/transaction/data/electrum_service.dart renamed to lib/core/electrum/data/datasources/electrum_remote_datasource.dart

@@ -4,11 +4,11 @@ import 'package:bb_mobile/core/exchange/data/models/api_key_model.dart';
 class GetApiKeyUsecase {
   final ApiKeyStorageDatasource _apiKeyStorage;
 
-  GetApiKeyUsecase({
-    required ApiKeyStorageDatasource apiKeyStorage,
-  }) : _apiKeyStorage = apiKeyStorage;
+  GetApiKeyUsecase({required ApiKeyStorageDatasource apiKeyStorage})
+    : _apiKeyStorage = apiKeyStorage;
 
   Future<ExchangeApiKeyModel?> execute() async {
+    // await _apiKeyStorage.delete();
     return await _apiKeyStorage.get();
   }
 }

lib/core/exchange/domain/usecases/get_api_key_usecase.dart

@@ -31,8 +31,10 @@ class PayjoinLocator {
   }
 
   static void registerRepositories() {
-    locator.registerLazySingleton<PayjoinRepository>(
-      () => PayjoinRepositoryImpl(
+    // Not a lazy singleton, because it should resume payjoins from the
+    // moment the app starts.
+    locator.registerSingleton<PayjoinRepository>(
+      PayjoinRepositoryImpl(
         localPayjoinDatasource: locator<LocalPayjoinDatasource>(),
         pdkPayjoinDatasource: locator<PdkPayjoinDatasource>(),
         walletMetadataDatasource: locator<WalletMetadataDatasource>(),