gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-30 08:59:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

ktlint: Newline expected after opening parenthesis

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2023-12-05 16:34:54 +01:00
parent 67b2752360
commit 9395a35af6
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
4 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
View File

@ -87,8 +87,10 @@ class RepositoryModule {
} }
@Provides @Provides
fun provideRemoteFileBrowserItemsRepository(okHttpClient: OkHttpClient, userProvider: CurrentUserProviderNew): fun provideRemoteFileBrowserItemsRepository(
RemoteFileBrowserItemsRepository { okHttpClient: OkHttpClient,
userProvider: CurrentUserProviderNew
): RemoteFileBrowserItemsRepository {
return RemoteFileBrowserItemsRepositoryImpl(okHttpClient, userProvider) return RemoteFileBrowserItemsRepositoryImpl(okHttpClient, userProvider)
} }
@ -113,14 +115,18 @@ class RepositoryModule {
} }
@Provides @Provides
fun provideRequestAssistanceRepository(ncApi: NcApi, userProvider: CurrentUserProviderNew): fun provideRequestAssistanceRepository(
RequestAssistanceRepository { ncApi: NcApi,
userProvider: CurrentUserProviderNew
): RequestAssistanceRepository {
return RequestAssistanceRepositoryImpl(ncApi, userProvider) return RequestAssistanceRepositoryImpl(ncApi, userProvider)
} }
@Provides @Provides
fun provideOpenConversationsRepository(ncApi: NcApi, userProvider: CurrentUserProviderNew): fun provideOpenConversationsRepository(
OpenConversationsRepository { ncApi: NcApi,
userProvider: CurrentUserProviderNew
): OpenConversationsRepository {
return OpenConversationsRepositoryImpl(ncApi, userProvider) return OpenConversationsRepositoryImpl(ncApi, userProvider)
} }
@ -137,14 +143,18 @@ class RepositoryModule {
} }
@Provides @Provides
fun provideConversationInfoEditRepository(ncApi: NcApi, userProvider: CurrentUserProviderNew): fun provideConversationInfoEditRepository(
ConversationInfoEditRepository { ncApi: NcApi,
userProvider: CurrentUserProviderNew
): ConversationInfoEditRepository {
return ConversationInfoEditRepositoryImpl(ncApi, userProvider) return ConversationInfoEditRepositoryImpl(ncApi, userProvider)
} }
@Provides @Provides
fun provideConversationRepository(ncApi: NcApi, userProvider: CurrentUserProviderNew): fun provideConversationRepository(
ConversationRepository { ncApi: NcApi,
userProvider: CurrentUserProviderNew
): ConversationRepository {
return ConversationRepositoryImpl(ncApi, userProvider) return ConversationRepositoryImpl(ncApi, userProvider)
} }
} }

6
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
View File

@ -26,8 +26,10 @@ package com.nextcloud.talk.models.json.chat
class ChatUtils { class ChatUtils {
companion object { companion object {
fun getParsedMessage(message: String?, messageParameters: HashMap<String?, HashMap<String?, String?>>?): fun getParsedMessage(
String? { message: String?,
messageParameters: HashMap<String?, HashMap<String?, String?>>?
): String? {
if (messageParameters != null && messageParameters.size > 0) { if (messageParameters != null && messageParameters.size > 0) {
return parse(messageParameters, message) return parse(messageParameters, message)
} }

3
app/src/main/java/com/nextcloud/talk/remotefilebrowser/repositories/RemoteFileBrowserItemsRepositoryImpl.kt
View File

@ -36,8 +36,7 @@ class RemoteFileBrowserItemsRepositoryImpl @Inject constructor(
private val user: User private val user: User
get() = userProvider.currentUser.blockingGet() get() = userProvider.currentUser.blockingGet()
override fun listFolder(path: String): override fun listFolder(path: String): Observable<List<RemoteFileBrowserItem>> {
Observable<List<RemoteFileBrowserItem>> {
return Observable.fromCallable { return Observable.fromCallable {
val operation = val operation =
ReadFolderListingOperation( ReadFolderListingOperation(

7
app/src/main/java/com/nextcloud/talk/repositories/unifiedsearch/UnifiedSearchRepositoryImpl.kt
View File

@ -81,8 +81,11 @@ class UnifiedSearchRepositoryImpl(private val api: NcApi, private val userProvid
private const val ATTRIBUTE_CONVERSATION = "conversation" private const val ATTRIBUTE_CONVERSATION = "conversation"
private const val ATTRIBUTE_MESSAGE_ID = "messageId" private const val ATTRIBUTE_MESSAGE_ID = "messageId"
private fun mapToMessageResults(data: UnifiedSearchResponseData, searchTerm: String, limit: Int): private fun mapToMessageResults(
UnifiedSearchRepository.UnifiedSearchResults<SearchMessageEntry> { data: UnifiedSearchResponseData,
searchTerm: String,
limit: Int
): UnifiedSearchRepository.UnifiedSearchResults<SearchMessageEntry> {
val entries = data.entries?.map { it -> mapToMessage(it, searchTerm) } val entries = data.entries?.map { it -> mapToMessage(it, searchTerm) }
val cursor = data.cursor ?: 0 val cursor = data.cursor ?: 0
val hasMore = entries?.size == limit val hasMore = entries?.size == limit