@samitouri / QOSAMI-cakewallet-1 / commits / 82b65e893

Fix normal wallets showing export outputs QR code (#1952)

cyan committed Jan 11, 2025 at 21:35 UTC 82b65e8934f6e31ef945a13b9295c42a3c207218
5 files changed +28 -79
cw_monero/lib/monero_wallet.dart
+3
@@ -265,6 +265,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
265 }
266
267 bool needExportOutputs(int amount) {
268 + if (int.tryParse(monero.Wallet_secretSpendKey(wptr!)) != 0) {
269 + return false;
270 + }
271 // viewOnlyBalance - balance that we can spend
272 // TODO(mrcyjanek): remove hasUnknownKeyImages when we cleanup coin control
273 return (monero.Wallet_viewOnlyBalance(wptr!,
ios/Podfile.lock
+25 -75
@@ -3,38 +3,6 @@ PODS:
3 - Flutter
4 - ReachabilitySwift
5 - CryptoSwift (1.8.3)
6 - - cw_haven (0.0.1):
7 - - cw_haven/Boost (= 0.0.1)
8 - - cw_haven/Haven (= 0.0.1)
9 - - cw_haven/OpenSSL (= 0.0.1)
10 - - cw_haven/Sodium (= 0.0.1)
11 - - cw_shared_external
12 - - Flutter
13 - - cw_haven/Boost (0.0.1):
14 - - cw_shared_external
15 - - Flutter
16 - - cw_haven/Haven (0.0.1):
17 - - cw_shared_external
18 - - Flutter
19 - - cw_haven/OpenSSL (0.0.1):
20 - - cw_shared_external
21 - - Flutter
22 - - cw_haven/Sodium (0.0.1):
23 - - cw_shared_external
24 - - Flutter
25 - - cw_mweb (0.0.1):
26 - - Flutter
27 - - cw_shared_external (0.0.1):
28 - - cw_shared_external/Boost (= 0.0.1)
29 - - cw_shared_external/OpenSSL (= 0.0.1)
30 - - cw_shared_external/Sodium (= 0.0.1)
31 - - Flutter
32 - - cw_shared_external/Boost (0.0.1):
33 - - Flutter
34 - - cw_shared_external/OpenSSL (0.0.1):
35 - - Flutter
36 - - cw_shared_external/Sodium (0.0.1):
37 - - Flutter
6 - device_display_brightness (0.0.1):
7 - Flutter
8 - device_info_plus (0.0.1):
@@ -117,8 +85,6 @@ PODS:
85 - shared_preferences_foundation (0.0.1):
86 - Flutter
87 - FlutterMacOS
120 - - sp_scanner (0.0.1):
121 - - Flutter
88 - SwiftyGif (5.4.5)
89 - Toast (4.1.1)
90 - uni_links (0.0.1):
@@ -136,9 +102,6 @@ PODS:
102 DEPENDENCIES:
103 - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
104 - CryptoSwift
139 - - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
140 - - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
141 - - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
105 - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
106 - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
107 - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
@@ -158,7 +121,6 @@ DEPENDENCIES:
121 - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
122 - share_plus (from `.symlinks/plugins/share_plus/ios`)
123 - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
161 - - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
124 - uni_links (from `.symlinks/plugins/uni_links/ios`)
125 - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
126 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -179,12 +141,6 @@ SPEC REPOS:
141 EXTERNAL SOURCES:
142 connectivity_plus:
143 :path: ".symlinks/plugins/connectivity_plus/ios"
182 - cw_haven:
183 - :path: ".symlinks/plugins/cw_haven/ios"
184 - cw_mweb:
185 - :path: ".symlinks/plugins/cw_mweb/ios"
186 - cw_shared_external:
187 - :path: ".symlinks/plugins/cw_shared_external/ios"
144 device_display_brightness:
145 :path: ".symlinks/plugins/device_display_brightness/ios"
146 device_info_plus:
@@ -223,8 +179,6 @@ EXTERNAL SOURCES:
179 :path: ".symlinks/plugins/share_plus/ios"
180 shared_preferences_foundation:
181 :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
226 - sp_scanner:
227 - :path: ".symlinks/plugins/sp_scanner/ios"
182 uni_links:
183 :path: ".symlinks/plugins/uni_links/ios"
184 universal_ble:
@@ -237,44 +191,40 @@ EXTERNAL SOURCES:
191 :path: ".symlinks/plugins/workmanager/ios"
192
193 SPEC CHECKSUMS:
240 - connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
194 + connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf
195 CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
242 - cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
243 - cw_mweb: 87af74f9659fed0c1a2cbfb44413f1070e79e3ae
244 - cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
245 - device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
246 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
247 - devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
196 + device_display_brightness: 04374ebd653619292c1d996f00f42877ea19f17f
197 + device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
198 + devicelocale: bd64aa714485a8afdaded0892c1e7d5b7f680cf8
199 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
200 DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
250 - fast_scanner: 44c00940355a51258cd6c2085734193cd23d95bc
251 - file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
201 + fast_scanner: 2cb1ad3e69e645e9980fb4961396ce5804caa3e3
202 + file_picker: 07c75322ede1d47ec9bb4ac82b27c94d3598251a
203 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
253 - flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
254 - flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
255 - flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
256 - flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
257 - fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
258 - in_app_review: a31b5257259646ea78e0e35fc914979b0031d011
259 - integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
204 + flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
205 + flutter_local_authentication: 989278c681612f1ee0e36019e149137f114b9d7f
206 + flutter_mailer: 3a8cd4f36c960fb04528d5471097270c19fec1c4
207 + flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
208 + fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
209 + in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
210 + integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
211 OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
261 - package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
262 - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
263 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
212 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
213 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
214 + permission_handler_apple: 3787117e48f80715ff04a3830ca039283d6a4f29
215 ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
216 SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
266 - sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
267 - share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
268 - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
269 - sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
217 + sensitive_clipboard: 161e9abc3d56b3131309d8a321eb4690a803c16b
218 + share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
219 + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
220 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
221 Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
272 - uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
273 - universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
274 - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
275 - wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
276 - workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
222 + uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
223 + universal_ble: ff19787898040d721109c6324472e5dd4bc86adc
224 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
225 + wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
226 + workmanager: 01be2de7f184bd15de93a1812936a2b7f42ef07e
227
228 PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597
229
280 -COCOAPODS: 1.15.2
230 +COCOAPODS: 1.16.2
linux/flutter/generated_plugins.cmake
-1
@@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
10 )
11
12 list(APPEND FLUTTER_FFI_PLUGIN_LIST
13 - sp_scanner
13 )
14
15 set(PLUGIN_BUNDLED_LIBRARIES)
macos/Flutter/GeneratedPluginRegistrant.swift
-2
@@ -6,7 +6,6 @@ import FlutterMacOS
6 import Foundation
7
8 import connectivity_plus
9 -import cw_mweb
9 import device_info_plus
10 import devicelocale
11 import fast_scanner
@@ -24,7 +23,6 @@ import wakelock_plus
23
24 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
25 ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
27 - CwMwebPlugin.register(with: registry.registrar(forPlugin: "CwMwebPlugin"))
26 DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
27 DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
28 MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
windows/flutter/generated_plugins.cmake
-1
@@ -14,7 +14,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
14 )
15
16 list(APPEND FLUTTER_FFI_PLUGIN_LIST
17 - sp_scanner
17 )
18
19 set(PLUGIN_BUNDLED_LIBRARIES)