From 7ed6dcce67775924c91caa85d8805ea7c6b877d0 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Fri, 5 Jun 2020 17:12:50 +0200 Subject: [PATCH 1/4] fix canonical alias sometimes being null --- lib/src/room.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/room.dart b/lib/src/room.dart index 331d773e..b20888e9 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -367,7 +367,8 @@ class Room { } /// The address in the format: #roomname:homeserver.org. - String get canonicalAlias => states[EventTypes.RoomCanonicalAlias] != null + String get canonicalAlias => states[EventTypes.RoomCanonicalAlias] != null && + states[EventTypes.RoomCanonicalAlias].content['alias'] is String ? states[EventTypes.RoomCanonicalAlias].content['alias'] : ''; From f872d19692a2ec471aa15bf16169ddbf01f6b5d1 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Fri, 5 Jun 2020 17:20:18 +0000 Subject: [PATCH 2/4] fix client.api.upload not working --- lib/matrix_api/matrix_api.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matrix_api/matrix_api.dart b/lib/matrix_api/matrix_api.dart index 70b2e2a6..89068188 100644 --- a/lib/matrix_api/matrix_api.dart +++ b/lib/matrix_api/matrix_api.dart @@ -1326,7 +1326,7 @@ class MatrixApi { headers['Content-Type'] = contentType ?? mime(fileName); fileName = Uri.encodeQueryComponent(fileName); final url = - '$homeserver.toString()/_matrix/media/r0/upload?filename=$fileName'; + '${homeserver.toString()}/_matrix/media/r0/upload?filename=$fileName'; final streamedRequest = http.StreamedRequest('POST', Uri.parse(url)) ..headers.addAll(headers); streamedRequest.contentLength = await file.length; From 3056eeb9bcdc83dd6e4a890ff2fea93bcfbb80b3 Mon Sep 17 00:00:00 2001 From: Niklas Zender Date: Tue, 9 Jun 2020 10:10:23 +0000 Subject: [PATCH 3/4] Update Dart Version --- .gitlab-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c81333a..36458ff1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,10 @@ coverage: script: - apt update - apt install -y curl gnupg2 git - - curl https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/linux_packages/dart_2.7.2-1_amd64.deb > dart.deb - - apt install -y ./dart.deb + - curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + - curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list - apt update - - apt install -y chromium lcov libolm3 sqlite3 libsqlite3-dev + - apt install -y dart chromium lcov libolm3 sqlite3 libsqlite3-dev - ln -s /usr/lib/dart/bin/pub /usr/bin/ - useradd -m test - chown -R 'test:' '.' @@ -27,19 +27,19 @@ coverage: paths: - coverage/ - coverage_without_olm: tags: - linux stage: coverage image: debian:testing - coverage: '/^\s+lines.+: (\d+.\d*%)/' dependencies: [] script: - apt update - - apt install -y curl git sqlite3 libsqlite3-dev - - curl https://storage.googleapis.com/dart-archive/channels/stable/release/2.7.2/linux_packages/dart_2.7.2-1_amd64.deb > dart.deb - - apt install -y ./dart.deb + - apt install -y curl gnupg2 git sqlite3 libsqlite3-dev + - curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + - curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list + - apt update + - apt install -y dart - ln -s /usr/lib/dart/bin/pub /usr/bin/ - useradd -m test - chown -R 'test:' '.' @@ -101,5 +101,4 @@ pages: paths: - public only: - - master - \ No newline at end of file + - master \ No newline at end of file From 0e33634e1a0caf325eefdd17a44162ec1e8d56d9 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Tue, 9 Jun 2020 16:05:41 +0000 Subject: [PATCH 4/4] Fix request openID --- lib/matrix_api/matrix_api.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/matrix_api/matrix_api.dart b/lib/matrix_api/matrix_api.dart index 89068188..582e5431 100644 --- a/lib/matrix_api/matrix_api.dart +++ b/lib/matrix_api/matrix_api.dart @@ -1972,6 +1972,7 @@ class MatrixApi { final response = await request( RequestType.POST, '/client/r0/user/${Uri.encodeComponent(userId)}/openid/request_token', + data: {}, ); return OpenIdCredentials.fromJson(response); }