diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index 4bc066e..6552df3 100644
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,4 +1,4 @@
-.git/COMMIT_EDITMSG__DEL__4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
+.git/COMMIT_EDITMSG__DEL__If4UvKpwCKVzkSRbfhig+JvSLjH1FoXhe8rrukf/WoY=
.git/HEAD__DEL__9vK5RfbEEbAro9qces6I3PcbavZbouDYmqgpAAQrWhA=
.git/config__DEL__au1NdB+8TXr2Rmn1de8XxOJ7XvRR2HhR61c9MY4LTcg=
.git/description__DEL__hatsFj1DoX6pz3eIMIvKFGbxsKjRzJLibpv2PaQGKu4=
@@ -13,13 +13,13 @@
.git/hooks/pre-receive.sample__DEL__pMPSuce7P9jRRBwxvU7nGlldZrRPz0ndsxAlIyAWmYk=
.git/hooks/prepare-commit-msg.sample__DEL__6d3KpBif3dJe2X/Ix4nsp7bKFjkLI5KuMnbwyOGqRhk=
.git/hooks/update.sample__DEL__dRwDcyACTsLuJ1fz/64LEK0slGNnaE5wWdTcl+rH5DE=
-.git/index__DEL__5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
+.git/index__DEL__rOuEvL2uYs09DB6RY1YHuSX6EuliHrA59IcqjMSFi8s=
.git/info/exclude__DEL__ZnH+g7egfIky7okWTR8nk7IxgFjri5jcXAbuClo7DsE=
-.git/logs/HEAD__DEL__cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+.git/logs/HEAD__DEL__0pObdvtd8sS6EgjGVhLlQucIjT6CBMHidnFrgD/Nrzk=
.git/logs/refs/heads/dev__DEL__q20Bv7wjBkQHG9fg8cC64InwcBytMlrnZqO32+lD1LE=
-.git/logs/refs/heads/master__DEL__9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+.git/logs/refs/heads/master__DEL__9noZilKzpJNOhJ0Hb9OX2cXKZYG0FXdZO+kUsKM1pn8=
.git/logs/refs/remotes/origin/dev__DEL__wvti+A+HmltuMEEaFVgwS4Xh16oYsmcKLCml+4mFyy8=
-.git/logs/refs/remotes/origin/master__DEL__hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
+.git/logs/refs/remotes/origin/master__DEL__2PlqlV9Lby0oEWaD1BaFbRNn5iyYH+/ro4UnAO7qaOg=
.git/objects/02/741fe0d44ace36d88f500de55fe02f60e39681__DEL__cVGnHJSbIxxTbHZ4cc0XEetbMGr4Ig04SwFvCJL0tcg=
.git/objects/03/240c2d93bda6a3706feaeb68273e9a270e432c__DEL__Ms6qdss7hkzXr1x2TOTA2cWJgps+JGTzSg5ipDkyC5E=
.git/objects/05/bd71b6ec2c1982d1e8a5653073281994564ae8__DEL__PXNsl0l7EuMPFASARrf2c4vkfoU8MqkL51Cf4LHE3Ik=
@@ -35,15 +35,21 @@
.git/objects/33/67b3daa6e81b654716813fa33ffd6a20c7f370__DEL__6QULNx552KmOJjqXf9j/gdUWqSUkA3lQihi7Zxe0v9k=
.git/objects/3b/d5d0a4803967bc0bf72a7dd66d7e292ed2e586__DEL__NWl0p1AAhqGIhpiPNnefVL7uzkqYFG1ZET6Oni7l45M=
.git/objects/4a/b357c7634f49e522aeaaedefa83c4ff08443a9__DEL__a0Cz4lWC+0xWCzZUYUQL5O/bt35C7pRZ1XW3fOKXBBo=
+.git/objects/4b/c066ebaf4dc25e55d53f01cf3b58b1acf4eeac__DEL__f6PxYVuOzCEkwYdiFoTHy9qr/AuMjlE7eNGqr2N2Ok4=
.git/objects/4e/35166f13f37f8c3aed30d3019174573a026f4a__DEL__QvXy5hjAaFV6M3+qW1WfnrX4ZyFuiBAqpnCqfAheYXE=
.git/objects/53/f31f54130c9a3441480f9e416f805437fb71c9__DEL__TI9vZZsmF1Ydh6O/gd51GoLyXZZyto7wjobmKY2woQo=
.git/objects/58/02e94b1cd8db05ccc5aa2dad551e7f5ec63174__DEL__Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
+.git/objects/5d/85405afbeebdf69961ee19c268934e468b92dc__DEL__4VTGq5uNejUXChw+MCclK2KrZACrfIIOofqL1jahnx4=
.git/objects/5d/dc6bd5f24cf4e67a53e20384dfc868809d10b3__DEL__zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+.git/objects/60/28ff1af887074abf9799decdc4f53ea65de0d2__DEL__VfUv5Gv6hfBt9kQzeU1Q4cKplXBpkMYa22LwZ7jxCs0=
+.git/objects/62/c798785cfaedd6992eee3fabeed71d790f78a9__DEL__RlbNnRkGavIiygXlfALbEtC8CSN19LfQ4x5Y92GdKfQ=
.git/objects/66/9e339e0d59da886483c0834d9397a29b53227a__DEL__+nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
.git/objects/66/de0dcf1f16eb3dfe1aedf78790b4e002c08516__DEL__FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+.git/objects/68/66c8e9e1bc747421d9ad8439d036a0a7afb1a0__DEL__vcUPYwNJyv+DsVO+MeVNXiOGLKNMjJsO/UctNZFiDOg=
.git/objects/69/ee1e082bef2099596adb59c63a64e468b50882__DEL__atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
.git/objects/6d/62893bf75605d744173ea8bed3f6198ce18cdc__DEL__nFOWpOHMvHeg/SQuat4JS9Tihoup9kB5YJ7jit0guIA=
.git/objects/6f/2bf25b4a2c42093a219e1f448e60df4691edd9__DEL__GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+.git/objects/73/714ebb756c954ebfb4e7232985c020e2515293__DEL__AUESNd0REeJq4JRjlJ2qp3wnKhuh/aN5JYpO01kppFU=
.git/objects/78/fdbb1d64048da4271091ddb1768f8670919069__DEL__3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
.git/objects/7c/a3e1f9fd26cc61f712e13322b05c7e24ce1813__DEL__HvEW3s9pr5lX/U/e4ZOjuGQ5UKstesDe/4eJic1wvlo=
.git/objects/82/2ac63bb0a8e9ab24ff26a1aff59635c79b038c__DEL__og3HdYsG8csdD7xUnIqOn7Lq9lyAlwRjG2XXXBZ+Cm4=
@@ -53,6 +59,7 @@
.git/objects/8e/5d802326c308c497e217c4d5b600f2f11ac3c4__DEL__I9nY+iedh8TO2HV91DIps+SueQgcc0WCoPaYqIhzUq0=
.git/objects/90/a27f9cea6e8f02e05a8bbab5d14650e3e932af__DEL__lpDm120MOA6vW/mrh0cy1pu67SJ6dPu/cY8rN8I7xW8=
.git/objects/94/d035297d32719c863d2bd49b285d1f5775703d__DEL__xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
+.git/objects/97/624229cdd097bd7b0e505d478fb0a8955a80f7__DEL__RJEDk98YVKzW5x+7RlBsjhLPB9/wC8pi5Q91T4KWhMw=
.git/objects/99/96115961d2aa418fb03ff90d529f642f4f7261__DEL__3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
.git/objects/9d/ab2d1408775ca4094f6806e481cf85e8709ec4__DEL__8dWV9Unqdt7vmdOSzL5TGY9RETmJ1B9ZpX7jLIO3qBs=
.git/objects/9f/29e0dab7efd2ce2bda4adb262584b22321e534__DEL__KJdBI+69yuhRSrTwXepr5NJxdIXgmy1V+2rtaOmYYok=
@@ -60,6 +67,7 @@
.git/objects/a5/5db3f213c6fd9f1611473c99181cb6bd8ce9f2__DEL__Hljb7WQV6HW2SlXWnf79Z0JHFEEXiF854oWTNGeoqG0=
.git/objects/b0/2c87ba502c06af3fb09ba7424e5846b1ba7575__DEL__9Ixa5p/uNZxKIdg2yDMUNp0wqic/7TnjdkMVm1eIqvs=
.git/objects/b0/97cff9350a4425e6159c455a26787f29243576__DEL__4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
+.git/objects/b1/2ee3c3c409d741f8492f0c251a8e1b6ef826fd__DEL__t0dDpRgTD86E+VnD8dOxzR8S2jH927gD3+OU7JijYl4=
.git/objects/b6/2f236dddb5e68cc7e60e76c9f773b0eb90ce31__DEL__mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
.git/objects/b9/9aef2abe46750c45d0637bae3c293af58b5ba7__DEL__dX0sJvi5Qp7vZSwGM413141B3yt9P0sz5P+h2dRQdYM=
.git/objects/c4/87c068cae1a73c7bf7239555c1329610507ec9__DEL__PBdNy+ElDdG/ulzGKnoHefxPQEVB5zq5pMe/pZHZRAc=
@@ -71,14 +79,16 @@
.git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7__DEL__bK1/lEV5blLPpFrn/ZNVdLDE2RnlA4SnQhDpURW+znc=
.git/objects/d6/732ea134c5ff05e87ee89dbad7c5f97bb7724b__DEL__hTPwSlNSKTaSuUMuvBi0AzOTFOEpKwcbrCd4aQ/6cHk=
.git/objects/d6/e10997a5611ce965e0c34551b973478dc7172e__DEL__vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
+.git/objects/d7/17792858941f7a216bb986176fe82f1b72e778__DEL__zE1MCRENlHLFZNfjfDlIFPUMQK/IZG0c6fhpe3LER+s=
+.git/objects/e1/3c9db723a28663fca01f99432fbc0615a0a2cb__DEL__4euHKtQmG4wP3mcMThf4Rq8F9G52f7Ea8cVRd8CvoTs=
.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391__DEL__FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
.git/objects/e6/e64a7a10f9c3f4c2218db906b18d6c96f153e1__DEL__ORQK4eEcZ9zLwMxPa08xowgH4TMPKDOsAJxkYscIos8=
.git/objects/f0/fc0dd5e890f0a3929c22ac364c71e6623f4e8e__DEL__zgSOtLXhZmKmL98vDoytepbOXYqk43npI3T5HsIbgjc=
.git/objects/f8/04e46ae59b95fa82280d55e65c5deb7c23619a__DEL__nGm01CzTeVlO+cEBhatCJfqvefpI81P907olWncqhbk=
.git/refs/heads/dev__DEL__EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
-.git/refs/heads/master__DEL__gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+.git/refs/heads/master__DEL__fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
.git/refs/remotes/origin/dev__DEL__EIvs3h1xxNea4PFAxSSkyksJf7F8PzmIYmkW20Ddo64=
-.git/refs/remotes/origin/master__DEL__gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+.git/refs/remotes/origin/master__DEL__fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
LICENSE.APLv2__DEL__z8d0m5b2O9McPEK1xHG/dWgUBT6EfBDz6wA0F7xSPTA=
NOTICE__DEL__ijjaB8GEO5OJP/jK6n7Hr3vZFI9gy8ocoDhviViKNnU=
README.md__DEL__47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=
@@ -87,6 +97,6 @@ css/style.css__DEL__YCx4tiqoai276nR9sDZsPUcn0/z3Xi4XYMDXIcnGRhU=
icon.jpg__DEL__2ZXXmZkVOzH42v5SF/c73PYgxmcHHRii2/gn73UUhlo=
icon.png__DEL__kd617JYkX8IEUQERd72gL14zj6pgNVcKiSRAFQz6HX8=
index.html__DEL__CdntWzqB8DQYZKIF68hQqqZVLQPbLRf1hXjozO+agxA=
-js/app.js__DEL__rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
+js/app.js__DEL__pn+BgYKiYnP40fp9amYrJvG/ksuToFs3d5Uolu/wnH8=
version.txt__DEL__jFS/q38a6b0acUjq5B57Co9K03JuDKxw+COi1F255gw=
-author-signature.xml__DEL__1Uz08mb4I9Cj6tDCPa3m+B1Gdb3P2zXA9/lWw6+hyMw=
+author-signature.xml__DEL__i5LdJFjTtonYJsYW4BDPEf6sR53/7HBmiMUs1FQP9L4=
diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index 9762422..4c825cf 100644
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,7 +4,7 @@
-4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
+If4UvKpwCKVzkSRbfhig+JvSLjH1FoXhe8rrukf/WoY=
@@ -64,7 +64,7 @@
-5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
+rOuEvL2uYs09DB6RY1YHuSX6EuliHrA59IcqjMSFi8s=
@@ -72,7 +72,7 @@
-cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+0pObdvtd8sS6EgjGVhLlQucIjT6CBMHidnFrgD/Nrzk=
@@ -80,7 +80,7 @@
-9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+9noZilKzpJNOhJ0Hb9OX2cXKZYG0FXdZO+kUsKM1pn8=
@@ -88,7 +88,7 @@
-hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
+2PlqlV9Lby0oEWaD1BaFbRNn5iyYH+/ro4UnAO7qaOg=
@@ -150,6 +150,10 @@
a0Cz4lWC+0xWCzZUYUQL5O/bt35C7pRZ1XW3fOKXBBo=
+
+
+f6PxYVuOzCEkwYdiFoTHy9qr/AuMjlE7eNGqr2N2Ok4=
+
QvXy5hjAaFV6M3+qW1WfnrX4ZyFuiBAqpnCqfAheYXE=
@@ -162,10 +166,22 @@
Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
+
+
+4VTGq5uNejUXChw+MCclK2KrZACrfIIOofqL1jahnx4=
+
zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+
+
+VfUv5Gv6hfBt9kQzeU1Q4cKplXBpkMYa22LwZ7jxCs0=
+
+
+
+RlbNnRkGavIiygXlfALbEtC8CSN19LfQ4x5Y92GdKfQ=
+
+nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
@@ -174,6 +190,10 @@
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+vcUPYwNJyv+DsVO+MeVNXiOGLKNMjJsO/UctNZFiDOg=
+
atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
@@ -186,6 +206,10 @@
GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+
+
+AUESNd0REeJq4JRjlJ2qp3wnKhuh/aN5JYpO01kppFU=
+
3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
@@ -222,6 +246,10 @@
xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
+
+
+RJEDk98YVKzW5x+7RlBsjhLPB9/wC8pi5Q91T4KWhMw=
+
3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
@@ -250,6 +278,10 @@
4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
+
+
+t0dDpRgTD86E+VnD8dOxzR8S2jH927gD3+OU7JijYl4=
+
mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
@@ -294,6 +326,14 @@
vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
+
+
+zE1MCRENlHLFZNfjfDlIFPUMQK/IZG0c6fhpe3LER+s=
+
+
+
+4euHKtQmG4wP3mcMThf4Rq8F9G52f7Ea8cVRd8CvoTs=
+
FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
@@ -316,7 +356,7 @@
-gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
@@ -324,7 +364,7 @@
-gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
@@ -360,7 +400,7 @@
-rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
+pn+BgYKiYnP40fp9amYrJvG/ksuToFs3d5Uolu/wnH8=
@@ -375,11 +415,11 @@
-j6wQ2e/3bRdLNaoLpIUuf2tGaMnoO1/0Kfa4hc8Hf7Mib1wfhvk6QsI+MnfT75A5kqjDVu1FTuh4
-NL8ghDldXDX41bo6gt6c+OuRqNkVXYIaf8eWew513cnyNO7M6hlJ4jMXUfQ96czlckGmSZultPR+
-182yvmeWWdtunTuKU723KkYpZWHO7uYhGtFVb51Dv3okGUNSmTv2SCfmpRk77WmiPDhPeskdxnSm
-806Ir3bMArZUcSHNuHQQJkFG0MneFAAamzcthRXbqoH7l9AtKqXHEUYj8CuY+7bu9BknukJmvej6
-4jBh+yRXzeKmJGUC4UkT1dGg2n1lZjOC+BMvpQ==
+cfa29AxcYNJE4l4ZqRgfsomvVMnAV4qomOmPnkgrY2llEpGnYwG68GSk/jOIp49edWRGrhHIgzck
+5EAwK76BEappt+s6zlWLbVH+TNrWava9L+2VhdBhiz1Fo+XRhagSlTv43IafcBPCgn3vayn2toCg
+25x9Q51+WkvZj7qx7Ko8uYv0EFJE38uAfa1GyTxNpTnwQcg78nW8St0YC9XRWpp3XoREwCx41/fF
+ZrKjysD8lCyexFmhSeH7KRUAUpefoxk9ivjhiOBq87gebI+snuzuFHAcw5i/kXH7O+Oh+aepC0cJ
+emcQpDqZUBWjKpr0LJ31ti8mrN8CA99UbbYWNQ==
diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index 5d85405..9a74540 100644
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,7 +4,7 @@
-4TnT2tbLmZbrnrA7yUY8PFH3TS+z2OMzNn3KL4GgPA8=
+If4UvKpwCKVzkSRbfhig+JvSLjH1FoXhe8rrukf/WoY=
@@ -64,7 +64,7 @@
-5JJZc5Kuj4Z/pZvz9pze+jQQI0jTmWtU0oQMwNjdWVg=
+rOuEvL2uYs09DB6RY1YHuSX6EuliHrA59IcqjMSFi8s=
@@ -72,7 +72,7 @@
-cFUJu+DEVOEy3fH95uYK6jiiqTpCNDE3Kyv5kDAfRF0=
+0pObdvtd8sS6EgjGVhLlQucIjT6CBMHidnFrgD/Nrzk=
@@ -80,7 +80,7 @@
-9i53tn0/qVsgysZxECV+joEJhm9Ypps9KWZX9pvOTN8=
+9noZilKzpJNOhJ0Hb9OX2cXKZYG0FXdZO+kUsKM1pn8=
@@ -88,7 +88,7 @@
-hX2wYuZws+kwR9PpwRC+10ML1WrntJO7RwE4/cRWRZ8=
+2PlqlV9Lby0oEWaD1BaFbRNn5iyYH+/ro4UnAO7qaOg=
@@ -150,6 +150,10 @@
a0Cz4lWC+0xWCzZUYUQL5O/bt35C7pRZ1XW3fOKXBBo=
+
+
+f6PxYVuOzCEkwYdiFoTHy9qr/AuMjlE7eNGqr2N2Ok4=
+
QvXy5hjAaFV6M3+qW1WfnrX4ZyFuiBAqpnCqfAheYXE=
@@ -162,10 +166,22 @@
Jgxge3taYKB1/6zR1DI5xqTEo+Xf97cD0Ji/7S1AiKY=
+
+
+4VTGq5uNejUXChw+MCclK2KrZACrfIIOofqL1jahnx4=
+
zIPachBagXO0J8zFADVIaaSzJRpTr24o5b0VEKPnHS0=
+
+
+VfUv5Gv6hfBt9kQzeU1Q4cKplXBpkMYa22LwZ7jxCs0=
+
+
+
+RlbNnRkGavIiygXlfALbEtC8CSN19LfQ4x5Y92GdKfQ=
+
+nhf1Io/Q9w8bVqA9LcSp1XFxyGSBjidM2mQC0g7m94=
@@ -174,6 +190,10 @@
FZmqOATlAZ5v6hGivuWkZ9NLyIA0B464HQ9hvqMUJBQ=
+
+
+vcUPYwNJyv+DsVO+MeVNXiOGLKNMjJsO/UctNZFiDOg=
+
atW1+50UydpPDgaUThyc1/EPt+MrvfsPzcegGGfRvjM=
@@ -186,6 +206,10 @@
GIQkHw2nvNnV/t1FJI6M9nGukDfi3PkzR+YQVBdkoew=
+
+
+AUESNd0REeJq4JRjlJ2qp3wnKhuh/aN5JYpO01kppFU=
+
3hbwK3TLaW1TVvT461gSaigsje2W/Ol74Ps+ElGSyIQ=
@@ -222,6 +246,10 @@
xkjG1a7P7VoVxIIlO2M+AKBYr77uohSmSrRN8AJzs5I=
+
+
+RJEDk98YVKzW5x+7RlBsjhLPB9/wC8pi5Q91T4KWhMw=
+
3VGlqOkDSaru/bmv6eS/4byvPdKJeBDS6Bo/lnU2bgY=
@@ -250,6 +278,10 @@
4zBEC7z3sZDhmhKOLkXJZ7/ecu7UN+W3I9kkaOUsMk4=
+
+
+t0dDpRgTD86E+VnD8dOxzR8S2jH927gD3+OU7JijYl4=
+
mEncbCDO5beLVf4GshoEy6LOyko6GMkMcEErkep3JDM=
@@ -294,6 +326,14 @@
vm4JtKqoDEF/pwWpYnqKnfacIDpptH1kPV47pgSIcH0=
+
+
+zE1MCRENlHLFZNfjfDlIFPUMQK/IZG0c6fhpe3LER+s=
+
+
+
+4euHKtQmG4wP3mcMThf4Rq8F9G52f7Ea8cVRd8CvoTs=
+
FkxfqAZ/rPGkPwnOPQ416/U6f1cj7L8VqGZ8/FPCb2w=
@@ -316,7 +356,7 @@
-gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
@@ -324,7 +364,7 @@
-gBQxs7gDjo/hpBc3i1zxrE1XQpW4Ve8xDNJKBSAteMM=
+fs5KqXTQ2wG2taX9fbsDbEjAvOZzBrSuYdubB9dtFlk=
@@ -340,7 +380,7 @@
-1Uz08mb4I9Cj6tDCPa3m+B1Gdb3P2zXA9/lWw6+hyMw=
+i5LdJFjTtonYJsYW4BDPEf6sR53/7HBmiMUs1FQP9L4=
@@ -364,7 +404,7 @@
-rmrHdDr1N9ElNs0icHuQEjA4D+AanVAQsvwZKOYYvQU=
+pn+BgYKiYnP40fp9amYrJvG/ksuToFs3d5Uolu/wnH8=
@@ -379,11 +419,11 @@
-k/BX+FLNLWtP5BclGr7SvufjaGjfoxXDZhND4uGB+2UL6IGdxCtS0ZUhrbI7CuYUhtWBE0J+Z7V7
-jSVdG2ZdBQhUEmjZ7sULTwjf3HrX54N6J8HBsycFK8Fr0DOcmJKaUv+IXQOtvm7/bFu/jyyCqVrC
-pY+rYS0te23zWoj/psKGBKwe2KvYP5c7hsFWnSdjIZQqEfPAscyVWspw9X+Lp01czg8IA9LYyp9j
-wGZdCDhPHd7GEGw3HvESfmlEjxv/Y8x4vMZ6PsHGpMELB6rCvO/IQIvevHkE1bPjg3xqRu8wEPCg
-UyUqYD5QA2CT7BnBePys/gVH7l5uX0z9nCY4fw==
+FL55NCx5pBIhMWio7JMOrvQMi2nZikZrMM5aHLTC65SE/NuRiqEZHnfmSFldMLrq79K80HLsX9Vs
+YUuu7YcRa5nPiT/wm+gaIkvH16tMM5fkdL/14bKr0POoDeiqgODoEApjoT+e/fuzFHOu1kxFRlIg
+6YNrri/4NXGioJer8F6zbbwyGPdRtkFpKYYLLWwifCDu01ULPl3ePELUKEafiU5PUi3eQ7n0nojR
+D5cDmt7X24vbt20wC/3W/wIs5xUDdRZiloLj16RlTu9k6RkyAN9cdOYNA8dsHA1XgiBiTrxuq+2/
+F6bhh2/wkXcs60BUnhbA8NqDcEWgNv5dHzaB+Q==
diff --git a/CalendarWatch.wgt b/CalendarWatch.wgt
index 6028ff1..fcf3919 100644
Binary files a/CalendarWatch.wgt and b/CalendarWatch.wgt differ
diff --git a/js/app.js b/js/app.js
index e13c9db..a9d3dcb 100644
--- a/js/app.js
+++ b/js/app.js
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-var events;
+var events = null;
+var deviceId = null;
var eventsTimeStamp = 0;
(function() {
@@ -24,22 +25,25 @@ var eventsTimeStamp = 0;
ctxContent,
center,
watchRadius;
+
- function readJSON(path) {
- /* - requests permission to view media storage
- * - resolves the file 'calendarevents'
- * - opens stream and reads entire file as json
- */
+ function getJsonFile(name, callback) {
+ /* successful resolution of wgt-private */
function onsuccess(dir){
- var dirfile = dir.resolve("calendarevents");
- console.log(dirfile);
-
- /* for tizen 4.0, should work on 5.5 aswell but tizen 5.5 uses 'openFile' for Filereading */
+ var dirfile = null;
+ try {
+ dirfile = dir.resolve(name);
+ } catch (exc) {
+ console.log(exc.message)
+ }
+
+ if(dirfile == null)
+ return null;
dirfile.openStream("r", function(fs) {
- events = JSON.parse(fs.read(dirfile.fileSize));
- fs.close();
- })
+ callback(JSON.parse(fs.read(dirfile.fileSize)));
+ fs.close();
+ });
}
function onerror(e){
@@ -56,8 +60,34 @@ var eventsTimeStamp = 0;
tizen.ppm.requestPermission("http://tizen.org/privilege/mediastorage", onsuccessPermission, onErrorPermission);
}
+
+ function readJSON(path) {
+ /* - requests permission to view media storage
+ * - resolves the file 'calendarevents'
+ * - opens stream and reads entire file as json
+ */
+
+ getJsonFile("calendarevents", function(eventlist) {events = eventlist;});
+ console.log(events);
+ }
+ function getDeviceID() {
+ // check if device id set already as global, if it is return
+ if(deviceId != null)
+ return;
+
+ // otherwise, check if there is a devicefingerprint file in wft-private
+ getJsonFile("devicefingerprint", function(df) {deviceId = df;})
+ // if there is, open it up and get your device ID from it
+
+ // otherwise, ask the longitude server for a device fingerprint file
+ }
+
function getJSON() {
+
+ /*if(deviceId == null)
+ return;
+ */
var downloadRequest = new tizen.DownloadRequest('https://longitudecalendar.com/userinfo/107971745944668140075/calendarevents.json', 'wgt-private');
tizen.systeminfo.getPropertyValue('NETWORK', function(networkInfo) {
if (networkInfo.networkType === 'NONE') {
@@ -360,6 +390,7 @@ var eventsTimeStamp = 0;
// Draw the text for date
// renderText(ctxContent, date, center.x, center.y + (watchRadius * 0.5), 25, "#999999");
+ console.log(events);
if(events == null)
return;