remove newline

[matrix_esp_thesis] / examples / Cli.c

diff --git a/examples/Cli.c b/examples/Cli.c
index d4d8d226cf2661af8c530dbb7f3f01c9ffe4f791..bcd3a12837d1e0df6f827039764b9799fb455f3c 100644 (file)
--- a/examples/Cli.c
+++ b/examples/Cli.c
@@ -4,9 +4,11 @@
 #include <mjson.h>\r
 #include <matrix.h>\r
 \r
 #include <mjson.h>\r
 #include <matrix.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 USERNAME      ""\r
+#define PASSWORD      ""\r
+#define DEVICE_NAME   ""\r

 \r
 #define BUFFER_SIZE 1024\r
 #define NUMBER_ARGS 10\r
 \r
 #define BUFFER_SIZE 1024\r
 #define NUMBER_ARGS 10\r


@@ -130,8 +132,9 @@ ExecuteCommand(
     }\r
     else if (CheckCommand(cmd, "todevice")) {\r
         static char buffer[30000];\r
     }\r
     else if (CheckCommand(cmd, "todevice")) {\r
         static char buffer[30000];\r

+        static char nextBatch[128];\r

         MatrixClientSync(client,\r
         MatrixClientSync(client,\r

-            buffer, 30000, "");\r
+            buffer, 30000, nextBatch, 128);\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


@@ -151,16 +154,6 @@ ExecuteCommand(
             args[1],\r
             args[2]);\r
     }\r
             args[1],\r
             args[2]);\r
     }\r

-    else if (CheckCommand(cmd, "save")) {\r
-        CHECK_ARGS(1, "<filename>")\r
-\r
-        MatrixClientSave(client, args[0]);\r
-    }\r
-    else if (CheckCommand(cmd, "load")) {\r
-        CHECK_ARGS(1, "<filename>")\r
-\r
-        MatrixClientLoad(client, args[0]);\r
-    }\r

     else if (CheckCommand(cmd, "send")) {\r
         CHECK_ARGS(2, "<room_id> <message>")\r
 \r
     else if (CheckCommand(cmd, "send")) {\r
         CHECK_ARGS(2, "<room_id> <message>")\r
 \r


@@ -218,26 +211,6 @@ ExecuteCommand(
             args[2],\r
             &client->megolmOutSessions[sessionIndex]);\r
     }\r
             args[2],\r
             &client->megolmOutSessions[sessionIndex]);\r
     }\r

-    else if (CheckCommand(cmd, "savesession")) {\r
-        CHECK_ARGS(3, "<session_index> <filename> <key>")\r
-\r
-        int sessionIndex = atoi(args[0]);\r
-\r
-        MatrixMegolmOutSessionSave(\r
-            &client->megolmOutSessions[sessionIndex],\r
-            args[1],\r
-            args[2]);\r
-    }\r
-    else if (CheckCommand(cmd, "loadsession")) {\r
-        CHECK_ARGS(3, "<session_index> <filename> <key>")\r
-\r
-        int sessionIndex = atoi(args[0]);\r
-\r
-        MatrixMegolmOutSessionLoad(\r
-            &client->megolmOutSessions[sessionIndex],\r
-            args[1],\r
-            args[2]);\r
-    }\r

     else if (CheckCommand(cmd, "printsessions")) {\r
         for (int i = 0; i < client->numMegolmOutSessions; i++) {\r
             printf("%d: %s\t%s\t%s\n", i,\r
     else if (CheckCommand(cmd, "printsessions")) {\r
         for (int i = 0; i < client->numMegolmOutSessions; i++) {\r
             printf("%d: %s\t%s\t%s\n", i,\r


@@ -277,7 +250,7 @@ main(void)
 \r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r
 \r
 \r
     MatrixClientSetUserId(&client, USER_ID);\r

-    MatrixClientLoginPassword(&client, "@pscho:matrix.org", "Wc23EbmB9G3faMq", "abc");\r
+    MatrixClientLoginPassword(&client, USERNAME, PASSWORD, DEVICE_NAME);\r

     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadDeviceKeys(&client);\r
     MatrixClientUploadOnetimeKeys(&client);\r
     MatrixClientGenerateOnetimeKeys(&client, 10);\r
     MatrixClientUploadDeviceKeys(&client);\r
     MatrixClientUploadOnetimeKeys(&client);\r