introduce the AppMsgManager and the JsKitManager

will be used to handle application messages (push, etc)
while the JSKitManager will run PebbleKit JS scripts.

also add the ability to unpack PebbleDicts

1 files changed, 17 insertions, 12 deletions

diff --git a/daemon/unpacker.h b/daemon/unpacker.h
index 94908cb..000c3e8 100644
--- a/daemon/unpacker.h
+++ b/daemon/unpacker.h
@@ -5,19 +5,30 @@
 #include <QByteArray>
 #include <QString>
 #include <QUuid>
+#include <QVariantMap>
+#include <Log4Qt/Logger>
 
 class Unpacker
 {
+    LOG4QT_DECLARE_STATIC_LOGGER(logger, Unpacker)
+
 public:
     Unpacker(const QByteArray &data);
 
     template <typename T>
     T read();
 
+    template <typename T>
+    T readLE();
+
+    QByteArray readBytes(int n);
+
     QString readFixedString(int n);
 
     QUuid readUuid();
 
+    QMap<int, QVariant> readDict();
+
     void skip(int n);
 
     bool bad() const;
@@ -45,19 +56,13 @@ inline T Unpacker::read()
     return qFromBigEndian<T>(u);
 }
 
-inline QString Unpacker::readFixedString(int n)
-{
-    if (checkBad(n)) return QString();
-    const char *u = &_buf.constData()[_offset];
-    _offset += n;
-    return QString::fromUtf8(u, strnlen(u, n));
-}
-
-inline QUuid Unpacker::readUuid()
+template <typename T>
+inline T Unpacker::readLE()
 {
-    if (checkBad(16)) return QString();
-    _offset += 16;
-    return QUuid::fromRfc4122(_buf.mid(_offset - 16, 16));
+    if (checkBad(sizeof(T))) return 0;
+    const uchar *u = p();
+    _offset += sizeof(T);
+    return qFromLittleEndian<T>(u);
 }
 
 inline void Unpacker::skip(int n)