remove newline

[matrix_esp_thesis] / examples / SendEncrypted.c

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index df1d27291185f9a2329226d4c52dd9b1f7b0aea1..749037d23b04e2978df113dcf684ee03e1011083 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -1,69 +1,56 @@
 #include <matrix.h>\r
 #include <stdio.h>\r
 \r
 #include <matrix.h>\r
 #include <stdio.h>\r
 \r

-#define SERVER       "https://matrix.org"\r
-#define USER_ID      "@pscho:matrix.org"\r
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
+#define SERVER        "https://matrix.org"\r
+#define USER_ID       "@example:matrix.org"\r
+#define ROOM_ID       "!example:matrix.org"\r
+#define USERNAME      ""\r
+#define PASSWORD      ""\r
+#define DEVICE_NAME   ""\r
+\r
+// device id of another device to share the megolm session with\r
+// I used the device id of a logged in Element web session\r
+#define DEVICE_ID2   ""\r

 \r
 int\r
 main(void)\r
 {\r
     MatrixClient client;\r
 \r
 int\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
     MatrixClientSetUserId(&client, USER_ID);\r
 \r
     MatrixClientLoginPassword(&client,\r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
 \r
     MatrixClientLoginPassword(&client,\r

-        "pscho",\r
-        "Wc23EbmB9G3faMq",\r
-        "Test1");\r
+        USERNAME,\r
+        PASSWORD,\r
+        DEVICE_NAME);\r

 \r
 \r

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

     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
 \r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadOnetimeKeys(&client);\r
 \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
     // create megolmsession\r
     MatrixMegolmOutSession * megolmOutSession;\r

-    MatrixClientGetMegolmOutSession(&client,\r
+    MatrixClientNewMegolmOutSession(&client,\r

         ROOM_ID,\r
         &megolmOutSession);\r
     printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
 \r
         ROOM_ID,\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
     MatrixClientShareMegolmOutSession(&client,\r
         USER_ID,\r

-        "ULZZOKJBYN",\r
+        DEVICE_ID2,\r

         megolmOutSession);\r
         megolmOutSession);\r

-    // MatrixClientShareMegolmOutSessionTest(&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
+    \r

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

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

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