From 240b4715fc0da9d9367beb82d90ef5d4bb0dcb49 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 8 Nov 2018 11:04:40 +0100 Subject: [PATCH] Add internal keyword where it makes sense --- .../auth/data/Credentials.kt | 2 +- .../auth/data/SessionParams.kt | 4 +-- .../matrix/android/api/session/Session.kt | 2 +- .../matrix/android/internal/auth/AuthAPI.kt | 4 +-- .../internal/auth/DefaultAuthenticator.kt | 6 ++-- .../internal/auth/SessionParamsStore.kt | 4 +-- .../android/internal/auth/data/LoginFlow.kt | 2 +- .../internal/auth/data/LoginFlowResponse.kt | 2 +- .../internal/auth/data/LoginFlowTypes.kt | 2 +- .../android/internal/auth/data/LoginParams.kt | 2 +- .../internal/auth/data/PasswordLoginParams.kt | 2 +- .../internal/auth/data/ThreePidMedium.kt | 2 +- .../auth/db/RealmSessionParamsStore.kt | 4 +-- .../internal/auth/db/SessionParamsEntity.kt | 2 +- .../internal/auth/db/SessionParamsMapper.kt | 6 ++-- .../android/internal/database/DBConstants.kt | 2 +- .../internal/database/RealmLiveData.kt | 22 ------------- .../internal/database/SessionRealmHolder.kt | 31 ------------------- .../database/helper/EventListHelper.kt | 2 +- .../internal/database/mapper/EventMapper.kt | 10 +++--- .../internal/database/mapper/GroupMapper.kt | 6 ++-- .../database/mapper/GroupSummaryMapper.kt | 6 ++-- .../internal/database/mapper/RoomMapper.kt | 6 ++-- .../database/mapper/RoomSummaryMapper.kt | 6 ++-- .../internal/database/model/ChunkEntity.kt | 2 +- .../internal/database/model/EventEntity.kt | 2 +- .../internal/database/model/GroupEntity.kt | 2 +- .../database/model/GroupSummaryEntity.kt | 2 +- .../database/model/ReadReceiptEntity.kt | 2 +- .../internal/database/model/RoomEntity.kt | 2 +- .../database/model/RoomSummaryEntity.kt | 2 +- .../internal/database/model/SyncEntity.kt | 2 +- .../database/query/ChunkEntityQueries.kt | 10 +++--- .../database/query/EventEntityQueries.kt | 10 +++--- .../database/query/GroupEntityQueries.kt | 4 +-- .../query/GroupSummaryEntityQueries.kt | 2 +- .../query/ReadReceiptEntityQueries.kt | 2 +- .../database/query/RoomEntityQueries.kt | 4 +-- .../query/RoomSummaryEntityQueries.kt | 4 +-- .../internal/legacy/MXDataHandler.java | 2 +- .../android/internal/legacy/MXSession.java | 4 +-- .../android/internal/legacy/RestClient.java | 4 +-- .../data/cryptostore/IMXCryptoStore.java | 2 +- .../data/cryptostore/MXFileCryptoStore.java | 2 +- .../legacy/data/store/MXFileStore.java | 2 +- .../legacy/data/store/MXMemoryStore.java | 2 +- .../rest/client/AccountDataRestClient.java | 2 +- .../legacy/rest/client/CallRestClient.java | 2 +- .../legacy/rest/client/CryptoRestClient.java | 2 +- .../legacy/rest/client/EventsRestClient.java | 2 +- .../legacy/rest/client/FilterRestClient.java | 2 +- .../legacy/rest/client/GroupsRestClient.java | 2 +- .../legacy/rest/client/LoginRestClient.java | 4 +-- .../rest/client/MediaScanRestClient.java | 2 +- .../rest/client/PresenceRestClient.java | 2 +- .../legacy/rest/client/ProfileRestClient.java | 2 +- .../rest/client/PushRulesRestClient.java | 2 +- .../legacy/rest/client/PushersRestClient.java | 2 +- .../legacy/rest/client/RoomsRestClient.java | 2 +- .../rest/client/ThirdPidRestClient.java | 2 +- .../legacy/rest/model/CreateRoomParams.java | 2 +- .../internal/legacy/util/ContentManager.java | 2 +- .../network/AccessTokenInterceptor.kt | 2 +- .../network/NetworkConnectivityChecker.kt | 2 +- .../internal/network/NetworkConstants.kt | 2 +- .../android/internal/network/Request.kt | 4 +-- .../network/parsing/UriMoshiAdapter.kt | 2 +- .../android/internal/network/ssl/CertUtil.kt | 2 +- .../network/ssl/PinnedTrustManager.kt | 2 +- .../ssl/UnrecognizedCertificateException.kt | 2 +- .../internal/session/DefaultSession.kt | 4 +-- .../android/internal/session/SessionModule.kt | 4 +-- .../interceptor/MessageEventInterceptor.kt | 2 +- .../internal/session/group/DefaultGroup.kt | 2 +- .../session/group/DefaultGroupService.kt | 2 +- .../session/group/GetGroupDataRequest.kt | 2 +- .../internal/session/group/GroupAPI.kt | 2 +- .../session/group/model/GroupProfile.kt | 2 +- .../internal/session/group/model/GroupRoom.kt | 2 +- .../session/group/model/GroupRooms.kt | 2 +- .../group/model/GroupSummaryResponse.kt | 2 +- .../group/model/GroupSummaryRoomsSection.kt | 2 +- .../session/group/model/GroupSummaryUser.kt | 2 +- .../group/model/GroupSummaryUsersSection.kt | 2 +- .../internal/session/group/model/GroupUser.kt | 2 +- .../session/group/model/GroupUsers.kt | 2 +- .../internal/session/room/DefaultRoom.kt | 2 +- .../session/room/DefaultRoomService.kt | 2 +- .../android/internal/session/room/RoomAPI.kt | 2 +- .../session/room/RoomAvatarResolver.kt | 2 +- .../session/room/RoomSummaryUpdater.kt | 2 +- .../room/members/RoomDisplayNameResolver.kt | 2 +- .../members/RoomMemberDisplayNameResolver.kt | 2 +- .../room/members/RoomMembersResponse.kt | 2 +- .../room/timeline/DefaultTimelineHolder.kt | 2 +- .../room/timeline/PaginationDirection.kt | 2 +- .../room/timeline/PaginationRequest.kt | 2 +- .../room/timeline/TimelineBoundaryCallback.kt | 2 +- .../session/room/timeline/TokenChunkEvent.kt | 2 +- .../session/sync/ReadReceiptHandler.kt | 2 +- .../session/sync/StateEventsChunkHandler.kt | 2 +- .../android/internal/session/sync/SyncAPI.kt | 2 +- .../internal/session/sync/SyncModule.kt | 2 +- .../internal/session/sync/SyncTokenStore.kt | 2 +- .../sync/UserAccountDataSyncHandler.kt | 2 +- .../internal/session/sync/model/DeviceInfo.kt | 2 +- .../session/sync/model/DeviceListResponse.kt | 2 +- .../DeviceOneTimeKeysCountSyncResponse.kt | 2 +- .../session/sync/model/DevicesListResponse.kt | 2 +- .../session/sync/model/GroupSyncProfile.kt | 2 +- .../session/sync/model/GroupsSyncResponse.kt | 2 +- .../session/sync/model/InvitedGroupSync.kt | 2 +- .../session/sync/model/InvitedRoomSync.kt | 2 +- .../sync/model/PresenceSyncResponse.kt | 2 +- .../session/sync/model/RoomInviteState.kt | 2 +- .../session/sync/model/RoomResponse.kt | 2 +- .../internal/session/sync/model/RoomSync.kt | 2 +- .../session/sync/model/RoomSyncAccountData.kt | 2 +- .../session/sync/model/RoomSyncEphemeral.kt | 2 +- .../session/sync/model/RoomSyncState.kt | 2 +- .../session/sync/model/RoomSyncSummary.kt | 2 +- .../session/sync/model/RoomSyncTimeline.kt | 2 +- .../sync/model/RoomSyncUnreadNotifications.kt | 2 +- .../session/sync/model/RoomsSyncResponse.kt | 2 +- .../session/sync/model/SyncResponse.kt | 2 +- .../sync/model/ToDeviceSyncResponse.kt | 2 +- .../session/sync/model/TokensChunkResponse.kt | 2 +- .../session/sync/model/UserAccountData.kt | 2 +- .../model/UserAccountDataDirectMessages.kt | 2 +- .../sync/model/UserAccountDataFallback.kt | 2 +- .../session/sync/model/UserAccountDataSync.kt | 2 +- .../util/BackgroundDetectionObserver.kt | 2 +- .../internal/util/CancelableCoroutine.kt | 2 +- .../util/MatrixCoroutineDispatchers.kt | 2 +- .../matrix/android/internal/util/Monarchy.kt | 4 +-- 135 files changed, 170 insertions(+), 225 deletions(-) rename matrix-sdk-android/src/main/java/im/vector/matrix/android/{internal => api}/auth/data/Credentials.kt (89%) rename matrix-sdk-android/src/main/java/im/vector/matrix/android/{internal => api}/auth/data/SessionParams.kt (51%) delete mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt delete mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmHolder.kt diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt similarity index 89% rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/Credentials.kt rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt index 4c8c95d9..ccfbc5ae 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/Credentials.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/Credentials.kt @@ -1,4 +1,4 @@ -package im.vector.matrix.android.internal.auth.data +package im.vector.matrix.android.api.auth.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/SessionParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt similarity index 51% rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/SessionParams.kt rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt index 1c36cf64..e3ff7bdf 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/SessionParams.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/SessionParams.kt @@ -1,6 +1,4 @@ -package im.vector.matrix.android.internal.auth.data - -import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig +package im.vector.matrix.android.api.auth.data data class SessionParams( val credentials: Credentials, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt index c06e76ea..5297cca2 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt @@ -3,7 +3,7 @@ package im.vector.matrix.android.api.session import android.support.annotation.MainThread import im.vector.matrix.android.api.session.group.GroupService import im.vector.matrix.android.api.session.room.RoomService -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams interface Session : RoomService, GroupService { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt index 0a66afb5..532717cd 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/AuthAPI.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.auth -import im.vector.matrix.android.internal.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.auth.data.PasswordLoginParams import im.vector.matrix.android.internal.network.NetworkConstants import retrofit2.Call @@ -10,7 +10,7 @@ import retrofit2.http.POST /** * The login REST API. */ -interface AuthAPI { +internal interface AuthAPI { /** * Pass params to the server for the current login phase. 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 2dd7f6e3..e352af3c 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 @@ -6,9 +6,9 @@ import im.vector.matrix.android.api.auth.Authenticator import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.Cancelable -import im.vector.matrix.android.internal.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.auth.data.PasswordLoginParams -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.internal.auth.data.ThreePidMedium import im.vector.matrix.android.internal.network.executeRequest import im.vector.matrix.android.internal.session.DefaultSession @@ -19,7 +19,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import retrofit2.Retrofit -class DefaultAuthenticator(private val retrofitBuilder: Retrofit.Builder, +internal class DefaultAuthenticator(private val retrofitBuilder: Retrofit.Builder, private val coroutineDispatchers: MatrixCoroutineDispatchers, private val sessionParamsStore: SessionParamsStore) : Authenticator { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt index e8c60549..20825bf9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/SessionParamsStore.kt @@ -1,9 +1,9 @@ package im.vector.matrix.android.internal.auth import arrow.core.Try -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams -interface SessionParamsStore { +internal interface SessionParamsStore { fun get(): SessionParams? diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt index 978f3438..8e9ed210 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlow.kt @@ -3,5 +3,5 @@ package im.vector.matrix.android.internal.auth.data import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class LoginFlow(val type: String, +internal data class LoginFlow(val type: String, val stages: List) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt index f8d524a4..5087ff6b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowResponse.kt @@ -3,4 +3,4 @@ package im.vector.matrix.android.internal.auth.data import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class LoginFlowResponse(val flows: List) \ No newline at end of file +internal data class LoginFlowResponse(val flows: List) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt index 1c5e8fb7..31c2bfde 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginFlowTypes.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.auth.data -object LoginFlowTypes { +internal object LoginFlowTypes { const val PASSWORD = "m.login.password" const val OAUTH2 = "m.login.oauth2" const val EMAIL_CODE = "m.login.email.code" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt index d57fffa3..3ae92d77 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/LoginParams.kt @@ -1,5 +1,5 @@ package im.vector.matrix.android.internal.auth.data -interface LoginParams { +internal interface LoginParams { val type: String } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt index 461a54b8..ed4eb388 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/PasswordLoginParams.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class PasswordLoginParams(@Json(name = "identifier") val identifier: Map, +internal data class PasswordLoginParams(@Json(name = "identifier") val identifier: Map, @Json(name = "password") val password: String, @Json(name = "type") override val type: String, @Json(name = "initial_device_display_name") val deviceDisplayName: String?, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt index ec24473c..a61a8c75 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/data/ThreePidMedium.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.auth.data -object ThreePidMedium { +internal object ThreePidMedium { const val EMAIL = "email" const val MSISDN = "msisdn" } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt index 0adceee4..d0a09ce8 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/RealmSessionParamsStore.kt @@ -2,11 +2,11 @@ package im.vector.matrix.android.internal.auth.db import arrow.core.Try import im.vector.matrix.android.internal.auth.SessionParamsStore -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams import io.realm.Realm import io.realm.RealmConfiguration -class RealmSessionParamsStore(private val mapper: SessionParamsMapper, +internal class RealmSessionParamsStore(private val mapper: SessionParamsMapper, private val realmConfiguration: RealmConfiguration) : SessionParamsStore { override fun save(sessionParams: SessionParams): Try { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt index fe1cbfc8..a259d9a2 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsEntity.kt @@ -2,7 +2,7 @@ package im.vector.matrix.android.internal.auth.db import io.realm.RealmObject -open class SessionParamsEntity( +internal open class SessionParamsEntity( var credentialsJson: String = "", var homeServerConnectionConfigJson: String = "" ) : RealmObject() \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt index a382e61e..ef050417 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt @@ -2,10 +2,10 @@ package im.vector.matrix.android.internal.auth.db import com.squareup.moshi.Moshi import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig -import im.vector.matrix.android.internal.auth.data.Credentials -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.SessionParams -class SessionParamsMapper(moshi: Moshi) { +internal class SessionParamsMapper(moshi: Moshi) { private val credentialsAdapter = moshi.adapter(Credentials::class.java) private val homeServerConnectionConfigAdapter = moshi.adapter(HomeServerConnectionConfig::class.java) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt index 3aa63a15..4e44ca83 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/DBConstants.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.database -object DBConstants { +internal object DBConstants { const val STATE_EVENTS_CHUNK_TOKEN = "STATE_EVENTS_CHUNK_TOKEN" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt deleted file mode 100644 index 74237561..00000000 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveData.kt +++ /dev/null @@ -1,22 +0,0 @@ -package im.vector.matrix.android.internal.database - -import android.arch.lifecycle.LiveData -import io.realm.RealmChangeListener -import io.realm.RealmModel -import io.realm.RealmResults - -class RealmLiveData(private val realmResults: RealmResults, - private val mapper: (T) -> U) : LiveData>() { - - private val listener = RealmChangeListener> { results -> - value = results.map { mapper.invoke(it) } - } - - override fun onActive() { - realmResults.addChangeListener(listener) - } - - override fun onInactive() { - realmResults.removeChangeListener(listener) - } -} \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmHolder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmHolder.kt deleted file mode 100644 index 254ff8b6..00000000 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/SessionRealmHolder.kt +++ /dev/null @@ -1,31 +0,0 @@ -package im.vector.matrix.android.internal.database - -import android.support.annotation.MainThread -import io.realm.Realm -import io.realm.RealmConfiguration -import java.util.concurrent.atomic.AtomicBoolean - -class SessionRealmHolder(private val realmConfiguration: RealmConfiguration -) { - - lateinit var instance: Realm - private val isOpen = AtomicBoolean(false) - - @MainThread - fun open() { - if (isOpen.compareAndSet(false, true)) { - instance = Realm.getInstance(realmConfiguration) - } - } - - @MainThread - fun close() { - if (isOpen.compareAndSet(true, false)) { - instance.close() - Realm.compactRealm(realmConfiguration) - } - } - - -} - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/EventListHelper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/EventListHelper.kt index 99f1edd8..24fdac06 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/EventListHelper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/EventListHelper.kt @@ -5,7 +5,7 @@ import im.vector.matrix.android.internal.database.mapper.asEntity import im.vector.matrix.android.internal.database.model.ChunkEntity import im.vector.matrix.android.internal.database.query.fastContains -fun List.addManagedToChunk(chunkEntity: ChunkEntity) { +internal fun List.addManagedToChunk(chunkEntity: ChunkEntity) { if (!chunkEntity.isManaged) { throw IllegalStateException("Chunk entity should be managed to use fast contains") } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt index e90798b6..1233a41d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt @@ -7,13 +7,13 @@ import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.internal.di.MoshiProvider -object EventMapper { +internal object EventMapper { private val moshi = MoshiProvider.providesMoshi() private val type = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java) private val adapter = moshi.adapter>(type) - internal fun map(event: Event): EventEntity { + fun map(event: Event): EventEntity { val eventEntity = EventEntity() eventEntity.eventId = event.eventId ?: "" eventEntity.content = adapter.toJson(event.content) @@ -28,7 +28,7 @@ object EventMapper { return eventEntity } - internal fun map(eventEntity: EventEntity): Event { + fun map(eventEntity: EventEntity): Event { return Event( type = eventEntity.type, eventId = eventEntity.eventId, @@ -44,10 +44,10 @@ object EventMapper { } } -fun EventEntity.asDomain(): Event { +internal fun EventEntity.asDomain(): Event { return EventMapper.map(this) } -fun Event.asEntity(): EventEntity { +internal fun Event.asEntity(): EventEntity { return EventMapper.map(this) } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt index 9587d3d4..40661845 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupMapper.kt @@ -5,15 +5,15 @@ import im.vector.matrix.android.internal.database.model.GroupEntity import im.vector.matrix.android.internal.session.group.DefaultGroup -object GroupMapper { +internal object GroupMapper { - internal fun map(groupEntity: GroupEntity): Group { + fun map(groupEntity: GroupEntity): Group { return DefaultGroup( groupEntity.groupId ) } } -fun GroupEntity.asDomain(): Group { +internal fun GroupEntity.asDomain(): Group { return GroupMapper.map(this) } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt index a08fd810..ca67e23e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/GroupSummaryMapper.kt @@ -4,9 +4,9 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.internal.database.model.GroupSummaryEntity -object GroupSummaryMapper { +internal object GroupSummaryMapper { - internal fun map(roomSummaryEntity: GroupSummaryEntity): GroupSummary { + fun map(roomSummaryEntity: GroupSummaryEntity): GroupSummary { return GroupSummary( roomSummaryEntity.groupId, roomSummaryEntity.displayName, @@ -18,6 +18,6 @@ object GroupSummaryMapper { } } -fun GroupSummaryEntity.asDomain(): GroupSummary { +internal fun GroupSummaryEntity.asDomain(): GroupSummary { return GroupSummaryMapper.map(this) } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMapper.kt index 254cdab5..7194a851 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomMapper.kt @@ -5,10 +5,10 @@ import im.vector.matrix.android.internal.database.model.RoomEntity import im.vector.matrix.android.internal.session.room.DefaultRoom -object RoomMapper { +internal object RoomMapper { - internal fun map(roomEntity: RoomEntity): Room { + fun map(roomEntity: RoomEntity): Room { return DefaultRoom( roomEntity.roomId, roomEntity.membership @@ -16,6 +16,6 @@ object RoomMapper { } } -fun RoomEntity.asDomain(): Room { +internal fun RoomEntity.asDomain(): Room { return RoomMapper.map(this) } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt index 859af6ff..a8933aef 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt @@ -4,9 +4,9 @@ import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.internal.database.model.RoomSummaryEntity -object RoomSummaryMapper { +internal object RoomSummaryMapper { - internal fun map(roomSummaryEntity: RoomSummaryEntity): RoomSummary { + fun map(roomSummaryEntity: RoomSummaryEntity): RoomSummary { return RoomSummary( roomSummaryEntity.roomId, roomSummaryEntity.displayName ?: "", @@ -18,6 +18,6 @@ object RoomSummaryMapper { } } -fun RoomSummaryEntity.asDomain(): RoomSummary { +internal fun RoomSummaryEntity.asDomain(): RoomSummary { return RoomSummaryMapper.map(this) } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt index e763893f..cd84d257 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ChunkEntity.kt @@ -5,7 +5,7 @@ import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.LinkingObjects -open class ChunkEntity(var prevToken: String? = null, +internal open class ChunkEntity(var prevToken: String? = null, var nextToken: String? = null, var events: RealmList = RealmList() ) : RealmObject() { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt index 370b9c5f..f54fa93f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt @@ -5,7 +5,7 @@ import io.realm.RealmResults import io.realm.annotations.LinkingObjects import io.realm.annotations.PrimaryKey -open class EventEntity(@PrimaryKey var eventId: String = "", +internal open class EventEntity(@PrimaryKey var eventId: String = "", var type: String = "", var content: String = "", var prevContent: String? = null, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt index d88d5ac7..120f2d88 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupEntity.kt @@ -6,7 +6,7 @@ import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey import kotlin.properties.Delegates -open class GroupEntity(@PrimaryKey var groupId: String = "" +internal open class GroupEntity(@PrimaryKey var groupId: String = "" ) : RealmObject() { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt index 4e903d53..6bda9350 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/GroupSummaryEntity.kt @@ -4,7 +4,7 @@ import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey -open class GroupSummaryEntity(@PrimaryKey var groupId: String = "", +internal open class GroupSummaryEntity(@PrimaryKey var groupId: String = "", var displayName: String = "", var shortDescription: String = "", var avatarUrl: String = "", diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt index e3ff44d4..a62d59e1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ReadReceiptEntity.kt @@ -3,7 +3,7 @@ package im.vector.matrix.android.internal.database.model import io.realm.RealmObject import io.realm.annotations.PrimaryKey -open class ReadReceiptEntity(@PrimaryKey var primaryKey: String = "", +internal open class ReadReceiptEntity(@PrimaryKey var primaryKey: String = "", var userId: String = "", var eventId: String = "", var roomId: String = "", diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt index 8aa3251d..e8df6e34 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomEntity.kt @@ -7,7 +7,7 @@ import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey import kotlin.properties.Delegates -open class RoomEntity(@PrimaryKey var roomId: String = "", +internal open class RoomEntity(@PrimaryKey var roomId: String = "", var chunks: RealmList = RealmList(), var areAllMembersLoaded: Boolean = false ) : RealmObject() { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt index 7e47cee7..de2a3b04 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt @@ -4,7 +4,7 @@ import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.PrimaryKey -open class RoomSummaryEntity(@PrimaryKey var roomId: String = "", +internal open class RoomSummaryEntity(@PrimaryKey var roomId: String = "", var displayName: String? = "", var avatarUrl: String? = "", var topic: String? = "", diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt index 2f68ef06..72e02e3f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/SyncEntity.kt @@ -3,6 +3,6 @@ package im.vector.matrix.android.internal.database.model import io.realm.RealmObject import io.realm.annotations.PrimaryKey -open class SyncEntity(var nextBatch: String? = null, +internal open class SyncEntity(var nextBatch: String? = null, @PrimaryKey var id: Long = 0 ) : RealmObject() \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt index ca5c90fe..f6a959c8 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ChunkEntityQueries.kt @@ -9,14 +9,14 @@ import io.realm.RealmQuery import io.realm.RealmResults import io.realm.kotlin.where -fun ChunkEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { +internal fun ChunkEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { return realm.where() .equalTo("${ChunkEntityFields.ROOM}.${RoomEntityFields.ROOM_ID}", roomId) .notEqualTo(ChunkEntityFields.PREV_TOKEN, DBConstants.STATE_EVENTS_CHUNK_TOKEN) .notEqualTo(ChunkEntityFields.NEXT_TOKEN, DBConstants.STATE_EVENTS_CHUNK_TOKEN) } -fun ChunkEntity.Companion.findWithPrevToken(realm: Realm, roomId: String, prevToken: String?): ChunkEntity? { +internal fun ChunkEntity.Companion.findWithPrevToken(realm: Realm, roomId: String, prevToken: String?): ChunkEntity? { if (prevToken == null) { return null } @@ -26,7 +26,7 @@ fun ChunkEntity.Companion.findWithPrevToken(realm: Realm, roomId: String, prevTo .findFirst() } -fun ChunkEntity.Companion.findWithNextToken(realm: Realm, roomId: String, nextToken: String?): ChunkEntity? { +internal fun ChunkEntity.Companion.findWithNextToken(realm: Realm, roomId: String, nextToken: String?): ChunkEntity? { if (nextToken == null) { return null } @@ -36,7 +36,7 @@ fun ChunkEntity.Companion.findWithNextToken(realm: Realm, roomId: String, nextTo .findFirst() } -fun ChunkEntity.Companion.findLastLiveChunkFromRoom(realm: Realm, roomId: String): ChunkEntity? { +internal fun ChunkEntity.Companion.findLastLiveChunkFromRoom(realm: Realm, roomId: String): ChunkEntity? { return where(realm, roomId) .and() .isNull(ChunkEntityFields.NEXT_TOKEN) @@ -44,7 +44,7 @@ fun ChunkEntity.Companion.findLastLiveChunkFromRoom(realm: Realm, roomId: String .last(null) } -fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, eventIds: List): RealmResults { +internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, eventIds: List): RealmResults { return realm.where() .`in`(ChunkEntityFields.EVENTS.EVENT_ID, eventIds.toTypedArray()) .notEqualTo(ChunkEntityFields.PREV_TOKEN, DBConstants.STATE_EVENTS_CHUNK_TOKEN) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt index eda69db4..66c00d4b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt @@ -10,12 +10,12 @@ import io.realm.RealmQuery import io.realm.Sort import io.realm.kotlin.where -fun EventEntity.Companion.where(realm: Realm, eventId: String): RealmQuery { +internal fun EventEntity.Companion.where(realm: Realm, eventId: String): RealmQuery { return realm.where() .equalTo(EventEntityFields.EVENT_ID, eventId) } -fun EventEntity.Companion.where(realm: Realm, roomId: String? = null, type: String? = null): RealmQuery { +internal fun EventEntity.Companion.where(realm: Realm, roomId: String? = null, type: String? = null): RealmQuery { val query = realm.where() if (roomId != null) { query.equalTo("${EventEntityFields.CHUNK}.${ChunkEntityFields.ROOM}.${RoomEntityFields.ROOM_ID}", roomId) @@ -26,13 +26,13 @@ fun EventEntity.Companion.where(realm: Realm, roomId: String? = null, type: Stri return query } -fun EventEntity.Companion.stateEvents(realm: Realm, roomId: String): RealmQuery { +internal fun EventEntity.Companion.stateEvents(realm: Realm, roomId: String): RealmQuery { return realm.where() .equalTo("${EventEntityFields.CHUNK}.${ChunkEntityFields.ROOM}.${RoomEntityFields.ROOM_ID}", roomId) .isNotNull(EventEntityFields.STATE_KEY) } -fun RealmQuery.last(from: Long? = null): EventEntity? { +internal fun RealmQuery.last(from: Long? = null): EventEntity? { if (from != null) { this.lessThan(EventEntityFields.ORIGIN_SERVER_TS, from) } @@ -41,6 +41,6 @@ fun RealmQuery.last(from: Long? = null): EventEntity? { .findFirst() } -fun RealmList.fastContains(eventEntity: EventEntity): Boolean { +internal fun RealmList.fastContains(eventEntity: EventEntity): Boolean { return this.where().equalTo(EventEntityFields.EVENT_ID, eventEntity.eventId).findFirst() != null } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt index 4d6df4cb..eb11ff11 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupEntityQueries.kt @@ -7,11 +7,11 @@ import io.realm.Realm import io.realm.RealmQuery import io.realm.kotlin.where -fun GroupEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { +internal fun GroupEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { return realm.where().equalTo(GroupEntityFields.GROUP_ID, roomId) } -fun GroupEntity.Companion.where(realm: Realm, membership: MyMembership? = null): RealmQuery { +internal fun GroupEntity.Companion.where(realm: Realm, membership: MyMembership? = null): RealmQuery { val query = realm.where() if (membership != null) { query.equalTo(GroupEntityFields.MEMBERSHIP_STR, membership.name) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt index 41a4690b..d7605ba6 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/GroupSummaryEntityQueries.kt @@ -6,7 +6,7 @@ import io.realm.Realm import io.realm.RealmQuery import io.realm.kotlin.where -fun GroupSummaryEntity.Companion.where(realm: Realm, groupId: String? = null): RealmQuery { +internal fun GroupSummaryEntity.Companion.where(realm: Realm, groupId: String? = null): RealmQuery { val query = realm.where() if (groupId != null) { query.equalTo(GroupSummaryEntityFields.GROUP_ID, groupId) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt index 7015a1fd..94fd6239 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/ReadReceiptEntityQueries.kt @@ -6,7 +6,7 @@ import io.realm.Realm import io.realm.RealmQuery import io.realm.kotlin.where -fun ReadReceiptEntity.Companion.where(realm: Realm, roomId: String, userId: String): RealmQuery { +internal fun ReadReceiptEntity.Companion.where(realm: Realm, roomId: String, userId: String): RealmQuery { return realm.where() .equalTo(ReadReceiptEntityFields.ROOM_ID, roomId) .equalTo(ReadReceiptEntityFields.USER_ID, userId) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt index 969caede..d650d3d8 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomEntityQueries.kt @@ -7,11 +7,11 @@ import io.realm.Realm import io.realm.RealmQuery import io.realm.kotlin.where -fun RoomEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { +internal fun RoomEntity.Companion.where(realm: Realm, roomId: String): RealmQuery { return realm.where().equalTo(RoomEntityFields.ROOM_ID, roomId) } -fun RoomEntity.Companion.where(realm: Realm, membership: MyMembership? = null): RealmQuery { +internal fun RoomEntity.Companion.where(realm: Realm, membership: MyMembership? = null): RealmQuery { val query = realm.where() if (membership != null) { query.equalTo(RoomEntityFields.MEMBERSHIP_STR, membership.name) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt index 8d2fada7..90cc0684 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/RoomSummaryEntityQueries.kt @@ -6,7 +6,7 @@ import io.realm.Realm import io.realm.RealmQuery import io.realm.kotlin.where -fun RoomSummaryEntity.Companion.where(realm: Realm, roomId: String? = null): RealmQuery { +internal fun RoomSummaryEntity.Companion.where(realm: Realm, roomId: String? = null): RealmQuery { val query = realm.where() if (roomId != null) { query.equalTo(RoomSummaryEntityFields.ROOM_ID, roomId) @@ -14,7 +14,7 @@ fun RoomSummaryEntity.Companion.where(realm: Realm, roomId: String? = null): Rea return query } -fun RoomSummaryEntity.Companion.lastSelected(realm: Realm): RoomSummaryEntity? { +internal fun RoomSummaryEntity.Companion.lastSelected(realm: Realm): RoomSummaryEntity? { return realm.where() .equalTo(RoomSummaryEntityFields.IS_LATEST_SELECTED, true) .findFirst() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXDataHandler.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXDataHandler.java index db9cf585..88f4532d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXDataHandler.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXDataHandler.java @@ -25,7 +25,7 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.JsonElement; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.call.MXCallsManager; import im.vector.matrix.android.internal.legacy.crypto.MXCrypto; import im.vector.matrix.android.internal.legacy.crypto.MXCryptoError; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXSession.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXSession.java index 9a8ceab6..186174f1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXSession.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/MXSession.java @@ -46,8 +46,8 @@ import java.util.Map; import java.util.Set; import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig; -import im.vector.matrix.android.internal.auth.data.Credentials; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.call.MXCallsManager; import im.vector.matrix.android.internal.legacy.crypto.MXCrypto; import im.vector.matrix.android.internal.legacy.crypto.MXCryptoConfig; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/RestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/RestClient.java index 0c42394a..45759c85 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/RestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/RestClient.java @@ -37,8 +37,8 @@ import javax.net.ssl.X509TrustManager; import im.vector.matrix.android.BuildConfig; import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig; -import im.vector.matrix.android.internal.auth.data.Credentials; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.listeners.IMXNetworkEventListener; import im.vector.matrix.android.internal.legacy.network.NetworkConnectivityReceiver; import im.vector.matrix.android.internal.legacy.rest.client.MXRestExecutorService; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/IMXCryptoStore.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/IMXCryptoStore.java index 4d6ece7b..a4c4fb2d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/IMXCryptoStore.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/IMXCryptoStore.java @@ -18,7 +18,7 @@ package im.vector.matrix.android.internal.legacy.data.cryptostore; import android.content.Context; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.crypto.IncomingRoomKeyRequest; import im.vector.matrix.android.internal.legacy.crypto.OutgoingRoomKeyRequest; import im.vector.matrix.android.internal.legacy.crypto.data.MXDeviceInfo; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/MXFileCryptoStore.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/MXFileCryptoStore.java index 08eef3d8..e8eff7d9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/MXFileCryptoStore.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/cryptostore/MXFileCryptoStore.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.crypto.IncomingRoomKeyRequest; import im.vector.matrix.android.internal.legacy.crypto.OutgoingRoomKeyRequest; import im.vector.matrix.android.internal.legacy.crypto.data.MXDeviceInfo; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXFileStore.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXFileStore.java index 0a7a0a16..11e86ae4 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXFileStore.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXFileStore.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.data.Room; import im.vector.matrix.android.internal.legacy.data.RoomAccountData; import im.vector.matrix.android.internal.legacy.data.RoomState; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXMemoryStore.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXMemoryStore.java index 15903549..92217320 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXMemoryStore.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/data/store/MXMemoryStore.java @@ -24,7 +24,7 @@ import android.os.Looper; import android.support.annotation.Nullable; import android.text.TextUtils; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.MXDataHandler; import im.vector.matrix.android.internal.legacy.data.Room; import im.vector.matrix.android.internal.legacy.data.RoomAccountData; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/AccountDataRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/AccountDataRestClient.java index 36c65254..74b6c109 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/AccountDataRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/AccountDataRestClient.java @@ -19,7 +19,7 @@ package im.vector.matrix.android.internal.legacy.rest.client; import java.util.HashMap; import java.util.Map; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.AccountDataApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CallRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CallRestClient.java index 296515bb..f7873b33 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CallRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CallRestClient.java @@ -17,7 +17,7 @@ package im.vector.matrix.android.internal.legacy.rest.client; import com.google.gson.JsonObject; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.CallRulesApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CryptoRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CryptoRestClient.java index 18ab534d..08472f88 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CryptoRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/CryptoRestClient.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.crypto.data.MXKey; import im.vector.matrix.android.internal.legacy.crypto.data.MXUsersDevicesMap; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/EventsRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/EventsRestClient.java index 161f3332..b251ba47 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/EventsRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/EventsRestClient.java @@ -19,7 +19,7 @@ package im.vector.matrix.android.internal.legacy.rest.client; import android.text.TextUtils; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.EventsApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/FilterRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/FilterRestClient.java index 7c45590f..4154cd03 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/FilterRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/FilterRestClient.java @@ -16,7 +16,7 @@ */ package im.vector.matrix.android.internal.legacy.rest.client; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.FilterApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/GroupsRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/GroupsRestClient.java index 774741a7..5be458fc 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/GroupsRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/GroupsRestClient.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.GroupsApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/LoginRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/LoginRestClient.java index ff603302..05f1ed41 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/LoginRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/LoginRestClient.java @@ -26,8 +26,8 @@ import com.google.gson.JsonObject; import java.util.List; import java.util.UUID; -import im.vector.matrix.android.internal.auth.data.Credentials; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.LoginApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/MediaScanRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/MediaScanRestClient.java index a7f4c3df..b1acd4ee 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/MediaScanRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/MediaScanRestClient.java @@ -22,7 +22,7 @@ import org.matrix.olm.OlmException; import org.matrix.olm.OlmPkEncryption; import org.matrix.olm.OlmPkMessage; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.data.store.IMXStore; import im.vector.matrix.android.internal.legacy.rest.api.MediaScanApi; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PresenceRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PresenceRestClient.java index 0d282493..c5cd1e4b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PresenceRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PresenceRestClient.java @@ -16,7 +16,7 @@ */ package im.vector.matrix.android.internal.legacy.rest.client; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.PresenceApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ProfileRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ProfileRestClient.java index 4ca0e413..d3ebfb38 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ProfileRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ProfileRestClient.java @@ -21,7 +21,7 @@ import android.text.TextUtils; import java.util.List; import java.util.Map; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.ProfileApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushRulesRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushRulesRestClient.java index 1858ba0e..85a73ea3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushRulesRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushRulesRestClient.java @@ -16,7 +16,7 @@ */ package im.vector.matrix.android.internal.legacy.rest.client; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.PushRulesApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushersRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushersRestClient.java index 145af038..5bfb2485 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushersRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/PushersRestClient.java @@ -19,7 +19,7 @@ package im.vector.matrix.android.internal.legacy.rest.client; import java.util.HashMap; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.data.Pusher; import im.vector.matrix.android.internal.legacy.rest.api.PushersApi; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/RoomsRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/RoomsRestClient.java index 71259674..da95b19b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/RoomsRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/RoomsRestClient.java @@ -27,7 +27,7 @@ import com.google.gson.JsonObject; import java.util.HashMap; import java.util.Map; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.data.RoomState; import im.vector.matrix.android.internal.legacy.data.timeline.EventTimeline; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ThirdPidRestClient.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ThirdPidRestClient.java index eb3a66e7..65ed7630 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ThirdPidRestClient.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/client/ThirdPidRestClient.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import im.vector.matrix.android.internal.auth.data.SessionParams; +import im.vector.matrix.android.api.auth.data.SessionParams; import im.vector.matrix.android.internal.legacy.RestClient; import im.vector.matrix.android.internal.legacy.rest.api.ThirdPidApi; import im.vector.matrix.android.internal.legacy.rest.callback.ApiCallback; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/model/CreateRoomParams.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/model/CreateRoomParams.java index 82503ecb..14cd2d17 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/model/CreateRoomParams.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/rest/model/CreateRoomParams.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.MXPatterns; import im.vector.matrix.android.internal.legacy.data.RoomState; import im.vector.matrix.android.internal.legacy.rest.model.pid.Invite3Pid; diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/util/ContentManager.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/util/ContentManager.java index 15fb6dba..32341d94 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/util/ContentManager.java +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/legacy/util/ContentManager.java @@ -20,7 +20,7 @@ package im.vector.matrix.android.internal.legacy.util; import android.support.annotation.Nullable; import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig; -import im.vector.matrix.android.internal.auth.data.Credentials; +import im.vector.matrix.android.api.auth.data.Credentials; import im.vector.matrix.android.internal.legacy.RestClient; /** 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 0dbf2cc5..0b22053d 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 @@ -4,7 +4,7 @@ import im.vector.matrix.android.internal.auth.SessionParamsStore import okhttp3.Interceptor import okhttp3.Response -class AccessTokenInterceptor(private val sessionParamsStore: SessionParamsStore) : Interceptor { +internal class AccessTokenInterceptor(private val sessionParamsStore: SessionParamsStore) : Interceptor { override fun intercept(chain: Interceptor.Chain): Response { var request = chain.request() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt index 588cc05d..7f01faf3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt @@ -5,7 +5,7 @@ import com.novoda.merlin.Merlin import com.novoda.merlin.MerlinsBeard import com.novoda.merlin.registerable.connection.Connectable -class NetworkConnectivityChecker(context: Context) { +internal class NetworkConnectivityChecker(context: Context) { private val merlin = Merlin.Builder().withConnectableCallbacks().build(context) private val merlinsBeard = MerlinsBeard.from(context) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt index fe08d55f..5f144367 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConstants.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.network -object NetworkConstants { +internal object NetworkConstants { const val URI_API_PREFIX_PATH = "_matrix/client/" const val URI_API_PREFIX_PATH_R0 = "_matrix/client/r0/" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt index eaeaff52..fc03a998 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt @@ -15,9 +15,9 @@ import okhttp3.ResponseBody import retrofit2.Call import java.io.IOException -inline fun executeRequest(block: Request.() -> Unit) = Request().apply(block).execute() +internal inline fun executeRequest(block: Request.() -> Unit) = Request().apply(block).execute() -class Request { +internal class Request { var moshi: Moshi = MoshiProvider.providesMoshi() lateinit var apiCall: Call diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt index 3311f381..1b555846 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/parsing/UriMoshiAdapter.kt @@ -4,7 +4,7 @@ import android.net.Uri import com.squareup.moshi.FromJson import com.squareup.moshi.ToJson -class UriMoshiAdapter { +internal class UriMoshiAdapter { @ToJson fun toJson(uri: Uri): String { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt index c8e955c3..c701fc34 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/CertUtil.kt @@ -31,7 +31,7 @@ import kotlin.experimental.and /** * Various utility classes for dealing with X509Certificates */ -object CertUtil { +internal object CertUtil { private val hexArray = "0123456789ABCDEF".toCharArray() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt index 6e8a0c5e..966c6d4e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManager.kt @@ -31,7 +31,7 @@ import javax.net.ssl.X509TrustManager * @param defaultTrustManager Optional trust manager to fall back on if cert does not match * any of the fingerprints. Can be null. */ -class PinnedTrustManager(private val mFingerprints: List?, +internal class PinnedTrustManager(private val mFingerprints: List?, private val mDefaultTrustManager: X509TrustManager?) : X509TrustManager { @Throws(CertificateException::class) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt index bbc00aa8..a4a249eb 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/UnrecognizedCertificateException.kt @@ -23,7 +23,7 @@ import java.security.cert.X509Certificate * Thrown when we are given a certificate that does match the certificate we were told to * expect. */ -data class UnrecognizedCertificateException( +internal data class UnrecognizedCertificateException( val certificate: X509Certificate, val fingerprint: Fingerprint, override val cause: Throwable? diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt index d9c917a1..d474c8d9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt @@ -10,7 +10,7 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.Room import im.vector.matrix.android.api.session.room.RoomService import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.internal.database.LiveEntityObserver import im.vector.matrix.android.internal.session.group.GroupModule import im.vector.matrix.android.internal.session.room.RoomModule @@ -23,7 +23,7 @@ import org.koin.standalone.getKoin import org.koin.standalone.inject -class DefaultSession(override val sessionParams: SessionParams) : Session, KoinComponent, RoomService { +internal class DefaultSession(override val sessionParams: SessionParams) : Session, KoinComponent, RoomService { companion object { const val SCOPE: String = "session" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt index c4de7b21..f07d753f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt @@ -3,7 +3,7 @@ package im.vector.matrix.android.internal.session import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.api.session.group.GroupService import im.vector.matrix.android.api.session.room.RoomService -import im.vector.matrix.android.internal.auth.data.SessionParams +import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.internal.database.LiveEntityObserver import im.vector.matrix.android.internal.session.events.prune.EventsPruner import im.vector.matrix.android.internal.session.group.DefaultGroupService @@ -19,7 +19,7 @@ import org.koin.dsl.module.Module import org.koin.dsl.module.module import retrofit2.Retrofit -class SessionModule(private val sessionParams: SessionParams) : Module { +internal class SessionModule(private val sessionParams: SessionParams) : Module { override fun invoke(): ModuleDefinition = module(override = true) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/interceptor/MessageEventInterceptor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/interceptor/MessageEventInterceptor.kt index 1d50cdb2..5eafc534 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/interceptor/MessageEventInterceptor.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/events/interceptor/MessageEventInterceptor.kt @@ -11,7 +11,7 @@ import im.vector.matrix.android.internal.database.query.last import im.vector.matrix.android.internal.database.query.where -class MessageEventInterceptor(val monarchy: Monarchy) : EnrichedEventInterceptor { +internal class MessageEventInterceptor(val monarchy: Monarchy) : EnrichedEventInterceptor { override fun canEnrich(event: EnrichedEvent): Boolean { return event.root.type == EventType.MESSAGE diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt index c49d828d..422cf84c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroup.kt @@ -2,6 +2,6 @@ package im.vector.matrix.android.internal.session.group import im.vector.matrix.android.api.session.group.Group -class DefaultGroup(override val groupId: String) : Group { +internal class DefaultGroup(override val groupId: String) : Group { } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt index bae90048..3963726c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt @@ -10,7 +10,7 @@ import im.vector.matrix.android.internal.database.model.GroupSummaryEntity import im.vector.matrix.android.internal.database.model.GroupSummaryEntityFields import im.vector.matrix.android.internal.database.query.where -class DefaultGroupService(private val monarchy: Monarchy) : GroupService { +internal class DefaultGroupService(private val monarchy: Monarchy) : GroupService { override fun getGroup(groupId: String): Group? { return null diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataRequest.kt index c3ce919a..3a5d3b9b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataRequest.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataRequest.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class GetGroupDataRequest( +internal class GetGroupDataRequest( private val groupAPI: GroupAPI, private val monarchy: Monarchy, private val coroutineDispatchers: MatrixCoroutineDispatchers diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt index b7c90821..4100caef 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupAPI.kt @@ -8,7 +8,7 @@ import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path -interface GroupAPI { +internal interface GroupAPI { /** * Request a group summary diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt index 315ea07f..b4424abc 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupProfile.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass * This class represents a community profile in the server responses. */ @JsonClass(generateAdapter = true) -data class GroupProfile( +internal data class GroupProfile( @Json(name = "short_description") val shortDescription: String? = null, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt index d40573f3..040a28b9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRoom.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupRoom( +internal data class GroupRoom( @Json(name = "aliases") val aliases: List = emptyList(), @Json(name = "canonical_alias") val canonicalAlias: String? = null, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt index b3b2ffdc..9cdf6536 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupRooms.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupRooms( +internal data class GroupRooms( @Json(name = "total_room_count_estimate") val totalRoomCountEstimate: Int? = null, @Json(name = "chunk") val rooms: List = emptyList() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt index e135983e..af8e2bca 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryResponse.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass * This class represents the summary of a community in the server response. */ @JsonClass(generateAdapter = true) -data class GroupSummaryResponse( +internal data class GroupSummaryResponse( /** * The group profile. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt index 7549da6b..5f487c6c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryRoomsSection.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass * This class represents the community rooms in a group summary response. */ @JsonClass(generateAdapter = true) -data class GroupSummaryRoomsSection( +internal data class GroupSummaryRoomsSection( @Json(name = "total_room_count_estimate") val totalRoomCountEstimate: Int? = null, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt index 9398014d..e1f56e01 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUser.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass * This class represents the current user status in a group summary response. */ @JsonClass(generateAdapter = true) -data class GroupSummaryUser( +internal data class GroupSummaryUser( /** * The current user membership in this community. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt index 2e10f204..95abb9ce 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupSummaryUsersSection.kt @@ -9,7 +9,7 @@ import com.squareup.moshi.JsonClass */ @JsonClass(generateAdapter = true) -data class GroupSummaryUsersSection( +internal data class GroupSummaryUsersSection( @Json(name = "total_user_count_estimate") val totalUserCountEstimate: Int, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt index b4c87e4c..354c7e36 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUser.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupUser( +internal data class GroupUser( @Json(name = "display_name") val displayName: String = "", @Json(name = "user_id") val userId: String, @Json(name = "is_privileged") val isPrivileged: Boolean = false, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt index b4e39fc0..666d6dde 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/model/GroupUsers.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupUsers( +internal data class GroupUsers( @Json(name = "total_user_count_estimate") val totalUserCountEstimate: Int, @Json(name = "chunk") val users: List = emptyList() ) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt index 338f4752..c8bb8881 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt @@ -23,7 +23,7 @@ import org.koin.core.parameter.parametersOf import org.koin.standalone.KoinComponent import org.koin.standalone.inject -data class DefaultRoom( +internal data class DefaultRoom( override val roomId: String, override val myMembership: MyMembership ) : Room, KoinComponent { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt index 806807c6..90c10659 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt @@ -12,7 +12,7 @@ import im.vector.matrix.android.internal.database.model.RoomSummaryEntityFields import im.vector.matrix.android.internal.database.query.lastSelected import im.vector.matrix.android.internal.database.query.where -class DefaultRoomService(private val monarchy: Monarchy) : RoomService { +internal class DefaultRoomService(private val monarchy: Monarchy) : RoomService { override fun getAllRooms(): List { var rooms: List = emptyList() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt index d2c3ca86..9b3d677e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAPI.kt @@ -10,7 +10,7 @@ import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query -interface RoomAPI { +internal interface RoomAPI { /** * Get a list of messages starting from a reference. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt index df38bc42..facec4c4 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt @@ -5,7 +5,7 @@ import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.Room import im.vector.matrix.android.api.session.room.model.MyMembership import im.vector.matrix.android.api.session.room.model.RoomAvatarContent -import im.vector.matrix.android.internal.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.database.mapper.asDomain import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.internal.database.query.last diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt index 91ff50db..7f6225d7 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt @@ -5,7 +5,7 @@ import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.Room import im.vector.matrix.android.api.session.room.model.RoomTopicContent -import im.vector.matrix.android.internal.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.database.RealmLiveEntityObserver import im.vector.matrix.android.internal.database.mapper.asDomain import im.vector.matrix.android.internal.database.model.EventEntity diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt index 9106aca7..c2e0eeb0 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt @@ -25,7 +25,7 @@ import im.vector.matrix.android.api.session.room.model.MyMembership import im.vector.matrix.android.api.session.room.model.RoomAliasesContent import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent import im.vector.matrix.android.api.session.room.model.RoomNameContent -import im.vector.matrix.android.internal.auth.data.Credentials +import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.database.mapper.asDomain import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.internal.database.model.RoomSummaryEntity diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMemberDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMemberDisplayNameResolver.kt index 9da9400c..a0b0afd7 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMemberDisplayNameResolver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMemberDisplayNameResolver.kt @@ -2,7 +2,7 @@ package im.vector.matrix.android.internal.session.room.members import im.vector.matrix.android.api.session.room.model.RoomMember -class RoomMemberDisplayNameResolver { +internal class RoomMemberDisplayNameResolver { fun resolve(userId: String, members: Map): String? { val currentMember = members[userId] diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembersResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembersResponse.kt index f7d590f9..f593363a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembersResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembersResponse.kt @@ -5,6 +5,6 @@ import com.squareup.moshi.JsonClass import im.vector.matrix.android.api.session.events.model.Event @JsonClass(generateAdapter = true) -data class RoomMembersResponse( +internal data class RoomMembersResponse( @Json(name = "chunk") val roomMemberEvents: List ) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineHolder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineHolder.kt index ee4157e7..579a9f36 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineHolder.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimelineHolder.kt @@ -16,7 +16,7 @@ import io.realm.Sort private const val PAGE_SIZE = 30 -class DefaultTimelineHolder(private val roomId: String, +internal class DefaultTimelineHolder(private val roomId: String, private val monarchy: Monarchy, private val boundaryCallback: TimelineBoundaryCallback ) : TimelineHolder { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt index f76e25d4..86084d5d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationDirection.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.session.room.timeline -enum class PaginationDirection(val value: String) { +internal enum class PaginationDirection(val value: String) { /** * Forwards when the event is added to the end of the timeline. * These events come from the /sync stream or from forwards pagination. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationRequest.kt index 742e93f5..c4ee9669 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationRequest.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/PaginationRequest.kt @@ -25,7 +25,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -class PaginationRequest(private val roomAPI: RoomAPI, +internal class PaginationRequest(private val roomAPI: RoomAPI, private val monarchy: Monarchy, private val coroutineDispatchers: MatrixCoroutineDispatchers, private val stateEventsChunkHandler: StateEventsChunkHandler) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineBoundaryCallback.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineBoundaryCallback.kt index 2f943220..7c066ab1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineBoundaryCallback.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TimelineBoundaryCallback.kt @@ -10,7 +10,7 @@ import im.vector.matrix.android.internal.util.PagingRequestHelper import java.util.* import java.util.concurrent.Executor -class TimelineBoundaryCallback(private val roomId: String, +internal class TimelineBoundaryCallback(private val roomId: String, private val paginationRequest: PaginationRequest, private val monarchy: Monarchy, ioExecutor: Executor diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt index e39e3282..9e25da14 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/TokenChunkEvent.kt @@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass import im.vector.matrix.android.api.session.events.model.Event @JsonClass(generateAdapter = true) -data class TokenChunkEvent( +internal data class TokenChunkEvent( @Json(name = "start") val nextToken: String? = null, @Json(name = "end") val prevToken: String? = null, @Json(name = "chunk") val events: List = emptyList(), diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt index e54c8a23..daa42ccf 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/ReadReceiptHandler.kt @@ -11,7 +11,7 @@ import io.realm.Realm // dict value ts value typealias ReadReceiptContent = Map>>> -class ReadReceiptHandler { +internal class ReadReceiptHandler { fun handle(realm: Realm, roomId: String, content: ReadReceiptContent?): List { if (content == null) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/StateEventsChunkHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/StateEventsChunkHandler.kt index daea234a..1e355dfc 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/StateEventsChunkHandler.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/StateEventsChunkHandler.kt @@ -8,7 +8,7 @@ import im.vector.matrix.android.internal.database.query.findWithNextToken import io.realm.Realm import io.realm.kotlin.createObject -class StateEventsChunkHandler { +internal class StateEventsChunkHandler { fun handle(realm: Realm, roomId: String, stateEvents: List): ChunkEntity { val chunkEntity = ChunkEntity.findWithNextToken(realm, roomId, DBConstants.STATE_EVENTS_CHUNK_TOKEN) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt index b5aa0981..950ace56 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncAPI.kt @@ -6,7 +6,7 @@ import retrofit2.Call import retrofit2.http.GET import retrofit2.http.QueryMap -interface SyncAPI { +internal interface SyncAPI { @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync") fun sync(@QueryMap params: Map): Call diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt index b8cdf8b4..86b739e4 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncModule.kt @@ -8,7 +8,7 @@ import org.koin.dsl.module.module import retrofit2.Retrofit -class SyncModule : Module { +internal class SyncModule : Module { override fun invoke(): ModuleDefinition = module(override = true) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt index 9fceffba..ff753b07 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/SyncTokenStore.kt @@ -4,7 +4,7 @@ import im.vector.matrix.android.internal.database.model.SyncEntity import io.realm.Realm import io.realm.RealmConfiguration -class SyncTokenStore(private val realmConfiguration: RealmConfiguration) { +internal class SyncTokenStore(private val realmConfiguration: RealmConfiguration) { fun getLastToken(): String? { val realm = Realm.getInstance(realmConfiguration) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt index 5aa965fc..3bce3dc3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/UserAccountDataSyncHandler.kt @@ -7,7 +7,7 @@ import im.vector.matrix.android.internal.database.query.where import im.vector.matrix.android.internal.session.sync.model.UserAccountDataDirectMessages import im.vector.matrix.android.internal.session.sync.model.UserAccountDataSync -class UserAccountDataSyncHandler(private val monarchy: Monarchy) { +internal class UserAccountDataSyncHandler(private val monarchy: Monarchy) { fun handle(accountData: UserAccountDataSync) { accountData.list.forEach { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt index 3189783b..03c10d8f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceInfo.kt @@ -24,7 +24,7 @@ import com.squareup.moshi.JsonClass * This class describes the device information */ @JsonClass(generateAdapter = true) -data class DeviceInfo( +internal data class DeviceInfo( /** * The owner user id */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt index aaedb78e..2fd0f4a5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceListResponse.kt @@ -21,7 +21,7 @@ import com.squareup.moshi.JsonClass * This class describes the device list response from a sync request */ @JsonClass(generateAdapter = true) -data class DeviceListResponse( +internal data class DeviceListResponse( // user ids list which have new crypto devices val changed: List = emptyList(), // List of user ids who are no more tracked. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt index 85e1b53e..5c3fcb1c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class DeviceOneTimeKeysCountSyncResponse( +internal data class DeviceOneTimeKeysCountSyncResponse( @Json(name = "signed_curve25519") val signedCurve25519: Int? = null ) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt index 0dad8d8d..4b9f39b9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/DevicesListResponse.kt @@ -21,6 +21,6 @@ import com.squareup.moshi.JsonClass * This class describes the */ @JsonClass(generateAdapter = true) -data class DevicesListResponse( +internal data class DevicesListResponse( val devices: List? = null ) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt index 3073a2e5..78996613 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupSyncProfile.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupSyncProfile( +internal data class GroupSyncProfile( /** * The name of the group, if any. May be nil. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt index 21ee8e16..1307fcee 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/GroupsSyncResponse.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class GroupsSyncResponse( +internal data class GroupsSyncResponse( /** * Joined groups: An array of groups ids. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt index 787601c9..0b8b6f3e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedGroupSync.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class InvitedGroupSync( +internal data class InvitedGroupSync( /** * The identifier of the inviter. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt index 77b1d940..0d23de0b 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/InvitedRoomSync.kt @@ -20,7 +20,7 @@ import com.squareup.moshi.JsonClass // InvitedRoomSync represents a room invitation during server sync v2. @JsonClass(generateAdapter = true) -data class InvitedRoomSync( +internal data class InvitedRoomSync( /** * The state of a room that the user has been invited to. These state events may only have the 'sender', 'type', 'state_key' diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt index 8c581254..e5854377 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/PresenceSyncResponse.kt @@ -5,7 +5,7 @@ import im.vector.matrix.android.api.session.events.model.Event // PresenceSyncResponse represents the updates to the presence status of other users during server sync v2. @JsonClass(generateAdapter = true) -data class PresenceSyncResponse( +internal data class PresenceSyncResponse( /** * List of presence events (array of Event with type m.presence). diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt index 52056f53..cb58e3f1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomInviteState.kt @@ -22,7 +22,7 @@ import im.vector.matrix.android.api.session.events.model.Event // RoomInviteState represents the state of a room that the user has been invited to. @JsonClass(generateAdapter = true) -data class RoomInviteState( +internal data class RoomInviteState( /** * List of state events (array of MXEvent). diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt index 028ed717..fffb71dd 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomResponse.kt @@ -8,7 +8,7 @@ import im.vector.matrix.android.api.session.events.model.Event * Class representing a room from a JSON response from room or global initial sync. */ @JsonClass(generateAdapter = true) -data class RoomResponse( +internal data class RoomResponse( // The room identifier. val roomId: String? = null, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt index e2f1b64a..3f236b2e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSync.kt @@ -20,7 +20,7 @@ import com.squareup.moshi.JsonClass // RoomSync represents the response for a room during server sync v2. @JsonClass(generateAdapter = true) -data class RoomSync( +internal data class RoomSync( /** * The state updates for the room. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt index f158f94f..79043a6a 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncAccountData.kt @@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass import im.vector.matrix.android.api.session.events.model.Event @JsonClass(generateAdapter = true) -data class RoomSyncAccountData( +internal data class RoomSyncAccountData( /** * List of account data events (array of Event). */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt index 71506a54..43a00651 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncEphemeral.kt @@ -7,7 +7,7 @@ import im.vector.matrix.android.api.session.events.model.Event // RoomSyncEphemeral represents the ephemeral events in the room that aren't recorded in the timeline or state of the room (e.g. typing). @JsonClass(generateAdapter = true) -data class RoomSyncEphemeral( +internal data class RoomSyncEphemeral( /** * List of ephemeral events (array of Event). */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt index e0a628d4..e8c133ca 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncState.kt @@ -7,7 +7,7 @@ import im.vector.matrix.android.api.session.events.model.Event // RoomSyncState represents the state updates for a room during server sync v2. @JsonClass(generateAdapter = true) -data class RoomSyncState( +internal data class RoomSyncState( /** * List of state events (array of Event). The resulting state corresponds to the *start* of the timeline. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt index a3fc13ed..72d3d01e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncSummary.kt @@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class RoomSyncSummary( +internal data class RoomSyncSummary( /** * Present only if the room has no m.room.name or m.room.canonical_alias. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt index 51271124..10c35900 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncTimeline.kt @@ -7,7 +7,7 @@ import im.vector.matrix.android.api.session.events.model.Event // RoomSyncTimeline represents the timeline of messages and state changes for a room during server sync v2. @JsonClass(generateAdapter = true) -data class RoomSyncTimeline( +internal data class RoomSyncTimeline( /** * List of events (array of Event). diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt index c8c1269c..6fc921e9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomSyncUnreadNotifications.kt @@ -9,7 +9,7 @@ import im.vector.matrix.android.api.session.events.model.Event * `MXRoomSyncUnreadNotifications` represents the unread counts for a room. */ @JsonClass(generateAdapter = true) -data class RoomSyncUnreadNotifications( +internal data class RoomSyncUnreadNotifications( /** * List of account data events (array of Event). */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt index fa1930fb..c6fb4815 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/RoomsSyncResponse.kt @@ -20,7 +20,7 @@ import com.squareup.moshi.JsonClass // RoomsSyncResponse represents the rooms list in server sync v2 response. @JsonClass(generateAdapter = true) -data class RoomsSyncResponse( +internal data class RoomsSyncResponse( /** * Joined rooms: keys are rooms ids. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt index 3736e7ad..bd5d7904 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/SyncResponse.kt @@ -6,7 +6,7 @@ import im.vector.matrix.android.internal.legacy.rest.model.group.GroupsSyncRespo // SyncResponse represents the request response for server sync v2. @JsonClass(generateAdapter = true) -data class SyncResponse( +internal data class SyncResponse( /** * The user private data. */ diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt index 52db7b0f..36be0009 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/ToDeviceSyncResponse.kt @@ -6,7 +6,7 @@ import im.vector.matrix.android.api.session.events.model.Event // ToDeviceSyncResponse represents the data directly sent to one of user's devices. @JsonClass(generateAdapter = true) -data class ToDeviceSyncResponse( +internal data class ToDeviceSyncResponse( /** * List of direct-to-device events. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt index 396a69eb..a2a977ac 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/TokensChunkResponse.kt @@ -3,7 +3,7 @@ package im.vector.matrix.android.internal.session.sync.model import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class TokensChunkResponse( +internal data class TokensChunkResponse( val start: String? = null, val end: String? = null, val chunk: List? = null) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountData.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountData.kt index 3af72b84..c144154c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountData.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountData.kt @@ -1,6 +1,6 @@ package im.vector.matrix.android.internal.session.sync.model -interface UserAccountData { +internal interface UserAccountData { companion object { const val TYPE_IGNORED_USER_LIST = "m.ignored_user_list" diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataDirectMessages.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataDirectMessages.kt index b6d09ac3..adde9157 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataDirectMessages.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataDirectMessages.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class UserAccountDataDirectMessages( +internal data class UserAccountDataDirectMessages( @Json(name = "content") val content: Map> ) : UserAccountData diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataFallback.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataFallback.kt index 4cb45373..02451b10 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataFallback.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataFallback.kt @@ -4,6 +4,6 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class UserAccountDataFallback( +internal data class UserAccountDataFallback( @Json(name = "content") val content: Map ) : UserAccountData diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataSync.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataSync.kt index ef28238b..48ceaa92 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataSync.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/model/UserAccountDataSync.kt @@ -4,6 +4,6 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) -data class UserAccountDataSync( +internal data class UserAccountDataSync( @Json(name = "events") val list: List = emptyList() ) \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt index 9fb35421..4769ded2 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/BackgroundDetectionObserver.kt @@ -8,7 +8,7 @@ import timber.log.Timber /** * To be attached to ProcessLifecycleOwner lifecycle */ -class BackgroundDetectionObserver : LifecycleObserver { +internal class BackgroundDetectionObserver : LifecycleObserver { var isIsBackground: Boolean = false private set diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt index 8aa18833..4fc7c119 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/CancelableCoroutine.kt @@ -3,7 +3,7 @@ package im.vector.matrix.android.internal.util import im.vector.matrix.android.api.util.Cancelable import kotlinx.coroutines.Job -class CancelableCoroutine(private val job: Job) : Cancelable { +internal class CancelableCoroutine(private val job: Job) : Cancelable { override fun cancel() { job.cancel() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt index 2b25129c..72b14e96 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/MatrixCoroutineDispatchers.kt @@ -2,7 +2,7 @@ package im.vector.matrix.android.internal.util import kotlinx.coroutines.CoroutineDispatcher -data class MatrixCoroutineDispatchers( +internal data class MatrixCoroutineDispatchers( val io: CoroutineDispatcher, val computation: CoroutineDispatcher, val main: CoroutineDispatcher diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt index 5f80a083..f2396822 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Monarchy.kt @@ -4,13 +4,13 @@ import arrow.core.Try import com.zhuinden.monarchy.Monarchy import io.realm.Realm -fun Monarchy.tryTransactionSync(transaction: (realm: Realm) -> Unit): Try { +internal fun Monarchy.tryTransactionSync(transaction: (realm: Realm) -> Unit): Try { return Try { this.runTransactionSync(transaction) } } -fun Monarchy.tryTransactionAsync(transaction: (realm: Realm) -> Unit): Try { +internal fun Monarchy.tryTransactionAsync(transaction: (realm: Realm) -> Unit): Try { return Try { this.writeAsync(transaction) }