From 30e43e47cdf068cf9ca98329c62ca29c3b7a0a56 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 9 Oct 2019 15:31:19 +0200
Subject: [PATCH] Fix filename ktlint issues
---
.../session/crypto/sas/{Mode.kt => SasMode.kt} | 0
...FileQualifiers.kt => UserCacheDirectory.kt} | 6 ++++++
.../internal/session/user/SearchUserAPI.kt | 4 ++--
.../session/user/model/SearchUserTask.kt | 2 +-
.../session/user/model/SearchUsersResponse.kt | 18 +++++++++++++++++-
...rSettingsNotificationPreferenceFragment.kt} | 0
6 files changed, 26 insertions(+), 4 deletions(-)
rename matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/{Mode.kt => SasMode.kt} (100%)
rename matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/{FileQualifiers.kt => UserCacheDirectory.kt} (76%)
rename vector/src/main/java/im/vector/riotx/features/settings/{VectorSettingsNotificationFragment.kt => VectorSettingsNotificationPreferenceFragment.kt} (100%)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/Mode.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasMode.kt
similarity index 100%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/Mode.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/sas/SasMode.kt
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/UserCacheDirectory.kt
similarity index 76%
rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt
rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/UserCacheDirectory.kt
index ad4991d5ea..93df68ed07 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/FileQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/UserCacheDirectory.kt
@@ -14,6 +14,12 @@
* limitations under the License.
*/
+/*
+ * Unfortunatly "ktlint-disable filename" this does not work so this file is renamed to UserCacheDirectory.kt
+ * If a new qualifier is added, please rename this file ti FileQualifiers.kt...
+ */
+/* ktlint-disable filename */
+
package im.vector.matrix.android.internal.di
import javax.inject.Qualifier
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt
index 1c393aa565..e57daed617 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/SearchUserAPI.kt
@@ -18,7 +18,7 @@ package im.vector.matrix.android.internal.session.user
import im.vector.matrix.android.internal.network.NetworkConstants.URI_API_PREFIX_PATH_R0
import im.vector.matrix.android.internal.session.user.model.SearchUsersParams
-import im.vector.matrix.android.internal.session.user.model.SearchUsersRequestResponse
+import im.vector.matrix.android.internal.session.user.model.SearchUsersResponse
import retrofit2.Call
import retrofit2.http.Body
import retrofit2.http.POST
@@ -31,5 +31,5 @@ internal interface SearchUserAPI {
* @param searchUsersParams the search params.
*/
@POST(URI_API_PREFIX_PATH_R0 + "user_directory/search")
- fun searchUsers(@Body searchUsersParams: SearchUsersParams): Call<SearchUsersRequestResponse>
+ fun searchUsers(@Body searchUsersParams: SearchUsersParams): Call<SearchUsersResponse>
}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt
index 9b5914c579..fb395dc4f1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUserTask.kt
@@ -34,7 +34,7 @@ internal interface SearchUserTask : Task<SearchUserTask.Params, List<User>> {
internal class DefaultSearchUserTask @Inject constructor(private val searchUserAPI: SearchUserAPI) : SearchUserTask {
override suspend fun execute(params: SearchUserTask.Params): List<User> {
- val response = executeRequest<SearchUsersRequestResponse> {
+ val response = executeRequest<SearchUsersResponse> {
apiCall = searchUserAPI.searchUsers(SearchUsersParams(params.search, params.limit))
}
return response.users.map {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt
index 17c0d448cf..c324fdd8cf 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/user/model/SearchUsersResponse.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package im.vector.matrix.android.internal.session.user.model
import com.squareup.moshi.Json
@@ -7,7 +23,7 @@ import com.squareup.moshi.JsonClass
* Class representing an users search response
*/
@JsonClass(generateAdapter = true)
-internal data class SearchUsersRequestResponse(
+internal data class SearchUsersResponse(
@Json(name = "limited") val limited: Boolean = false,
@Json(name = "results") val users: List<SearchUser> = emptyList()
)
diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt
similarity index 100%
rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt
rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt