matrix.h: change NUM_DEVICES, add masterKey and verified, add HandleSync/HandleEvent

diff --git a/src/matrix.h b/src/matrix.h
index c07c742b0f6463a841d5f7810933d7c1d93c25c6..81b61702d5a4178288c33f011f79936f8917e75e 100644 (file)
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -23,6 +23,7 @@
 #define DEVICE_KEY_SIZE 44\r
 #define SIGNING_KEY_SIZE 44\r
 #define ONETIME_KEY_SIZE 44\r
+#define MASTER_KEY_SIZE 44\r
 \r
 #define KEY_SHARE_EVENT_LEN 1024\r
 \r
@@ -49,7 +50,7 @@
 \r
 #define NUM_MEGOLM_SESSIONS 2\r
 #define NUM_OLM_SESSIONS 2\r
-#define NUM_DEVICES 5\r
+#define NUM_DEVICES 10\r
 \r
 // HTTP\r
 \r
@@ -60,10 +61,6 @@ MatrixHttpInit(
     MatrixHttpConnection ** hc,\r
     const char * host);\r
 \r
-// bool\r
-// MatrixHttpConnect(\r
-//     MatrixHttpConnection * hc);\r
-\r
 bool\r
 MatrixHttpDeinit(\r
     MatrixHttpConnection ** hc);\r
@@ -227,18 +224,6 @@ MatrixMegolmOutSessionEncrypt(
     const char * plaintext,\r
     char * outBuffer, int outBufferCap);\r
 \r
-bool\r
-MatrixMegolmOutSessionSave(\r
-    MatrixMegolmOutSession * session,\r
-    const char * filename,\r
-    const char * key);\r
-    \r
-bool\r
-MatrixMegolmOutSessionLoad(\r
-    MatrixMegolmOutSession * session,\r
-    const char * filename,\r
-    const char * key);\r
-\r
 \r
 // Matrix Client\r
 \r
@@ -263,6 +248,9 @@ typedef struct MatrixClient {
     char deviceId[DEVICE_ID_SIZE];\r
     char expireMs[EXPIRE_MS_SIZE];\r
     char refreshToken[REFRESH_TOKEN_SIZE];\r
+    char masterKey[MASTER_KEY_SIZE];\r
+\r
+    bool verified;\r
 \r
     MatrixHttpConnection * hc;\r
 } MatrixClient;\r
@@ -271,16 +259,6 @@ bool
 MatrixClientInit(\r
     MatrixClient * client);\r
 \r
-bool\r
-MatrixClientSave(\r
-    MatrixClient * client,\r
-    const char * filename);\r
-\r
-bool\r
-MatrixClientLoad(\r
-    MatrixClient * client,\r
-    const char * filename);\r
-\r
 bool\r
 MatrixClientSetAccessToken(\r
     MatrixClient * client,\r
@@ -306,7 +284,7 @@ MatrixClientUploadOnetimeKeys(
     MatrixClient * client);\r
 \r
 bool\r
-MatrixClientUploadDeviceKey(\r
+MatrixClientUploadDeviceKeys(\r
     MatrixClient * client);\r
 \r
 bool\r
@@ -337,11 +315,22 @@ MatrixClientSendEventEncrypted(
     const char * msgType,\r
     const char * msgBody);\r
 \r
+void\r
+HandleEvent(\r
+    MatrixClient * client,\r
+    const char * event, int eventLen);\r
+\r
+void\r
+HandleRoomEvent(\r
+    MatrixClient * client,\r
+    const char * room, int roomLen,\r
+    const char * event, int eventLen);\r
+\r
 bool\r
 MatrixClientSync(\r
     MatrixClient * client,\r
-    char * outSync, int outSyncCap,\r
-    const char * nextBatch);\r
+    char * outSyncBuffer, int outSyncCap,\r
+    char * nextBatch, int nextBatchCap);\r
 \r
 bool\r
 MatrixClientGetRoomEvent(\r
@@ -456,6 +445,11 @@ MatrixClientRequestSigningKey(
     const char * deviceId,\r
     char * outSigningKey, int outSigningKeyCap);\r
 \r
+bool\r
+MatrixClientRequestMasterKey(\r
+    MatrixClient * client,\r
+    char * outMasterKey, int outMasterKeyCap);\r
+\r
 bool\r
 MatrixClientRequestDeviceKeys(\r
     MatrixClient * client);\r