diff --git a/CHANGES.rst b/CHANGES.rst index abed48ad7..50fb6265a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,11 @@ +Changes to Matrix Android SDK in 0.9.29 (2019-10-04) +======================================================= + +Corrective release + +Bugfix: + - Fix / Keysbackup not working (failed to get version) + Changes to Matrix Android SDK in 0.9.28 (2019-10-03) ======================================================= diff --git a/matrix-sdk-core/src/main/java/org/matrix/androidsdk/RestClient.java b/matrix-sdk-core/src/main/java/org/matrix/androidsdk/RestClient.java index ab4e012e5..ab556da73 100644 --- a/matrix-sdk-core/src/main/java/org/matrix/androidsdk/RestClient.java +++ b/matrix-sdk-core/src/main/java/org/matrix/androidsdk/RestClient.java @@ -100,7 +100,7 @@ public enum EndPointServer { private OkHttpClient mOkHttpClient; public RestClient(HomeServerConnectionConfig hsConfig, Class type, String uriPrefix) { - this(hsConfig, type, uriPrefix, GsonProvider.provideGson(), EndPointServer.HOME_SERVER); + this(hsConfig, type, uriPrefix, GsonProvider.provideKotlinGson(), EndPointServer.HOME_SERVER); } public RestClient(HomeServerConnectionConfig hsConfig, Class type, String uriPrefix, Gson gson) { diff --git a/matrix-sdk-core/src/main/java/org/matrix/androidsdk/core/json/GsonProvider.java b/matrix-sdk-core/src/main/java/org/matrix/androidsdk/core/json/GsonProvider.java index a34daa077..691b628c6 100644 --- a/matrix-sdk-core/src/main/java/org/matrix/androidsdk/core/json/GsonProvider.java +++ b/matrix-sdk-core/src/main/java/org/matrix/androidsdk/core/json/GsonProvider.java @@ -35,4 +35,15 @@ public static Gson provideGson() { return gson; } + // Can serialize/deserialise kt objects without the need to add @JVMField + private static final Gson kotlinGson = new GsonBuilder() + .registerTypeAdapter(boolean.class, new BooleanDeserializer(false)) + .registerTypeAdapter(Boolean.class, new BooleanDeserializer(true)) + .create(); + + public static Gson provideKotlinGson() { + return kotlinGson; + } + + } diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle index 6c5f70913..e0071e7aa 100644 --- a/matrix-sdk/build.gradle +++ b/matrix-sdk/build.gradle @@ -27,8 +27,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 928 - versionName "0.9.28" + versionCode 929 + versionName "0.9.29" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // Enable multi dex for test diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/core/JsonUtils.java b/matrix-sdk/src/main/java/org/matrix/androidsdk/core/JsonUtils.java index 779f4a18a..c9fc1298a 100644 --- a/matrix-sdk/src/main/java/org/matrix/androidsdk/core/JsonUtils.java +++ b/matrix-sdk/src/main/java/org/matrix/androidsdk/core/JsonUtils.java @@ -70,11 +70,6 @@ public class JsonUtils { private static final Gson basicGson = new Gson(); - private static final Gson kotlinGson = new GsonBuilder() - .registerTypeAdapter(boolean.class, new BooleanDeserializer(false)) - .registerTypeAdapter(Boolean.class, new BooleanDeserializer(true)) - .create(); - private static final Gson gson = new GsonBuilder() .setFieldNamingStrategy(new MatrixFieldNamingStrategy()) .excludeFieldsWithModifiers(Modifier.PRIVATE, Modifier.STATIC) @@ -104,15 +99,6 @@ public static Gson getBasicGson() { return basicGson; } - /** - * Provides the JSON parser for Kotlin. - * - * @return the kotlin JSON parser - */ - public static Gson getKotlinGson() { - return kotlinGson; - } - /** * Provides the JSON parser. *