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

[matrix_esp_thesis] / examples / Decrypt.c

diff --git a/examples/Decrypt.c b/examples/Decrypt.c
index ec320f00db6631c0a3eff988ff910d77edbc8f44..79236936114cec70689f2357b7b39570aa31b84e 100644 (file)
--- a/examples/Decrypt.c
+++ b/examples/Decrypt.c
@@ -26,10 +26,9 @@ int
 main(void)\r
 {\r
     MatrixClient client;\r
-    MatrixClientInit(&client,\r
-        SERVER);\r
+    MatrixClientInit(&client);\r
     \r
-    MatrixHttpInit(&client);\r
+    MatrixHttpInit(&client.hc, SERVER);\r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
 \r
@@ -42,7 +41,7 @@ main(void)
 \r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
-    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadDeviceKeys(&client);\r
 \r
     static char eventBuffer[1024];\r
     MatrixClientGetRoomEvent(&client,\r
@@ -94,8 +93,7 @@ main(void)
         128);\r
     GetLine(keyStartJson, 1024);\r
     printf("keyStartJson: %s\n", keyStartJson);\r
-    int concatLen =\r
-        snprintf(concat, 1024, "%s%s", publicKey, keyStartJson);\r
+    snprintf(concat, 1024, "%s%s", publicKey, keyStartJson);\r
     printf("concat: %s\n", concat);\r
     olm_sha256(olmUtil, concat, strlen(concat), commitment, 256);\r
     printf("hash: %s\n", commitment);\r
@@ -290,15 +288,12 @@ main(void)
 \r
     getchar();\r
     \r
-    MatrixMegolmInSession megolmSession;\r
-    \r
     MatrixClientRequestMegolmInSession(&client,\r
         ROOM_ID,\r
         SESSION_ID,\r
         SENDER_KEY,\r
         USER_ID,\r
-        DEVICE_ID,\r
-        &megolmSession);\r
+        DEVICE_ID);\r
 \r
     // // decrypt room key\r
 \r
@@ -310,7 +305,7 @@ main(void)
     static char encrypted[2048];\r
     static char decrypted[2048];\r
     printf("encrypted:");\r
-    gets(encrypted);\r
+    fgets(encrypted, 2048, stdin);\r
     printf("(%d) %s;\n", strlen(encrypted), encrypted);\r
     MatrixOlmSessionDecrypt(olmSession,\r
         1, encrypted, decrypted, 2048);\r
@@ -337,7 +332,7 @@ main(void)
 \r
     MatrixClientDeleteDevice(&client);\r
         \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
 }\r