fix examples

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
-        MatrixClientUploadDeviceKey(client);\r
+        MatrixClientUploadDeviceKeys(client);\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
-            buffer, 30000);\r
+            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
-        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
@@ -269,16 +271,15 @@ 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
 \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
@@ -300,7 +301,7 @@ main(void)
     \r
     MatrixClientDeleteDevice(&client);\r
 \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
 }\r

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

diff --git a/examples/Keys.c b/examples/Keys.c
index f79488b3bb28be003d959e33b5f6b7562874c55b..17a681fcdbcb5d28afc9d4c3e8c1f524d708c983 100644 (file)
--- a/examples/Keys.c
+++ b/examples/Keys.c
@@ -11,10 +11,9 @@ int
 main(void)\r
 {\r
     MatrixClient client;\r
-    MatrixClientInit(&client,\r
-        SERVER);\r
+    MatrixClientInit(&client);\r
     \r
-    MatrixHttpInit(&client);\r
+    MatrixHttpInit(&client, SERVER);\r
     \r
     MatrixClientSetAccessToken(&client, ACCESS_TOKEN);\r
     MatrixClientSetDeviceId(&client, DEVICE_ID);\r
@@ -26,7 +25,9 @@ main(void)
     MatrixClientUploadOnetimeKeys(&client);\r
     MatrixClientUploadDeviceKeys(&client);\r
 \r
-    printf("device key: %s\n", client.deviceKey);\r
+    char deviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client.olmAccount, deviceKey, DEVICE_KEY_SIZE);\r
+    printf("device key: %s\n", deviceKey);\r
         \r
     MatrixHttpDeinit(&client);\r
 \r

diff --git a/examples/Login.c b/examples/Login.c
index 1ffbbc0a44897e017d81332bef4980072d49e79c..08f981af0d582c66b4c2150e11e55044e60c61a6 100644 (file)
--- a/examples/Login.c
+++ b/examples/Login.c
@@ -11,10 +11,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
     MatrixClientLoginPassword(&client,\r
         USERNAME,\r
@@ -26,7 +25,7 @@ main(void)
     printf("Expires in (ms): %s\n", client.expireMs);\r
     printf("Refresh Token: %s\n", client.refreshToken);\r
     \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
-}
\ No newline at end of file
+}\r

diff --git a/examples/ReplyRoomkey.c b/examples/ReplyRoomkey.c
index 8d61a4c0ee524799f32e60bb2f89826b6e150258..7cc506e46ee6b0792e49c43623c7810faf54d49b 100644 (file)
--- a/examples/ReplyRoomkey.c
+++ b/examples/ReplyRoomkey.c
@@ -11,10 +11,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
     MatrixClientSetAccessToken(&client,\r
         ACCESS_TOKEN);\r
@@ -34,7 +33,7 @@ main(void)
         "ULZZOKJBYN",\r
         &client.megolmOutSessions[0]);\r
         \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
 }\r

diff --git a/examples/Send.c b/examples/Send.c
index 9ab7dfb82f7e60a6ee701c0b8192e5c6ca55fe1b..281d89901b57b9d1290b6cc0e027b80523057b86 100644 (file)
--- a/examples/Send.c
+++ b/examples/Send.c
@@ -8,10 +8,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
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
@@ -30,7 +29,7 @@ main(void)
     \r
     MatrixClientDeleteDevice(&client);\r
         \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
-}
\ No newline at end of file
+}\r

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index c2fda6c4a2e358d63dfe674b5fdf9de605de77f4..a6cedb5924c26ac18cacce10c560c7115a395dff 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -9,10 +9,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
@@ -21,7 +20,7 @@ main(void)
         "Wc23EbmB9G3faMq",\r
         "Test1");\r
 \r
-    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadDeviceKeys(&client);\r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
 \r
@@ -60,10 +59,10 @@ main(void)
         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
-        \r
+    \r
     MatrixClientDeleteDevice(&client);\r
 \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
 }\r

diff --git a/examples/Sync.c b/examples/Sync.c
index eafed27ee8f2a111ef9a3fe804f156934d59cbf4..b503f13c3c58e4fcbe755c65beb467bd629ec5a7 100644 (file)
--- a/examples/Sync.c
+++ b/examples/Sync.c
@@ -16,10 +16,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
@@ -30,7 +29,7 @@ main(void)
     \r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
-    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadDeviceKeys(&client);\r
     \r
 \r
     static char eventBuffer[1024];\r
@@ -87,7 +86,7 @@ main(void)
 \r
     MatrixClientDeleteDevice(&client);\r
         \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
-}
\ No newline at end of file
+}\r

diff --git a/examples/Verify.c b/examples/Verify.c
index ba8989ae96ac842717aec4de46ba1e1c34a5fbf6..2544f16dfbe643b0ba104b9d1489db4e79fddcc8 100644 (file)
--- a/examples/Verify.c
+++ b/examples/Verify.c
@@ -291,13 +291,13 @@ HandleEvent(
 \r
             MatrixOlmSession * olmSession;\r
             if (messageTypeInt == 0) {\r
-                MatrixClientGetOlmSessionIn(client,\r
+                MatrixClientNewOlmSessionIn(client,\r
                     USER_ID,\r
                     DEVICE_ID,\r
                     encrypted,\r
                     &olmSession);\r
             } else {\r
-                MatrixClientGetOlmSessionOut(client,\r
+                MatrixClientNewOlmSessionOut(client,\r
                     USER_ID,\r
                     DEVICE_ID,\r
                     &olmSession);\r
@@ -479,9 +479,8 @@ int
 main(void)\r
 {\r
     MatrixClient client;\r
-    MatrixClientInit(&client,\r
-        SERVER);\r
-    MatrixHttpInit(&client);\r
+    MatrixClientInit(&client);\r
+    MatrixHttpInit(&client.hc, SERVER);\r
     MatrixClientSetUserId(&client, USER_ID);\r
 \r
     MatrixClientLoginPassword(&client,\r
@@ -491,7 +490,7 @@ main(void)
     printf("deviceId: %s\n", client.deviceId);\r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
-    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadDeviceKeys(&client);\r
 \r
     static char eventBuffer[1024];\r
     MatrixClientGetRoomEvent(&client,\r
@@ -535,7 +534,7 @@ main(void)
 \r
     MatrixClientDeleteDevice(&client);\r
         \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r
 \r
     return 0;\r
 }\r