update Makefile

[matrix_esp_thesis] / examples / SendEncrypted.c

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index 2d3bd744dd0fdb77d4932c510a96a0263699d3f4..a6cedb5924c26ac18cacce10c560c7115a395dff 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -1,32 +1,68 @@
 #include <matrix.h>\r
 #include <matrix.h>\r

+#include <stdio.h>\r

 \r
 \r

-#define SERVER FixedBuf("matrix.org")\r
-#define ACCESS_TOKEN FixedBuf("abc")\r
-#define ROOM_ID FixedBuf("!jhpZBTbckszblMYjMK:matrix.org")\r
+#define SERVER       "https://matrix.org"\r
+#define USER_ID      "@pscho:matrix.org"\r
+#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r

 \r
 int\r
 \r
 int\r

-main(\r
-    int argc,\r
-    char **argv)\r
+main(void)\r

 {\r
     MatrixClient client;\r
 {\r
     MatrixClient client;\r

-    MatrixClientCreate(&client,\r
-        SERVER);\r
+    MatrixClientInit(&client);\r
+    \r
+    MatrixHttpInit(&client.hc, SERVER);\r
+\r
+    MatrixClientSetUserId(&client, USER_ID);\r
+\r
+    MatrixClientLoginPassword(&client,\r
+        "pscho",\r
+        "Wc23EbmB9G3faMq",\r
+        "Test1");\r

 \r
 \r

-    MatrixClientSetAccessToken(&client,\r
-        ACCESS_TOKEN);\r
+    MatrixClientUploadDeviceKeys(&client);\r
+    MatrixClientGenerateOnetimeKeys(&client, 10);\r
+    MatrixClientUploadOnetimeKeys(&client);\r

 \r
 \r

-    MatrixMegolmSession megolm;\r
-    MatrixMegolmSessionInit(&megolm);\r
-        \r
-    MatrixRoomShareMegolmSession(&client,\r
+    // // get device key\r
+    // static char deviceKey[128];\r
+    // MatrixClientGetDeviceKey(&client,\r
+    //     "ULZZOKJBYN",\r
+    //     deviceKey, 128);\r
+    // printf("device key for %s: %s\n", "ULZZOKJBYN", deviceKey);\r
+\r
+    // create megolmsession\r
+    MatrixMegolmOutSession * megolmOutSession;\r
+    MatrixClientNewMegolmOutSession(&client,\r

         ROOM_ID,\r
         ROOM_ID,\r

-        megolm);\r
-    \r
-    MatrixClientSendGroupEncrypted(&client,\r
+        &megolmOutSession);\r
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
+\r
+    // // create olmsession\r
+    // MatrixOlmSession * olmSession;\r
+    // MatrixClientGetOlmSession(&client,\r
+    //     USER_ID,\r
+    //     "ULZZOKJBYN",\r
+    //     &olmSession);\r
+    // printf("olm session created\n");\r
+\r
+    MatrixClientShareMegolmOutSession(&client,\r
+        USER_ID,\r
+        "ULZZOKJBYN",\r
+        megolmOutSession);\r
+    // MatrixClientShareMegolmOutSessionTest(&client,\r
+    //     USER_ID,\r
+    //     "ULZZOKJBYN",\r
+    //     megolmOutSession);\r
+\r
+    MatrixClientSendEventEncrypted(&client,\r

         ROOM_ID,\r
         ROOM_ID,\r

-        FixedBuf("m.room.message"),\r
-        FixedBuf("{\"body\":\"Hello\",\"msgtype\":\"m.text\"}"));\r
+        "m.room.message",\r
+        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
+    \r
+    MatrixClientDeleteDevice(&client);\r
+\r
+    MatrixHttpDeinit(&client.hc);\r

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

-}
\ No newline at end of file
+}\r