index : olm

My fork of libolm

diff options
context:
space:
mode:
authorPeter Cai <[email protected]>2020-06-29 09:14:55 +0800
committerPeter Cai <[email protected]>2020-06-29 09:14:55 +0800
commit171f5d1ed57c7485518f078d8e984a41a88aa40c (patch)
treee092054f5160a5a74a59e754fa8cbb72ee491f48
parentefd17631b16d1271a029e0af8f7d8e5ae795cc5d (diff)
downloadolm-171f5d1ed57c7485518f078d8e984a41a88aa40c.tar.gz
android: OlmInboundGroupSession: add empty constructorHEADmaster
* we need this to be able to deserialize data from the JS side.
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
index 2fc81ef..1442c85 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
@@ -54,6 +54,12 @@ public class OlmInboundGroupSession extends CommonSerializeUtils implements Seri
}
/**
+ * Zion addition: empty constructor for deserialization from the JS side
+ */
+ public OlmInboundGroupSession() {
+ }
+
+ /**
* Constructor.<br>
* Create and save a new native session instance ID and start a new inbound group session.
* The session key parameter is retrieved from an outbound group session.