Skip to content

Commit 0765081

Browse files
committed
fixes due to DIO upgrade
1 parent e758fe5 commit 0765081

File tree

5 files changed

+19
-15
lines changed

5 files changed

+19
-15
lines changed

lib/com/hydrologis/smash/import_export_plugins/import/gss/gss_import.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class _GssImportWidgetState extends State<GssImportWidget>
7171
* 100 = generic error
7272
*/
7373
int _status = 0;
74-
late String _genericErrorMessage;
74+
late String? _genericErrorMessage;
7575
late Map<String, String> tokenHeader;
7676

7777
Project? _selectedProject;
@@ -153,6 +153,7 @@ class _GssImportWidgetState extends State<GssImportWidget>
153153
});
154154
} on Exception catch (e, s) {
155155
if (e is DioError) {
156+
String emsg = e?.message ?? "";
156157
if (e.response != null) {
157158
var code = e.response?.statusCode;
158159
var msg = e.response?.statusMessage ?? "no message";
@@ -167,12 +168,12 @@ class _GssImportWidgetState extends State<GssImportWidget>
167168
});
168169
SMLogger().e(msg, e, s);
169170
}
170-
} else if (e.message.isNotEmpty) {
171+
} else if (emsg.isNotEmpty) {
171172
setState(() {
172-
_genericErrorMessage = e.message;
173+
_genericErrorMessage = emsg;
173174
_status = 100;
174175
});
175-
SMLogger().e(e.message, e, s);
176+
SMLogger().e(emsg, e, s);
176177
}
177178
} else {
178179
setState(() {
@@ -251,7 +252,7 @@ class _GssImportWidgetState extends State<GssImportWidget>
251252
child: Padding(
252253
padding: SmashUI.defaultPadding(),
253254
child: SmashUI.errorWidget(
254-
_genericErrorMessage),
255+
_genericErrorMessage!),
255256
),
256257
)
257258
: getOkView(context),

lib/com/hydrologis/smash/import_export_plugins/import/gss_2022/gss_2022_import.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ class _Gss2022ImportWidgetState extends State<Gss2022ImportWidget>
164164
});
165165
} on Exception catch (e, s) {
166166
if (e is DioError) {
167+
String emsg = e?.message ?? "";
167168
if (e.response != null) {
168169
var code = e.response?.statusCode;
169170
var msg = e.response?.statusMessage ?? "no message";
@@ -178,12 +179,12 @@ class _Gss2022ImportWidgetState extends State<Gss2022ImportWidget>
178179
});
179180
SMLogger().e(msg, e, s);
180181
}
181-
} else if (e.message.isNotEmpty) {
182+
} else if (emsg.isNotEmpty) {
182183
setState(() {
183-
_genericErrorMessage = e.message;
184+
_genericErrorMessage = emsg;
184185
_status = 100;
185186
});
186-
SMLogger().e(e.message, e, s);
187+
SMLogger().e(emsg, e, s);
187188
}
188189
} else {
189190
setState(() {

lib/com/hydrologis/smash/import_export_plugins/utils/gss_2022_utilities.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,16 +407,17 @@ class ProjectDataUploadListTileProgressWidgetState2022
407407

408408
void handleError(err) {
409409
if (err is DioError) {
410-
if (err.message.contains("403")) {
410+
String msg = err?.message ?? "";
411+
if (msg.contains("403")) {
411412
_errorString = IEL
412413
.of(context)
413414
.network_permissionOnServerDenied; //"Permission on server denied."
414-
} else if (err.message.contains("Connection refused")) {
415+
} else if (msg.contains("Connection refused")) {
415416
_errorString = IEL
416417
.of(context)
417418
.network_couldNotConnectToServer; //"Could not connect to the server. Is it online? Check your address."
418419
} else {
419-
_errorString = err.message;
420+
_errorString = msg;
420421
}
421422
} else {
422423
_errorString = err.toString();

lib/com/hydrologis/smash/import_export_plugins/utils/gss_utilities.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,16 +474,17 @@ class ProjectDataUploadListTileProgressWidgetState
474474

475475
void handleError(err) {
476476
if (err is DioError) {
477-
if (err.message.contains("403")) {
477+
String msg = err?.message ?? "";
478+
if (msg.contains("403")) {
478479
_errorString = IEL
479480
.of(context)
480481
.network_permissionOnServerDenied; //"Permission on server denied."
481-
} else if (err.message.contains("Connection refused")) {
482+
} else if (msg.contains("Connection refused")) {
482483
_errorString = IEL
483484
.of(context)
484485
.network_couldNotConnectToServer; //"Could not connect to the server. Is it online? Check your address."
485486
} else {
486-
_errorString = err.message;
487+
_errorString = msg;
487488
}
488489
} else {
489490
_errorString = err.toString();

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies:
2424
# path: ../smashlibs/
2525
git:
2626
url: https://github.com/moovida/smashlibs.git
27-
ref: 4b80b1d
27+
ref: 02331b9
2828

2929

3030
# apache 2

0 commit comments

Comments
 (0)