From c7ce5c61b18ab5beb1b363e4ea304d64e479b484 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 11 Oct 2018 17:35:15 +0200 Subject: [PATCH] Clean some files --- .../im/vector/matrix/android/api/events/Event.kt | 12 +----------- .../matrix/android/internal/auth/AuthModule.kt | 1 - .../android/internal/auth/DefaultAuthenticator.kt | 1 - .../{api => internal}/auth/SessionParamsStore.kt | 2 +- .../internal/auth/db/ObjectBoxSessionParamsStore.kt | 2 +- .../internal/network/AccessTokenInterceptor.kt | 2 +- 6 files changed, 4 insertions(+), 16 deletions(-) rename matrix-sdk-android/src/main/java/im/vector/matrix/android/{api => internal}/auth/SessionParamsStore.kt (78%) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt index 9f897a53..642b24f0 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/events/Event.kt @@ -1,9 +1,7 @@ package im.vector.matrix.android.api.events -import com.google.gson.JsonObject import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import im.vector.matrix.android.internal.legacy.util.JsonUtils @JsonClass(generateAdapter = true) data class Event( @@ -16,14 +14,6 @@ data class Event( @Json(name = "state_key") val stateKey: String? = null, @Json(name = "room_id") val roomId: String? = null, @Json(name = "unsigned_data") val unsignedData: UnsignedData? = null -){ - - fun contentAsJsonObject(): JsonObject? { - return JsonUtils.toJson(content) - } - - - -} +) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt index b9fe0410..8b61de0a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthModule.kt @@ -2,7 +2,6 @@ package im.vector.matrix.android.internal.auth import android.content.Context import im.vector.matrix.android.api.auth.Authenticator -import im.vector.matrix.android.api.auth.SessionParamsStore import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParams import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParamsMapper import im.vector.matrix.android.internal.auth.db.ObjectBoxSessionParamsStore diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt index 118170b4..751fd40f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt @@ -4,7 +4,6 @@ import arrow.core.leftIfNull import com.squareup.moshi.Moshi import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.auth.Authenticator -import im.vector.matrix.android.api.auth.SessionParamsStore import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.Session diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt similarity index 78% rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt index 908a69c9..0108dea5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/SessionParamsStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt @@ -1,4 +1,4 @@ -package im.vector.matrix.android.api.auth +package im.vector.matrix.android.internal.auth import im.vector.matrix.android.internal.auth.data.SessionParams diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt index 19b31c06..5083766b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/ObjectBoxSessionParamsStore.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.auth.db -import im.vector.matrix.android.api.auth.SessionParamsStore +import im.vector.matrix.android.internal.auth.SessionParamsStore import im.vector.matrix.android.internal.auth.data.SessionParams import io.objectbox.Box diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt index 2274a4fc..0dbf2cc5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/AccessTokenInterceptor.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.network -import im.vector.matrix.android.api.auth.SessionParamsStore +import im.vector.matrix.android.internal.auth.SessionParamsStore import okhttp3.Interceptor import okhttp3.Response