Payjoin [WIP]

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,9 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {

android/build.gradle

@@ -23,6 +23,31 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+subprojects {
+    afterEvaluate { project ->
+        if (project.extensions.findByName("android") != null) {
+            Integer pluginCompileSdk = project.android.compileSdk
+            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
+                project.logger.error(
+                        "Warning: Overriding compileSdk version in Flutter plugin: "
+                                + project.name
+                                + " from "
+                                + pluginCompileSdk
+                                + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
+                                + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
+                                + project.name
+                                + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
+                )
+                project.android {
+                    compileSdk 31
+                }
+            }
+        }
+    }
+
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.evaluationDependsOn(":app")
+}
 subprojects {
     project.evaluationDependsOn(':app')
 }

android/settings.gradle

@@ -1,15 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
 }
+
+include ":app"

cw_bitcoin/lib/bitcoin_address_record.dart

@@ -19,7 +19,8 @@ abstract class BaseBitcoinAddressRecord {
         _isUsed = isUsed;
 
   @override
-  bool operator ==(Object o) => o is BaseBitcoinAddressRecord && address == o.address;
+  bool operator ==(Object o) =>
+      o is BaseBitcoinAddressRecord && address == o.address;
 
   final String address;
   bool isHidden;
@@ -65,9 +66,12 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
     String? scriptHash,
     required super.network,
   }) : scriptHash = scriptHash ??
-            (network != null ? BitcoinAddressUtils.scriptHash(address, network: network) : null);
+            (network != null
+                ? BitcoinAddressUtils.scriptHash(address, network: network)
+                : null);
 
-  factory BitcoinAddressRecord.fromJSON(String jsonSource, {BasedUtxoNetwork? network}) {
+  factory BitcoinAddressRecord.fromJSON(String jsonSource,
+      {BasedUtxoNetwork? network}) {
     final decoded = json.decode(jsonSource) as Map;
 
     return BitcoinAddressRecord(
@@ -79,8 +83,8 @@ class BitcoinAddressRecord extends BaseBitcoinAddressRecord {
       name: decoded['name'] as String? ?? '',
       balance: decoded['balance'] as int? ?? 0,
       type: decoded['type'] != null && decoded['type'] != ''
-          ? BitcoinAddressType.values
-              .firstWhere((type) => type.toString() == decoded['type'] as String)
+          ? BitcoinAddressType.values.firstWhere(
+              (type) => type.toString() == decoded['type'] as String)
           : SegwitAddresType.p2wpkh,
       scriptHash: decoded['scriptHash'] as String?,
       network: network,
@@ -140,8 +144,8 @@ class BitcoinSilentPaymentAddressRecord extends BaseBitcoinAddressRecord {
           : BasedUtxoNetwork.fromName(decoded['network'] as String),
       silentPaymentTweak: decoded['silent_payment_tweak'] as String?,
       type: decoded['type'] != null && decoded['type'] != ''
-          ? BitcoinAddressType.values
-              .firstWhere((type) => type.toString() == decoded['type'] as String)
+          ? BitcoinAddressType.values.firstWhere(
+              (type) => type.toString() == decoded['type'] as String)
           : SilentPaymentsAddresType.p2sp,
     );
   }