Added primitive Network edit menu

app/src/main/java/de/kuschku/libquassel/ProtocolHandler.java

@@ -101,8 +101,6 @@ public class ProtocolHandler implements IProtocolHandler {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(@NonNull SyncFunction packedFunc) {
-        Log.d("ProtocolHandler", String.format("Sync Call: %s::%s(%s, %s)", packedFunc.className, packedFunc.methodName, packedFunc.objectName, packedFunc.params));
-
         try {
             final Object syncable = client.unsafe_getObjectByIdentifier(packedFunc.className, packedFunc.objectName);
 

app/src/main/java/de/kuschku/libquassel/functions/serializers/HeartbeatReplySerializer.java

@@ -30,6 +30,7 @@ import java.util.List;
 
 import de.kuschku.libquassel.functions.FunctionType;
 import de.kuschku.libquassel.functions.types.HeartbeatReply;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertTrue;
@@ -50,8 +51,8 @@ public class HeartbeatReplySerializer implements FunctionSerializer<HeartbeatRep
     @Override
     public List serialize(@NonNull HeartbeatReply data) {
         return Arrays.asList(
-                new QVariant<>(FunctionType.HEARTBEATREPLY.id),
-                new QVariant<>(data.dateTime)
+                new QVariant<>(QMetaType.Type.Int, FunctionType.HEARTBEATREPLY.id),
+                new QVariant<>(QMetaType.Type.QDateTime, data.dateTime)
         );
     }
 

app/src/main/java/de/kuschku/libquassel/functions/serializers/HeartbeatSerializer.java

@@ -30,6 +30,7 @@ import java.util.List;
 
 import de.kuschku.libquassel.functions.FunctionType;
 import de.kuschku.libquassel.functions.types.Heartbeat;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertTrue;
@@ -50,8 +51,8 @@ public class HeartbeatSerializer implements FunctionSerializer<Heartbeat> {
     @Override
     public List serialize(@NonNull Heartbeat data) {
         return Arrays.asList(
-                new QVariant<>(FunctionType.HEARTBEAT.id),
-                new QVariant<>(data.dateTime)
+                new QVariant<>(QMetaType.Type.Int, FunctionType.HEARTBEAT.id),
+                new QVariant<>(QMetaType.Type.QDateTime, data.dateTime)
         );
     }
 

app/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java

@@ -31,6 +31,7 @@ import de.kuschku.libquassel.functions.FunctionType;
 import de.kuschku.libquassel.functions.types.InitRequestFunction;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
+import static de.kuschku.libquassel.primitives.QMetaType.Type.Int;
 import static de.kuschku.libquassel.primitives.QMetaType.Type.QByteArray;
 import static de.kuschku.util.AndroidAssert.assertNotNull;
 import static de.kuschku.util.AndroidAssert.assertTrue;
@@ -62,7 +63,7 @@ public class InitRequestFunctionSerializer implements FunctionSerializer<InitReq
     @NonNull
     public List serializePacked(@NonNull final InitRequestFunction data) {
         return Lists.newArrayList(
-                new QVariant<>(FunctionType.INITREQUEST.id),
+                new QVariant<>(Int, FunctionType.INITREQUEST.id),
                 new QVariant<>(QByteArray, data.className),
                 new QVariant<>(QByteArray, data.objectName)
         );

app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java

@@ -51,7 +51,7 @@ public class PackedRpcCallFunctionSerializer implements FunctionSerializer<RpcCa
     @Override
     public List serialize(@NonNull final RpcCallFunction data) {
         final List func = new ArrayList<>();
-        func.add(new QVariant<>(FunctionType.RPCCALL.id));
+        func.add(new QVariant<>(QMetaType.Type.Int, FunctionType.RPCCALL.id));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.functionName));
         func.addAll(data.params);
         return func;

app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java

@@ -51,7 +51,7 @@ public class PackedSyncFunctionSerializer<T> implements FunctionSerializer<SyncF
     @Override
     public List serialize(@NonNull final SyncFunction data) {
         final List func = new ArrayList<>();
-        func.add(new QVariant<>(FunctionType.SYNC.id));
+        func.add(new QVariant<>(QMetaType.Type.Int, FunctionType.SYNC.id));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.className));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.objectName));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.methodName));

