fix examples

[matrix_esp_thesis] / examples / Cli.c

diff --git a/examples/Cli.c b/examples/Cli.c
index 56c23e17f4969a5a10404c162367d5a30167e91b..d4d8d226cf2661af8c530dbb7f3f01c9ffe4f791 100644 (file)
--- a/examples/Cli.c
+++ b/examples/Cli.c
@@ -96,7 +96,7 @@ ExecuteCommand(
         MatrixClientUploadOnetimeKeys(client);\r
     }\r
     else if (CheckCommand(cmd, "uploaddevicekey")) {\r
         MatrixClientUploadOnetimeKeys(client);\r
     }\r
     else if (CheckCommand(cmd, "uploaddevicekey")) {\r

-        MatrixClientUploadDeviceKey(client);\r
+        MatrixClientUploadDeviceKeys(client);\r

     }\r
     else if (CheckCommand(cmd, "onetimekeys")) {\r
         static char buffer[1024];\r
     }\r
     else if (CheckCommand(cmd, "onetimekeys")) {\r
         static char buffer[1024];\r


@@ -131,7 +131,7 @@ ExecuteCommand(
     else if (CheckCommand(cmd, "todevice")) {\r
         static char buffer[30000];\r
         MatrixClientSync(client,\r
     else if (CheckCommand(cmd, "todevice")) {\r
         static char buffer[30000];\r
         MatrixClientSync(client,\r

-            buffer, 30000);\r
+            buffer, 30000, "");\r

         const char * todevice;\r
         int todeviceLen;\r
         mjson_find(buffer, 30000,\r
         const char * todevice;\r
         int todeviceLen;\r
         mjson_find(buffer, 30000,\r


@@ -249,8 +249,10 @@ ExecuteCommand(
     else if (CheckCommand(cmd, "initsession")) {\r
         CHECK_ARGS(1, "<room_id>")\r
 \r
     else if (CheckCommand(cmd, "initsession")) {\r
         CHECK_ARGS(1, "<room_id>")\r
 \r

-        if (! MatrixClientInitMegolmOutSession(client,\r
-            args[0]))\r
+        MatrixMegolmOutSession * megolmOutSession;\r
+        if (! MatrixClientNewMegolmOutSession(client,\r
+            args[0],\r
+            &megolmOutSession))\r

         {\r
             printf("Maximum number of Megolm sessions reached (%d)\n", NUM_MEGOLM_SESSIONS);\r
         }\r
         {\r
             printf("Maximum number of Megolm sessions reached (%d)\n", NUM_MEGOLM_SESSIONS);\r
         }\r


@@ -269,16 +271,15 @@ int
 main(void)\r
 {\r
     MatrixClient client;\r
 main(void)\r
 {\r
     MatrixClient client;\r

-    MatrixClientInit(&client,\r
-        SERVER);\r
+    MatrixClientInit(&client);\r

     \r
     \r

-    MatrixHttpInit(&client);\r
+    MatrixHttpInit(&client.hc, SERVER);\r

 \r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
     MatrixClientLoginPassword(&client, "@pscho:matrix.org", "Wc23EbmB9G3faMq", "abc");\r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
 \r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
     MatrixClientLoginPassword(&client, "@pscho:matrix.org", "Wc23EbmB9G3faMq", "abc");\r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r

-    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadDeviceKeys(&client);\r

     MatrixClientUploadOnetimeKeys(&client);\r
 \r
 \r
     MatrixClientUploadOnetimeKeys(&client);\r
 \r
 \r


@@ -300,7 +301,7 @@ main(void)
     \r
     MatrixClientDeleteDevice(&client);\r
 \r
     \r
     MatrixClientDeleteDevice(&client);\r
 \r

-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r

 \r
     return 0;\r
 }\r
 \r
     return 0;\r
 }\r