diff --git a/packages/devtools_app/lib/src/http/http_request_data.dart b/packages/devtools_app/lib/src/http/http_request_data.dart index 095a7c88faa..59a58beda1b 100644 --- a/packages/devtools_app/lib/src/http/http_request_data.dart +++ b/packages/devtools_app/lib/src/http/http_request_data.dart @@ -69,16 +69,24 @@ class HttpRequestData extends NetworkRequest { } } + // Stitch together response as it may have been sent in multiple chunks. + final encodedData = []; for (final event in responseEvents) { final traceEvent = TraceEvent(event); // TODO(kenz): do we need to do something with the other response events // (phases 'b' and 'e')? if (traceEvent.phase == TraceEvent.asyncInstantPhase && traceEvent.name == 'Response body') { - final encodedData = (traceEvent.args['data'] as List).cast(); + encodedData.addAll((traceEvent.args['data'] as List).cast()); + } + } + + try { + if (encodedData.isNotEmpty) { responseBody = utf8.decode(encodedData); - break; } + } on FormatException { + // Non-UTF8 response. } final data = HttpRequestData._( diff --git a/packages/devtools_app/macos/Flutter/Flutter-Debug.xcconfig b/packages/devtools_app/macos/Flutter/Flutter-Debug.xcconfig index 785633d3a86..6064f7d5a2a 100644 --- a/packages/devtools_app/macos/Flutter/Flutter-Debug.xcconfig +++ b/packages/devtools_app/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1,3 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/devtools_app/macos/Flutter/Flutter-Release.xcconfig b/packages/devtools_app/macos/Flutter/Flutter-Release.xcconfig index 5fba960c3af..d583bc140dd 100644 --- a/packages/devtools_app/macos/Flutter/Flutter-Release.xcconfig +++ b/packages/devtools_app/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1,3 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/packages/devtools_app/pubspec.lock b/packages/devtools_app/pubspec.lock index a790b9d955d..2db534d1c94 100644 --- a/packages/devtools_app/pubspec.lock +++ b/packages/devtools_app/pubspec.lock @@ -554,7 +554,7 @@ packages: source: hosted version: "1.2.0" string_scanner: - dependency: transitive + dependency: "direct main" description: name: string_scanner url: "https://pub.dartlang.org" @@ -709,4 +709,4 @@ packages: version: "2.2.1" sdks: dart: ">=2.12.0-0.0 <3.0.0" - flutter: ">=1.22.0 <2.0.0" + flutter: ">=1.22.0"