app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java

@@ -50,7 +50,7 @@ public class UnpackedRpcCallFunctionSerializer implements FunctionSerializer<Rpc
     @Override
     public List serialize(@NonNull final RpcCallFunction data) {
         final List func = new ArrayList<>();
-        func.add(new QVariant<>(FunctionType.RPCCALL.id));
+        func.add(new QVariant<>(QMetaType.Type.Int, FunctionType.RPCCALL.id));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.functionName));
         func.addAll(data.params);
         return func;

app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java

@@ -50,7 +50,7 @@ public class UnpackedSyncFunctionSerializer<T> implements FunctionSerializer<Syn
     @Override
     public List serialize(@NonNull final SyncFunction data) {
         final List func = new ArrayList<>();
-        func.add(new QVariant<>(FunctionType.SYNC.id));
+        func.add(new QVariant<>(QMetaType.Type.Int, FunctionType.SYNC.id));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.className));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.objectName));
         func.add(new QVariant<>(QMetaType.Type.QByteArray, data.methodName));

app/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java

@@ -37,6 +37,7 @@ import de.kuschku.libquassel.objects.serializers.CoreSetupDataSerializer;
 import de.kuschku.libquassel.objects.serializers.CoreSetupRejectSerializer;
 import de.kuschku.libquassel.objects.serializers.ObjectSerializer;
 import de.kuschku.libquassel.objects.serializers.SessionInitSerializer;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertTrue;
@@ -78,7 +79,7 @@ public class MessageTypeRegistry {
         assertTrue(serializerMap.containsKey(data.getClass().getSimpleName()));
 
         final QVariant<Map<String, QVariant>> map = new QVariant<>(serializerMap.get(data.getClass().getSimpleName()).toVariantMap(data));
-        map.data.put("MsgType", new QVariant(data.getClass().getSimpleName()));
+        map.data.put("MsgType", new QVariant(QMetaType.Type.QString, data.getClass().getSimpleName()));
         return map;
     }
 }

app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java

@@ -34,6 +34,7 @@ import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.ClientInitAck;
 import de.kuschku.libquassel.objects.types.StorageBackend;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 @SuppressWarnings({"unchecked", "ConstantConditions"})
