From 215563ab9261ba3e6873625ee36e15724c1100da Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sat, 15 Aug 2020 15:10:36 +0200
Subject: [PATCH] Fix wrong call types

---
 lib/matrix_api/model/event_types.dart | 8 ++++----
 lib/src/client.dart                   | 8 ++++----
 test/fake_matrix_api.dart             | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/matrix_api/model/event_types.dart b/lib/matrix_api/model/event_types.dart
index 25f4585..f08927a 100644
--- a/lib/matrix_api/model/event_types.dart
+++ b/lib/matrix_api/model/event_types.dart
@@ -36,9 +36,9 @@ abstract class EventTypes {
   static const String HistoryVisibility = 'm.room.history_visibility';
   static const String Encryption = 'm.room.encryption';
   static const String Encrypted = 'm.room.encrypted';
-  static const String CallInvite = 'm.room.call.invite';
-  static const String CallAnswer = 'm.room.call.answer';
-  static const String CallCandidates = 'm.room.call.candidates';
-  static const String CallHangup = 'm.room.call.hangup';
+  static const String CallInvite = 'm.call.invite';
+  static const String CallAnswer = 'm.call.answer';
+  static const String CallCandidates = 'm.call.candidates';
+  static const String CallHangup = 'm.call.hangup';
   static const String Unknown = 'm.unknown';
 }
diff --git a/lib/src/client.dart b/lib/src/client.dart
index cddb65e..e625d45 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -981,13 +981,13 @@ class Client extends MatrixApi {
       }
       onEvent.add(update);
 
-      if (event['type'] == 'm.call.invite') {
+      if (event['type'] == EventTypes.CallInvite) {
         onCallInvite.add(Event.fromJson(event, room, sortOrder));
-      } else if (event['type'] == 'm.call.hangup') {
+      } else if (event['type'] == EventTypes.CallHangup) {
         onCallHangup.add(Event.fromJson(event, room, sortOrder));
-      } else if (event['type'] == 'm.call.answer') {
+      } else if (event['type'] == EventTypes.CallAnswer) {
         onCallAnswer.add(Event.fromJson(event, room, sortOrder));
-      } else if (event['type'] == 'm.call.candidates') {
+      } else if (event['type'] == EventTypes.CallCandidates) {
         onCallCandidates.add(Event.fromJson(event, room, sortOrder));
       }
     }
diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart
index 2dec135..2400de2 100644
--- a/test/fake_matrix_api.dart
+++ b/test/fake_matrix_api.dart
@@ -1992,13 +1992,13 @@ class FakeMatrixApi extends MockClient {
           (var req) => {},
       '/client/r0/rooms/!localpart%3Aserver.abc/state/m.room.guest_access':
           (var req) => {},
-      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.room.call.invite/1234':
+      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.call.invite/1234':
           (var req) => {},
-      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.room.call.answer/1234':
+      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.call.answer/1234':
           (var req) => {},
-      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.room.call.candidates/1234':
+      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.call.candidates/1234':
           (var req) => {},
-      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.room.call.hangup/1234':
+      '/client/r0/rooms/!localpart%3Aserver.abc/send/m.call.hangup/1234':
           (var req) => {},
       '/client/r0/rooms/!1234%3Aexample.com/redact/1143273582443PhrSn%3Aexample.org/1234':
           (var req) => {'event_id': '1234'},