From 6aa5d39357c114490076dba00482e16abe03e5ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Van=20Rompay?= <cedric.vanrompay@gmail.com>
Date: Mon, 27 Jan 2020 14:28:50 +0100
Subject: [PATCH] move new example to own directory

---
 examples/crypto-browser/lib/.gitignore        |  2 +
 examples/crypto-browser/lib/matrix.js         |  1 +
 .../olm-device-export-import.html             | 59 +++++++++++++++++
 .../olm-device-export-import.js}              | 65 +------------------
 4 files changed, 63 insertions(+), 64 deletions(-)
 create mode 100644 examples/crypto-browser/lib/.gitignore
 create mode 120000 examples/crypto-browser/lib/matrix.js
 create mode 100644 examples/crypto-browser/olm-device-export-import.html
 rename examples/{olm-device-export-import.html => crypto-browser/olm-device-export-import.js} (62%)
diff --git a/examples/crypto-browser/lib/.gitignore b/examples/crypto-browser/lib/.gitignore
new file mode 100644
index 000000000..dd5fde76b
--- /dev/null
+++ b/examples/crypto-browser/lib/.gitignore
@@ -0,0 +1,2 @@
+olm.js
+olm.wasm
\ No newline at end of file
diff --git a/examples/crypto-browser/lib/matrix.js b/examples/crypto-browser/lib/matrix.js
new file mode 120000
index 000000000..518d47ddb
--- /dev/null
+++ b/examples/crypto-browser/lib/matrix.js
@@ -0,0 +1 @@
+../../../dist/browser-matrix.js
\ No newline at end of file
diff --git a/examples/crypto-browser/olm-device-export-import.html b/examples/crypto-browser/olm-device-export-import.html
new file mode 100644
index 000000000..7f4b356b1
--- /dev/null
+++ b/examples/crypto-browser/olm-device-export-import.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Test Crypto in Browser</title>
+    <script src="lib/olm.js"></script>
+    <script src="lib/matrix.js"></script>
+</head>
+<body>
+    <h1>Testing export/import of Olm devices in the browser</h1>
+    <ul>
+        <li>
+            Make sure you built the current version of the Matrix JS SDK
+            (<code>yarn build</code>)
+        </li>
+        <li>
+            copy <code>olm.js</code> and <code>olm.wasm</code>
+            from a recent release of Olm (was tested with version 3.1.4)
+            in directory <code>lib/</code>
+        </li>
+        <li>start a local Matrix homeserver (on port 8008, or change the port in the code)</li>
+        <li>Serve this HTML file (e.g. <code>python3 -m http.server</code>) and go to it through your browser</li>
+        <li>
+            in the JS console, do:
+            <pre>
+aliceMatrixClient = await newMatrixClient("alice-"+randomHex());
+await aliceMatrixClient.exportDevice();
+await aliceMatrixClient.getAccessToken();
+            </pre>
+        </li>
+        <li>
+            copy the result of <code>exportDevice</code> and <code>getAccessToken</code> somewhere
+            (<strong>not</strong> in a JS variable as it will be destroyed when you refresh the page)
+        </li>
+        <li><strong>refresh the page (F5)</strong> to make sure the client is destroyed</li>
+        <li>
+            Do the following, replacing <code>ALICE_ID</code>
+            with the user ID of Alice (you can find it in the exported data)
+            <pre>
+bobMatrixClient = await newMatrixClient("bob-"+randomHex());
+roomId = await bobMatrixClient.createEncryptedRoom([ALICE_ID]);
+await bobMatrixClient.sendTextMessage('Hi Alice!', roomId);
+            </pre>
+        </li>
+        <li>Again, <strong>refresh the page (F5)</strong>. You may want to clear your console as well.</li>
+        <li>
+            Now do the following, using the exported data and the access token you saved previously:
+            <pre>
+aliceMatrixClient = await importMatrixClient(EXPORTED_DATA, ACCESS_TOKEN);
+            </pre>
+        </li>
+        <li>You should see the message sent by Bob printed in the console.</li>
+    </ul>
+
+    <script src="olm-device-export-import.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/olm-device-export-import.html b/examples/crypto-browser/olm-device-export-import.js
similarity index 62%
rename from examples/olm-device-export-import.html
rename to examples/crypto-browser/olm-device-export-import.js
index fc319d1db..0529b73fd 100644
--- a/examples/olm-device-export-import.html
+++ b/examples/crypto-browser/olm-device-export-import.js
@@ -1,63 +1,3 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Test Crypto in Browser</title>
-    <script src="lib/olm.js"></script>
-    <script src="lib/matrix.js"></script>
-</head>
-<body>
-    <h1>Testing export/import of Olm devices in the browser</h1>
-    <p>
-        Inspired by <code>examples/browser</code>
-    </p>
-    <ul>
-        <li>
-            Make sure you built the current version of the Matrix JS SDK
-            (<code>yarn build</code>)
-        </li>
-        <li>
-            make sure there is
-            <code>matrix.js</code>, <code>olm.js</code> and <code>olm.wasm</code>
-            in directory <code>lib/</code>
-        </li>
-        <li>start a local Matrix homeserver (on port 8008, or change the port in the code)</li>
-        <li>Serve this HTML file (e.g. <code>python3 -m http.server</code>) and go to it through your browser</li>
-        <li>
-            in the JS console, do:
-            <pre>
-aliceMatrixClient = await newMatrixClient("alice-"+randomHex());
-await aliceMatrixClient.exportDevice();
-await aliceMatrixClient.getAccessToken();
-            </pre>
-        </li>
-        <li>
-            copy the result of <code>exportDevice</code> and <code>getAccessToken</code> somewhere
-            (<strong>not</strong> in a JS variable as it will be destroyed when you refresh the page)
-        </li>
-        <li><strong>refresh the page (F5)</strong> to make sure the client is destroyed</li>
-        <li>
-            Do the following, replacing <code>ALICE_ID</code>
-            with the user ID of Alice (you can find it in the exported data)
-            <pre>
-bobMatrixClient = await newMatrixClient("bob-"+randomHex());
-roomId = await bobMatrixClient.createEncryptedRoom([ALICE_ID]);
-await bobMatrixClient.sendTextMessage('Hi Alice!', roomId);
-            </pre>
-        </li>
-        <li>Again, <strong>refresh the page (F5)</strong>. You may want to clear your console as well.</li>
-        <li>
-            Now do the following, using the exported data and the access token you saved previously:
-            <pre>
-aliceMatrixClient = await importMatrixClient(EXPORTED_DATA, ACCESS_TOKEN);
-            </pre>
-        </li>
-        <li>You should see the message sent by Bob printed in the console.</li>
-    </ul>
-
-    <script>
 if (!Olm) {
     console.error(
         "global.Olm does not seem to be present."
@@ -179,7 +119,4 @@ function extendMatrixClient(matrixClient) {
             }
         )
     }
-}
-    </script>
-</body>
-</html>
\ No newline at end of file
+}
\ No newline at end of file
