Another beautiful day fixes and changed version again!

M committed Jan 12, 2021 at 20:58 UTC 7ba379f388d2b800158bd4522afff56c51862199
3 files changed +8 -11
ios/Runner.xcodeproj/project.pbxproj
+3 -3
@@ -354,7 +354,7 @@
354 buildSettings = {
355 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356 CLANG_ENABLE_MODULES = YES;
357 - CURRENT_PROJECT_VERSION = 16;
357 + CURRENT_PROJECT_VERSION = 17;
358 DEVELOPMENT_TEAM = 32J6BB6VUS;
359 ENABLE_BITCODE = NO;
360 FRAMEWORK_SEARCH_PATHS = (
@@ -494,7 +494,7 @@
494 buildSettings = {
495 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
496 CLANG_ENABLE_MODULES = YES;
497 - CURRENT_PROJECT_VERSION = 16;
497 + CURRENT_PROJECT_VERSION = 17;
498 DEVELOPMENT_TEAM = 32J6BB6VUS;
499 ENABLE_BITCODE = NO;
500 FRAMEWORK_SEARCH_PATHS = (
@@ -528,7 +528,7 @@
528 buildSettings = {
529 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
530 CLANG_ENABLE_MODULES = YES;
531 - CURRENT_PROJECT_VERSION = 16;
531 + CURRENT_PROJECT_VERSION = 17;
532 DEVELOPMENT_TEAM = 32J6BB6VUS;
533 ENABLE_BITCODE = NO;
534 FRAMEWORK_SEARCH_PATHS = (
lib/bitcoin/electrum.dart
+4 -7
@@ -37,7 +37,8 @@ class ElectrumClient {
37 ElectrumClient()
38 : _id = 0,
39 _isConnected = false,
40 - _tasks = {};
40 + _tasks = {},
41 + unterminatedString = '';
42
43 static const connectionTimeout = Duration(seconds: 5);
44 static const aliveTimerDuration = Duration(seconds: 2);
@@ -80,11 +81,7 @@ class ElectrumClient {
81 } on FormatException catch (e) {
82 final msg = e.message.toLowerCase();
83
83 - if (msg == 'Unterminated string'.toLowerCase()) {
84 - unterminatedString = e.source as String;
85 - }
86 -
87 - if (msg == 'Unexpected character'.toLowerCase()) {
84 + if (e.source is String) {
85 unterminatedString += e.source as String;
86 }
87
@@ -97,7 +94,7 @@ class ElectrumClient {
94 final response =
95 json.decode(unterminatedString) as Map<String, Object>;
96 _handleResponse(response);
100 - unterminatedString = null;
97 + unterminatedString = '';
98 }
99 } on TypeError catch (e) {
100 if (!e.toString().contains('Map<String, Object>')) {
pubspec.yaml
+1 -1
@@ -11,7 +11,7 @@ description: Cake Wallet.
11 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
12 # Read more about iOS versioning at
13 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
14 -version: 4.1.0+32
14 +version: 4.1.0+33
15
16 environment:
17 sdk: ">=2.7.0 <3.0.0"