fix examples

[matrix_esp_thesis] / examples / SendEncrypted.c

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index f2bb8dffa38ee163daec4cfbe17805392be598a2..3debeabb2005cafe21a545d0814290a0d2b44b36 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -2,8 +2,6 @@
 #include <stdio.h>\r
 \r
 #define SERVER       "https://matrix.org"\r
 #include <stdio.h>\r
 \r
 #define SERVER       "https://matrix.org"\r

-#define ACCESS_TOKEN "syt_cHNjaG8_yBvTjVTquGCikvsAenOJ_49mBMO"\r
-#define DEVICE_ID    "MAZNCCZLBR"\r

 #define USER_ID      "@pscho:matrix.org"\r
 #define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
 \r
 #define USER_ID      "@pscho:matrix.org"\r
 #define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
 \r


@@ -11,35 +9,41 @@ 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

-    MatrixClientSetAccessToken(&client,\r
-        ACCESS_TOKEN);\r
-    MatrixClientSetDeviceId(&client,\r
-        DEVICE_ID);\r
-    MatrixClientSetUserId(&client,\r
-        USER_ID);\r
+    MatrixClientSetUserId(&client, USER_ID);\r

 \r
 \r

-    // MatrixMegolmOutSession megolmOutSession;\r
-    // MatrixMegolmOutSessionInit(&megolmOutSession);\r
+    MatrixClientLoginPassword(&client,\r
+        "pscho",\r
+        "Wc23EbmB9G3faMq",\r
+        "Test1");\r

 \r
 \r

-    // MatrixClientSetMegolmOutSession(&client,\r
-    //     ROOM_ID,\r
-    //     megolmOutSession);\r
+    MatrixClientUploadDeviceKeys(&client);\r
+    MatrixClientGenerateOnetimeKeys(&client, 10);\r
+    MatrixClientUploadOnetimeKeys(&client);\r
+\r
+    // create megolmsession\r
+    MatrixMegolmOutSession * megolmOutSession;\r
+    MatrixClientNewMegolmOutSession(&client,\r
+        ROOM_ID,\r
+        &megolmOutSession);\r
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
+\r
+    MatrixClientShareMegolmOutSession(&client,\r
+        USER_ID,\r
+        "ULZZOKJBYN",\r
+        megolmOutSession);\r

 \r
     MatrixClientSendEventEncrypted(&client,\r
         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
 \r
     MatrixClientSendEventEncrypted(&client,\r
         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r

+    \r
+    MatrixClientDeleteDevice(&client);\r

 \r
 \r

-    MatrixClientShareMegolmOutSessionTest(&client,\r
-        "ULZZOKJBYN",\r
-        &client.megolmOutSessions[0]);\r
-        \r
-    MatrixHttpDeinit(&client);\r
+    MatrixHttpDeinit(&client.hc);\r

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