gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-23 05:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kindof works I guess

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-05-03 17:05:01 +02:00
parent 7102f4ea54
commit 34d0b14ab0
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/newarch/di/module/NetworkModule.kt
View File

@ -115,7 +115,7 @@ fun createOkHttpClient(
): OkHttpClient { ): OkHttpClient {
val httpClient = OkHttpClient.Builder() val httpClient = OkHttpClient.Builder()
httpClient.retryOnConnectionFailure(true) httpClient.retryOnConnectionFailure(false)
httpClient.connectTimeout(300, TimeUnit.SECONDS) httpClient.connectTimeout(300, TimeUnit.SECONDS)
httpClient.readTimeout(300, TimeUnit.SECONDS) httpClient.readTimeout(300, TimeUnit.SECONDS)
httpClient.writeTimeout(300, TimeUnit.SECONDS) httpClient.writeTimeout(300, TimeUnit.SECONDS)
@ -125,7 +125,6 @@ fun createOkHttpClient(
// Trust own CA and all self-signed certs // Trust own CA and all self-signed certs
httpClient.sslSocketFactory(sslSocketFactory, magicTrustManager) httpClient.sslSocketFactory(sslSocketFactory, magicTrustManager)
httpClient.retryOnConnectionFailure(true)
httpClient.hostnameVerifier(magicTrustManager.getHostnameVerifier(OkHostnameVerifier.INSTANCE)) httpClient.hostnameVerifier(magicTrustManager.getHostnameVerifier(OkHostnameVerifier.INSTANCE))
if (SDK_INT == Build.VERSION_CODES.N) { if (SDK_INT == Build.VERSION_CODES.N) {

7
app/src/main/java/com/nextcloud/talk/newarch/services/GlobalService.kt
View File

@ -102,11 +102,10 @@ class GlobalService constructor(usersRepository: UsersRepository,
chatMessage.let { chatMessage -> chatMessage.let { chatMessage ->
conversation?.let { conversation -> conversation?.let { conversation ->
val currentStatus = chatMessage.chatMessageStatus
applicationScope.launch {
//messagesRepository.updateMessageStatus(ChatMessageStatus.PROCESSING.ordinal, conversation.databaseId!!, chatMessage.jsonMessageId!!)
}
currentUser?.let { user -> currentUser?.let { user ->
val currentStatus = chatMessage.chatMessageStatus
messagesRepository.updateMessageStatus(ChatMessageStatus.PROCESSING.ordinal, conversation.databaseId!!, chatMessage.jsonMessageId!!)
if (chatMessage.internalConversationId == conversation.databaseId && conversation.databaseUserId == currentUser.id) { if (chatMessage.internalConversationId == conversation.databaseId && conversation.databaseUserId == currentUser.id) {
val sendChatMessageUseCase = SendChatMessageUseCase(networkComponents.getRepository(false, user), ApiErrorHandler()) val sendChatMessageUseCase = SendChatMessageUseCase(networkComponents.getRepository(false, user), ApiErrorHandler())
val messageToSend = ChatUtils.getParsedMessageForSending(chatMessage.message, chatMessage.messageParameters) val messageToSend = ChatUtils.getParsedMessageForSending(chatMessage.message, chatMessage.messageParameters)