@@ -60,10 +61,10 @@ public class ClientInitAckSerializer implements ObjectSerializer<ClientInitAck>
             }
 
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("Configured", new QVariant<>(data.Configured));
-        map.put("LoginEnabled", new QVariant<>(data.LoginEnabled));
-        map.put("StorageBackends", new QVariant<>(storageBackends));
-        map.put("CoreFeatures", new QVariant<>(data.CoreFeatures));
+        map.put("Configured", new QVariant<>(QMetaType.Type.Bool, data.Configured));
+        map.put("LoginEnabled", new QVariant<>(QMetaType.Type.Bool, data.LoginEnabled));
+        map.put("StorageBackends", new QVariant<>(QMetaType.Type.QVariantList, storageBackends));
+        map.put("CoreFeatures", new QVariant<>(QMetaType.Type.Int, data.CoreFeatures));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.ClientInitReject;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 @SuppressWarnings({"unchecked", "ConstantConditions"})
@@ -49,7 +50,7 @@ public class ClientInitRejectSerializer implements ObjectSerializer<ClientInitRe
     @Override
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final ClientInitReject data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("Error", new QVariant<>(data.Error));
+        map.put("Error", new QVariant<>(QMetaType.Type.QString, data.Error));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.ClientInit;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 @SuppressWarnings({"unchecked", "ConstantConditions"})
@@ -49,11 +50,11 @@ public class ClientInitSerializer implements ObjectSerializer<ClientInit> {
     @Override
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final ClientInit data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("ClientDate", new QVariant<>(data.ClientDate));
-        map.put("UseSsl", new QVariant<>(data.UseSsl));
-        map.put("ClientVersion", new QVariant<>(data.ClientVersion));
-        map.put("UseCompression", new QVariant<>(data.UseCompression));
-        map.put("ProtocolVersion", new QVariant<>(data.ProtocolVersion));
+        map.put("ClientDate", new QVariant<>(QMetaType.Type.QString, data.ClientDate));
+        map.put("UseSsl", new QVariant<>(QMetaType.Type.Bool, data.UseSsl));
+        map.put("ClientVersion", new QVariant<>(QMetaType.Type.QString, data.ClientVersion));
+        map.put("UseCompression", new QVariant<>(QMetaType.Type.Bool, data.UseCompression));
+        map.put("ProtocolVersion", new QVariant<>(QMetaType.Type.Int, data.ProtocolVersion));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.ClientLoginReject;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -53,7 +54,7 @@ public class ClientLoginRejectSerializer implements ObjectSerializer<ClientLogin
         final Map<String, QVariant<Object>> map = new HashMap<>();
         assertNotNull(map);
 
-        map.put("Error", new QVariant<>(data.Error));
+        map.put("Error", new QVariant<>(QMetaType.Type.QString, data.Error));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.ClientLogin;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -52,8 +53,8 @@ public class ClientLoginSerializer implements ObjectSerializer<ClientLogin> {
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final ClientLogin data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
 
-        map.put("User", new QVariant<>(data.User));
-        map.put("Password", new QVariant<>(data.Password));
+        map.put("User", new QVariant<>(QMetaType.Type.QString, data.User));
+        map.put("Password", new QVariant<>(QMetaType.Type.QString, data.Password));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.CoreSetupData;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -51,7 +52,7 @@ public class CoreSetupDataSerializer implements ObjectSerializer<CoreSetupData>
     @Override
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final CoreSetupData data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("SetupData", new QVariant<>(SetupDataInitializer.get().toVariantMap(data.SetupData)));
+        map.put("SetupData", new QVariant<>(QMetaType.Type.QVariantMap, SetupDataInitializer.get().toVariantMap(data.SetupData)));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.CoreSetupReject;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -51,7 +52,7 @@ public class CoreSetupRejectSerializer implements ObjectSerializer<CoreSetupReje
     @Override
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final CoreSetupReject data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("Error", new QVariant<>(data.Error));
+        map.put("Error", new QVariant<>(QMetaType.Type.QString, data.Error));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.NetworkServer;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -52,17 +53,17 @@ public class NetworkServerSerializer implements ObjectSerializer<NetworkServer>
     public Map<String, QVariant<Object>> toVariantMap(@NonNull NetworkServer data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
 
-        map.put("UseSSL", new QVariant<>(data.UseSSL));
-        map.put("sslVersion", new QVariant<>(data.sslVersion));
-        map.put("Host", new QVariant<>(data.Host));
-        map.put("Port", new QVariant<>(data.Port));
-        map.put("Password", new QVariant<>(data.Password));
-        map.put("UseProxy", new QVariant<>(data.UseProxy));
-        map.put("ProxyType", new QVariant<>(data.ProxyType));
-        map.put("ProxyHost", new QVariant<>(data.ProxyHost));
-        map.put("ProxyPort", new QVariant<>(data.ProxyPort));
-        map.put("ProxyUser", new QVariant<>(data.ProxyUser));
-        map.put("ProxyPass", new QVariant<>(data.ProxyPass));
+        map.put("UseSSL", new QVariant<>(QMetaType.Type.Bool, data.UseSSL));
+        map.put("sslVersion", new QVariant<>(QMetaType.Type.Int, data.sslVersion));
+        map.put("Host", new QVariant<>(QMetaType.Type.QString, data.Host));
+        map.put("Port", new QVariant<>(QMetaType.Type.Int, data.Port));
+        map.put("Password", new QVariant<>(QMetaType.Type.QString, data.Password));
+        map.put("UseProxy", new QVariant<>(QMetaType.Type.Bool, data.UseProxy));
+        map.put("ProxyType", new QVariant<>(QMetaType.Type.Int, data.ProxyType));
+        map.put("ProxyHost", new QVariant<>(QMetaType.Type.QString, data.ProxyHost));
+        map.put("ProxyPort", new QVariant<>(QMetaType.Type.Int, data.ProxyPort));
+        map.put("ProxyUser", new QVariant<>(QMetaType.Type.QString, data.ProxyUser));
+        map.put("ProxyPass", new QVariant<>(QMetaType.Type.QString, data.ProxyPass));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.SessionInit;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 @SuppressWarnings({"unchecked", "ConstantConditions"})
@@ -49,7 +50,7 @@ public class SessionInitSerializer implements ObjectSerializer<SessionInit> {
     @Override
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final SessionInit data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
-        map.put("SessionState", new QVariant<>(SessionStateSerializer.get().toVariantMap(data.SessionState)));
+        map.put("SessionState", new QVariant<>(QMetaType.Type.QVariantMap, SessionStateSerializer.get().toVariantMap(data.SessionState)));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.SetupData;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -52,10 +53,10 @@ public class SetupDataInitializer implements ObjectSerializer<SetupData> {
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final SetupData data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
 
-        map.put("AdminPasswd", new QVariant<>(data.AdminPasswd));
-        map.put("AdminUser", new QVariant<>(data.AdminUser));
-        map.put("Backend", new QVariant<>(data.Backend));
-        map.put("ConnectionProperties", new QVariant<>(data.ConnectionProperties));
+        map.put("AdminPasswd", new QVariant<>(QMetaType.Type.QString, data.AdminPasswd));
+        map.put("AdminUser", new QVariant<>(QMetaType.Type.QString, data.AdminUser));
+        map.put("Backend", new QVariant<>(QMetaType.Type.QString, data.Backend));
+        map.put("ConnectionProperties", new QVariant<>(QMetaType.Type.QVariantMap, data.ConnectionProperties));
         return map;
     }
 

app/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java

@@ -31,6 +31,7 @@ import de.kuschku.libquassel.functions.types.PackedFunction;
 import de.kuschku.libquassel.functions.types.SerializedFunction;
 import de.kuschku.libquassel.functions.types.UnpackedFunction;
 import de.kuschku.libquassel.objects.types.StorageBackend;
+import de.kuschku.libquassel.primitives.QMetaType;
 import de.kuschku.libquassel.primitives.types.QVariant;
 
 import static de.kuschku.util.AndroidAssert.assertNotNull;
@@ -53,10 +54,10 @@ public class StorageBackendSerializer implements ObjectSerializer<StorageBackend
     public Map<String, QVariant<Object>> toVariantMap(@NonNull final StorageBackend data) {
         final Map<String, QVariant<Object>> map = new HashMap<>();
 
-        map.put("DisplayName", new QVariant<>(data.DisplayName));
-        map.put("SetupDefaults", new QVariant<>(data.SetupDefaults));
-        map.put("Description", new QVariant<>(data.Description));
-        map.put("SetupKeys", new QVariant<>(data.SetupKeys));
+        map.put("DisplayName", new QVariant<>(QMetaType.Type.QString, data.DisplayName));
+        map.put("SetupDefaults", new QVariant<>(QMetaType.Type.QVariantMap, data.SetupDefaults));
+        map.put("Description", new QVariant<>(QMetaType.Type.QString, data.Description));
+        map.put("SetupKeys", new QVariant<>(QMetaType.Type.QStringList, data.SetupKeys));
         return map;
     }