diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 11f62eee62..9d3f201340 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 4955741e63..c3b92a8930 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -44,7 +44,6 @@ class HomeActivity : RiotActivity() {
})
}
-
companion object {
fun newIntent(context: Context): Intent {
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 2c8cb8419d..93a785c048 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -43,7 +43,7 @@ android {
}
dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation fileTree(dir: 'libs', include: ['*.aar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$support_version"
@@ -52,11 +52,13 @@ dependencies {
// Network
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
+ implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
implementation 'com.squareup.okio:okio:1.15.0'
+ implementation 'com.google.code.gson:gson:2.8.5'
implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
diff --git a/matrix-sdk-android/libs/olm-sdk.aar b/matrix-sdk-android/libs/olm-sdk.aar
new file mode 100644
index 0000000000..66be8a65ac
Binary files /dev/null and b/matrix-sdk-android/libs/olm-sdk.aar differ
diff --git a/matrix-sdk-android/libs/react-native-webrtc.aar b/matrix-sdk-android/libs/react-native-webrtc.aar
new file mode 100644
index 0000000000..ff5bb99f86
Binary files /dev/null and b/matrix-sdk-android/libs/react-native-webrtc.aar differ
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index 90cd94ab3e..8139d75a37 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -1,2 +1,5 @@
+ package="im.vector.matrix.android" >
+
+
+
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/EventContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/EventContent.kt
deleted file mode 100644
index 4b7d7b5dbe..0000000000
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/EventContent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package im.vector.matrix.android.api.events
-
-class EventContent : HashMap()
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
index ab1024ca1e..89106b2958 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/failure/MatrixError.kt
@@ -1,9 +1,13 @@
package im.vector.matrix.android.api.failure
import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
-data class MatrixError(@Json(name = "errcode") val code: String,
- @Json(name = "error") val message: String) {
+@JsonClass(generateAdapter = true)
+data class MatrixError(
+ @Json(name = "errcode") val code: String,
+ @Json(name = "error") val message: String
+) {
companion object {
const val FORBIDDEN = "M_FORBIDDEN"
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionModule.kt
index 9129d1bc57..e40d018e8d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/SessionModule.kt
@@ -9,7 +9,7 @@ import retrofit2.Retrofit
class SessionModule(private val connectionConfig: HomeServerConnectionConfig) : Module {
- override fun invoke(): ModuleDefinition = module {
+ override fun invoke(): ModuleDefinition = module(override = true) {
scope(DefaultSession.SCOPE) {
val retrofitBuilder = get() as Retrofit.Builder
retrofitBuilder
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncModule.kt
index 2d14559a34..386dc2d240 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncModule.kt
@@ -8,7 +8,7 @@ import retrofit2.Retrofit
class SyncModule : Module {
- override fun invoke(): ModuleDefinition = module {
+ override fun invoke(): ModuleDefinition = module(override = true) {
scope(DefaultSession.SCOPE) {
val retrofit: Retrofit = get()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncResponseHandler.kt
deleted file mode 100644
index 4ac521ec66..0000000000
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/events/sync/SyncResponseHandler.kt
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *//*
-
-package im.vector.matrix.android.internal.events.sync
-
-import android.text.TextUtils
-import android.util.Log
-import im.vector.matrix.android.api.events.Event
-import im.vector.matrix.android.api.events.EventType
-import im.vector.matrix.android.internal.events.sync.data.SyncResponse
-import java.util.*
-
-class SyncResponseHandler {
-
- */
-/**
- * Manage the sync accountData field
- *
- * @param accountData the account data
- * @param isInitialSync true if it is an initial sync response
- *//*
-
- private fun manageAccountData(accountData: Map?, isInitialSync: Boolean) {
- try {
- if (accountData!!.containsKey("events")) {
- val events = accountData["events"] as List