From fce9e330113557f5eb813c238a25bddc52146182 Mon Sep 17 00:00:00 2001
From: Felix Prahl-Kamps <felixpk@outlook.de>
Date: Sun, 22 Jul 2018 20:18:25 +0200
Subject: [PATCH] restructure

---
 README.md                                     |  22 ++--
 {Screenshots => images/Screenshots}/main.png  | Bin
 .../Screenshots}/org-info-received.png        | Bin
 .../Screenshots}/pub-key-received.png         | Bin
 .../Screenshots}/scan-pub-key.png             | Bin
 .../Screenshots}/sync-profile.png             | Bin
 .../Screenshots}/upload.png                   | Bin
 images/mispbump.svg                           |  96 ++++++++++++++++++
 8 files changed, 107 insertions(+), 11 deletions(-)
 rename {Screenshots => images/Screenshots}/main.png (100%)
 rename {Screenshots => images/Screenshots}/org-info-received.png (100%)
 rename {Screenshots => images/Screenshots}/pub-key-received.png (100%)
 rename {Screenshots => images/Screenshots}/scan-pub-key.png (100%)
 rename {Screenshots => images/Screenshots}/sync-profile.png (100%)
 rename {Screenshots => images/Screenshots}/upload.png (100%)
 create mode 100644 images/mispbump.svg

diff --git a/README.md b/README.md
index ec66d5e..44157dd 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,33 @@
+
+![MispBump Logo](./images/mispbump.svg)
+
 # MISPBump
 
-With MISPBump it is easy to share events on your MISP instance with other instances. Instead of generating organisations, sync-users and sync-servers you scan only two QR-Codes and the job is done.
+With MISPBump it is easy to synchronise events on different MISP instances. Instead of generating organisations, sync-users and sync-servers you only have to scan two QR-Codes and you are ready for syncing.
 
 # Security
 
 A key agreement is realized with Diffie Hellman (Elliptic Curve 256 Bit), sensible data is encrypted with AES.  
 
-(how are credentials stored in app, keystore?)
-
+TODO: how are credentials stored in app, keystore?
 
 
 # How does it work?
 
-1. Main screen (no changes)
-
 1. Gather your organisation information from your MISP instance
-![Gather Information](./Screenshots/sync-profile.png)
+![Gather Information](./images/Screenshots/sync-profile.png)
 
 1. Scan your partners generated public key and at the same time share yours
-![Scan Public Key](./Screenshots/scan-pub-key.png)
+![Scan Public Key](./images/Screenshots/scan-pub-key.png)
 
 2. Validate the public key you scanned
-![Public Key Received](./Screenshots/pub-key-received.png)
+![Public Key Received](./images/Screenshots/pub-key-received.png)
 
 3. After another scan the information you need to synchronise is securely transmitted to your phone
-![Secure Info Received](./Screenshots/org-info-received.png)
+![Secure Info Received](./images/Screenshots/org-info-received.png)
 
 4. Upload the information to your own MISP instance
-![Upload](./Screenshots/upload.png)
+![Upload](./images/Screenshots/upload.png)
 
 5. That's it! You are ready to share events across your instances
