diff options
| author | cyberta <cyberta@riseup.net> | 2021-01-25 11:49:07 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-01-25 11:49:07 +0000 |
| commit | d2cfd37e8380f47cf450fff59867c87b6327a735 (patch) | |
| tree | 93dee5b4dcd6fa85f9bf70c17920c21f46b6402c /app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java | |
| parent | 67f62a7d20dd079fb1f6392d6c953e2ee8ea29d3 (diff) | |
| parent | bb6679c4c04e974ddb064b4cb5cee268b67b8ce1 (diff) | |
Merge branch 'fix_always_on_reboot' into 'master'
Fix always on reboot
Closes #8994
See merge request leap/bitmask_android!119
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java b/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java index a318e55d..4cb9c0c7 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java +++ b/app/src/main/java/de/blinkt/openvpn/core/connection/Connection.java @@ -7,9 +7,12 @@ package de.blinkt.openvpn.core.connection; import android.text.TextUtils; +import com.google.gson.annotations.JsonAdapter; + import java.io.Serializable; import java.util.Locale; +@JsonAdapter(ConnectionAdapter.class) public abstract class Connection implements Serializable, Cloneable { private String mServerName = "openvpn.example.com"; private String mServerPort = "1194"; |