From 71fcf8577611d3163ea81307b04db6ba57950bb7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 18 Jan 2021 12:32:47 +0100
Subject: fix de-/serialization of Connection objects. Fixes VPN auto-restart
 on reboot due to always-on system settings or if system killed app due to low
 memory

---
 .../openvpn/core/connection/ConnectionAdapter.java | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/src/main/java/de/blinkt/openvpn/core/connection/ConnectionAdapter.java

(limited to 'app/src/main/java/de/blinkt/openvpn/core/connection/ConnectionAdapter.java')

diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/ConnectionAdapter.java b/app/src/main/java/de/blinkt/openvpn/core/connection/ConnectionAdapter.java
new file mode 100644
index 00000000..335ef34c
--- /dev/null
+++ b/app/src/main/java/de/blinkt/openvpn/core/connection/ConnectionAdapter.java
@@ -0,0 +1,35 @@
+package de.blinkt.openvpn.core.connection;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+// Adapter for Gson used to serialize and deserialize abstract Connection class, adds a property about the implemented class
+public class ConnectionAdapter implements JsonSerializer<Connection>, JsonDeserializer<Connection> {
+
+    public final static String META_TYPE = ConnectionAdapter.class.getSimpleName() + ".META_TYPE";
+    @Override
+    public Connection deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        JsonObject jsonObject = json.getAsJsonObject();
+        String className = jsonObject.get(META_TYPE).getAsString();
+        try {
+            Class<?> clz = Class.forName(className);
+            return context.deserialize(json, clz);
+        } catch (ClassNotFoundException e) {
+            throw new JsonParseException(e);
+        }
+    }
+
+    @Override
+    public JsonElement serialize(Connection src, Type typeOfSrc, JsonSerializationContext context) {
+         JsonElement json = context.serialize(src, src.getClass());
+         json.getAsJsonObject().addProperty(META_TYPE, src.getClass().getCanonicalName());
+         return json;
+    }
+}
-- 
cgit v1.2.3