-![Main Screen](./Screenshots/main.png)
+![Main Screen](./images/Screenshots/main.png)
diff --git a/Screenshots/main.png b/images/Screenshots/main.png
similarity index 100%
rename from Screenshots/main.png
rename to images/Screenshots/main.png
diff --git a/Screenshots/org-info-received.png b/images/Screenshots/org-info-received.png
similarity index 100%
rename from Screenshots/org-info-received.png
rename to images/Screenshots/org-info-received.png
diff --git a/Screenshots/pub-key-received.png b/images/Screenshots/pub-key-received.png
similarity index 100%
rename from Screenshots/pub-key-received.png
rename to images/Screenshots/pub-key-received.png
diff --git a/Screenshots/scan-pub-key.png b/images/Screenshots/scan-pub-key.png
similarity index 100%
rename from Screenshots/scan-pub-key.png
rename to images/Screenshots/scan-pub-key.png
diff --git a/Screenshots/sync-profile.png b/images/Screenshots/sync-profile.png
similarity index 100%
rename from Screenshots/sync-profile.png
rename to images/Screenshots/sync-profile.png
diff --git a/Screenshots/upload.png b/images/Screenshots/upload.png
similarity index 100%
rename from Screenshots/upload.png
rename to images/Screenshots/upload.png
diff --git a/images/mispbump.svg b/images/mispbump.svg
new file mode 100644
index 0000000..67c294a
--- /dev/null
+++ b/images/mispbump.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80mm"
+   height="80mm"
+   viewBox="0 0 80 80"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="mispbump.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient869"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop867" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="284.77598"
+     inkscape:cy="142.42105"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1544"
+     inkscape:window-height="836"
+     inkscape:window-x="56"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-101.60547,-53.540158)">
+    <rect
+       style="fill:#141130;fill-opacity:1;fill-rule:evenodd;stroke:#141130;stroke-width:7.27272749;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect1052"
+       width="72.727272"
+       height="72.727272"
+       x="105.24184"
+       y="57.176521" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(-101.60547,-53.540158)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="117.62615"
+       y="75.052338"
+       id="text1058"><tspan
+         sodipodi:role="line"
+         x="117.62615"
+         y="75.052338"
+         style="font-size:11.28888893px;letter-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332px"
+         id="tspan1060">M  I  S  P</tspan></text>
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 135.04413,121.12257 c -0.92038,-0.32824 -1.76852,-1.60228 -1.57635,-2.36794 0.1873,-0.74625 2.27886,-3.57793 2.86768,-3.88242 1.09898,-0.5683 2.84357,0.69713 2.84357,2.06258 0,0.55066 -0.5886,1.55728 -1.78234,3.04813 -0.98184,1.22621 -1.46015,1.45792 -2.35256,1.13965 z m 8.03008,-0.733 c -1.0199,-0.18199 -2.965,-0.70895 -3.32186,-0.89993 -0.19904,-0.10653 -0.18652,-0.16785 0.17547,-0.85942 0.34668,-0.66233 0.38944,-0.85076 0.38655,-1.70352 -0.004,-1.1013 -0.21439,-1.61677 -0.97379,-2.38292 -0.5057,-0.5102 -1.48886,-1.02881 -1.95933,-1.03353 -0.46875,-0.005 -0.5582,-0.12917 -0.63395,-0.88226 -0.13775,-1.36937 -0.9494,-2.47534 -2.24938,-3.06508 -0.29285,-0.13285 -0.70774,-0.24273 -0.92197,-0.24418 l -0.38952,-0.003 v -0.7599 c 0,-0.60773 -0.0734,-0.90676 -0.36651,-1.49334 -0.63597,-1.27268 -1.58944,-1.87159 -2.98935,-1.87772 -1.14314,-0.005 -1.63239,0.22779 -2.35776,1.12186 -0.29985,0.36959 -0.58428,0.687 -0.63205,0.70535 -0.0478,0.0183 -0.18505,-0.18438 -0.30507,-0.45052 -0.28843,-0.63964 -1.18932,-1.46801 -1.8858,-1.73399 -0.40656,-0.15527 -0.78957,-0.20073 -1.40029,-0.16623 -0.71199,0.0402 -0.92494,0.10691 -1.39124,0.43558 -0.30281,0.21344 -0.59155,0.40056 -0.64163,0.41582 -0.0861,0.0262 -2.41253,-2.72413 -2.41253,-2.85212 0,-0.18123 7.59648,-13.479906 7.7,-13.479906 0.0681,0 0.37245,0.15284 0.67638,0.33965 0.91727,0.56381 2.03209,0.94087 3.58632,1.21301 0.81162,0.14211 1.55053,0.28711 1.64202,0.32222 0.1186,0.0455 -0.23269,0.65271 -1.22365,2.11506 -1.69783,2.50545 -2.08688,3.2962 -2.16603,4.40238 -0.0504,0.70437 -0.0205,0.8794 0.21515,1.26073 0.35892,0.58074 1.04182,0.8884 1.97448,0.88951 2.3932,0.003 5.00651,-1.49113 7.00792,-4.00634 0.57619,-0.72411 0.61812,-0.75089 1.66996,-1.06656 l 1.07893,-0.3238 1.2284,0.61644 c 4.03661,2.02567 8.41757,4.78669 12.93466,8.151846 3.8653,2.8796 5.11766,3.9284 5.45346,4.56705 0.2702,0.51389 0.21919,1.54643 -0.0995,2.01469 -0.43741,0.64268 -0.78747,0.82676 -1.73611,0.91293 l -0.86719,0.0788 -3.80704,-2.27808 c -4.73813,-2.83523 -5.37128,-3.19746 -5.94545,-3.40145 -0.42258,-0.15013 -0.47438,-0.1446 -0.62923,0.0672 -0.2513,0.34369 -0.20934,0.50133 0.22079,0.82937 0.43485,0.33163 4.96039,3.1232 7.31007,4.5092 l 1.5239,0.89889 0.003,0.6951 c 0.005,1.39698 -0.88673,2.24128 -2.36757,2.24128 -0.71936,0 -0.95211,-0.11322 -5.09122,-2.47657 -3.63053,-2.07296 -3.69051,-2.10168 -3.98507,-1.90868 -0.18229,0.11943 -0.29907,0.30905 -0.29907,0.48556 0,0.33152 0.50952,0.66863 4.49698,2.97536 1.31697,0.76187 2.60145,1.55816 2.85437,1.76955 0.42165,0.35239 0.45329,0.4204 0.3806,0.81826 -0.12376,0.67731 -0.60173,1.39738 -1.07742,1.62311 -0.60433,0.28677 -1.65332,0.26266 -2.51964,-0.0579 -0.39551,-0.14636 -1.85171,-0.80335 -3.236,-1.45999 -1.38429,-0.65664 -2.69026,-1.2221 -2.90215,-1.25658 -0.32724,-0.0532 -0.40632,-0.0164 -0.52513,0.24429 -0.0769,0.16884 -0.10845,0.38885 -0.0701,0.48891 0.0384,0.10006 1.42462,0.8627 3.0805,1.69476 3.44564,1.73139 3.29193,1.52953 1.97725,2.59656 -1.027,0.83355 -2.11329,0.99477 -4.19716,0.62291 z m -13.26282,-2.19083 c -0.63781,-0.40448 -1.05948,-1.15694 -1.05948,-1.89056 0,-0.53389 0.41228,-1.24878 1.71355,-2.97121 1.55683,-2.0607 2.11256,-2.68144 2.47113,-2.7602 0.80893,-0.17767 2.01685,0.50691 2.3651,1.34039 0.21614,0.51729 0.20487,1.28292 -0.0255,1.72829 -0.32676,0.63189 -2.60399,3.73749 -3.17499,4.32995 -0.51056,0.52974 -0.59022,0.5693 -1.14651,0.5693 -0.45315,0 -0.72986,-0.0837 -1.14336,-0.34596 z m -3.98462,-2.77514 c -0.44783,-0.13395 -1.13172,-0.78514 -1.3439,-1.27961 -0.30803,-0.71787 -0.21592,-1.30837 0.33016,-2.11668 0.74164,-1.09779 3.87364,-5.26446 4.09572,-5.44877 0.3648,-0.30276 1.09891,-0.31043 1.7034,-0.0178 1.10949,0.53709 1.64501,1.82282 1.16685,2.80149 -0.41632,0.85207 -4.19219,5.80318 -4.57776,6.00256 -0.38837,0.20084 -0.8357,0.21998 -1.37447,0.0588 z m -3.66672,-4.20406 c -0.37998,-0.15073 -1.04784,-0.78682 -1.26867,-1.20833 -0.0932,-0.17801 -0.16955,-0.56211 -0.16955,-0.85356 0,-0.43291 0.10676,-0.69177 0.58327,-1.41421 0.97451,-1.47744 1.30795,-1.79615 1.95556,-1.86914 1.23405,-0.1391 2.3751,0.90732 2.3751,2.17814 0,0.52274 -0.0769,0.7216 -0.55344,1.43201 -0.30438,0.45373 -0.78836,1.05991 -1.07551,1.34705 -0.45813,0.45814 -0.58485,0.52116 -1.0346,0.51449 -0.28189,-0.004 -0.64736,-0.0611 -0.81216,-0.12645 z m 37.62686,-6.13599 c -2.25593,-1.86048 -7.21792,-5.449836 -10.00099,-7.234426 -1.90075,-1.21882 -4.88215,-2.9158 -6.91183,-3.93413 l -1.7582,-0.88212 -0.57891,0.15348 c -0.31841,0.0844 -1.05051,0.30742 -1.6269,0.49556 -0.99504,0.32481 -1.06843,0.37289 -1.45288,0.95191 -0.95128,1.43274 -2.97864,3.04991 -4.41149,3.51893 -1.05647,0.34582 -1.93207,0.44078 -2.37453,0.25751 -0.33557,-0.13899 -0.36112,-0.19323 -0.36003,-0.7643 9.1e-4,-0.394 0.10251,-0.82981 0.28345,-1.21394 0.55454,-1.17724 4.19135,-6.34764 4.90659,-6.97563 0.4824,-0.42355 1.62289,-0.75813 3.67784,-1.07896 1.10385,-0.17234 2.10616,-0.21505 5.03378,-0.21449 l 3.65548,9.1e-4 1.79778,0.39547 c 4.21326,0.92681 4.74694,0.98152 6.42896,0.65909 0.58097,-0.11138 1.07746,-0.17879 1.10333,-0.14982 0.0259,0.029 1.72583,3.01901 3.77771,6.64453 l 3.73068,6.591846 -1.23843,1.2184 c -1.04613,1.02919 -2.55119,2.19737 -2.83106,2.19737 -0.0429,0 -0.42553,-0.28664 -0.85035,-0.63699 z m -44.63819,-2.09423 c -1.38836,-0.79824 -3.29593,-2.02726 -3.29593,-2.1235 0,-0.27984 9.10479,-16.588876 9.62576,-17.242236 l 0.26488,-0.33219 1.73642,1.04205 c 2.04781,1.22893 2.87502,1.81281 2.87502,2.02934 0,0.22948 -2.89565,5.49955 -6.64606,12.09579 -2.19702,3.864126 -3.03598,5.225146 -3.21902,5.222166 -0.0784,-0.001 -0.68189,-0.31242 -1.34107,-0.69142 z m 50.83624,-1.01415 c -1.73357,-2.940426 -6.41418,-11.255366 -8.09882,-14.387236 -0.3472,-0.64547 -0.60341,-1.24617 -0.56937,-1.3349 0.13285,-0.34621 4.31252,-2.882 4.58069,-2.7791 0.24532,0.0941 3.22988,5.19972 6.90931,11.8195 2.1954,3.94982 2.99788,5.494156 2.92022,5.619806 -0.19267,0.31175 -4.26438,2.76983 -4.58811,2.76983 -0.0809,0 -0.60013,-0.76856 -1.15392,-1.7079 z"
+       id="path2368"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>