From 0647df37e3ad0d046c2620daf34bcf55aaaac501 Mon Sep 17 00:00:00 2001
From: Marcel <mtrnord1@gmail.com>
Date: Mon, 20 Jul 2020 15:16:23 +0200
Subject: [PATCH 1/2] [Test] Properly encode fake api responses as utf8. Also
 remove not needed returns as they do the same as the last return.

Took 15 minutes
---
 test/fake_matrix_api.dart | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart
index f61c9df..aa51514 100644
--- a/test/fake_matrix_api.dart
+++ b/test/fake_matrix_api.dart
@@ -68,30 +68,28 @@ class FakeMatrixApi extends MockClient {
           if (api.containsKey(method) && api[method].containsKey(action)) {
             res = api[method][action](data);
             if (res is Map && res.containsKey('errcode')) {
-              return Response(json.encode(res), 405);
+              return Response.bytes(utf8.encode(json.encode(res)), 405);
             }
           } else if (method == 'PUT' &&
               action.contains('/client/r0/sendToDevice/')) {
-            return Response(json.encode({}), 200);
+            return Response.bytes(utf8.encode(json.encode({})), 200);
           } else if (method == 'GET' &&
               action.contains('/client/r0/rooms/') &&
               action.contains('/state/m.room.member/')) {
             res = {'displayname': ''};
-            return Response(json.encode(res), 200);
           } else if (method == 'PUT' &&
               action.contains(
                   '/client/r0/rooms/%211234%3AfakeServer.notExisting/send/')) {
             res = {'event_id': '\$event${FakeMatrixApi.eventCounter++}'};
-            return Response(json.encode(res), 200);
           } else {
             res = {
               'errcode': 'M_UNRECOGNIZED',
               'error': 'Unrecognized request'
             };
-            return Response(json.encode(res), 405);
+            return Response.bytes(utf8.encode(json.encode(res)), 405);
           }
 
-          return Response(json.encode(res), 200);
+          return Response.bytes(utf8.encode(json.encode(res)), 200);
         });
 
   static Map<String, dynamic> messagesResponse = {

From 7690c4ef9cbee639d2b3cc52d1078c5674031419 Mon Sep 17 00:00:00 2001
From: Marcel <mtrnord1@gmail.com>
Date: Mon, 20 Jul 2020 15:21:46 +0200
Subject: [PATCH 2/2] [Fake API] Further reduce amount of returns

Took 5 minutes
---
 test/fake_matrix_api.dart | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart
index aa51514..2a149d4 100644
--- a/test/fake_matrix_api.dart
+++ b/test/fake_matrix_api.dart
@@ -47,6 +47,7 @@ class FakeMatrixApi extends MockClient {
           final dynamic data =
               method == 'GET' ? request.url.queryParameters : request.body;
           dynamic res = {};
+          var statusCode = 200;
 
           //print('\$method request to $action with Data: $data');
 
@@ -68,11 +69,11 @@ class FakeMatrixApi extends MockClient {
           if (api.containsKey(method) && api[method].containsKey(action)) {
             res = api[method][action](data);
             if (res is Map && res.containsKey('errcode')) {
-              return Response.bytes(utf8.encode(json.encode(res)), 405);
+              statusCode = 405;
             }
           } else if (method == 'PUT' &&
               action.contains('/client/r0/sendToDevice/')) {
-            return Response.bytes(utf8.encode(json.encode({})), 200);
+            res = {};
           } else if (method == 'GET' &&
               action.contains('/client/r0/rooms/') &&
               action.contains('/state/m.room.member/')) {
@@ -86,10 +87,10 @@ class FakeMatrixApi extends MockClient {
               'errcode': 'M_UNRECOGNIZED',
               'error': 'Unrecognized request'
             };
-            return Response.bytes(utf8.encode(json.encode(res)), 405);
+            statusCode = 405;
           }
 
-          return Response.bytes(utf8.encode(json.encode(res)), 200);
+          return Response.bytes(utf8.encode(json.encode(res)), statusCode);
         });
 
   static Map<String, dynamic> messagesResponse = {