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

Fixes to call creation process

Browse Source
This commit is contained in:
Mario Danic 2019-12-19 15:38:08 +01:00
parent f559ef9a47
commit c2dacbcd11
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
10 changed files with 276 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt
View File

@ -49,9 +49,7 @@ import com.nextcloud.talk.models.ExternalSignalingServer
import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.models.json.capabilities.Capabilities
import com.nextcloud.talk.models.json.push.PushConfigurationState
import com.nextcloud.talk.newarch.di.module.CommunicationModule
import com.nextcloud.talk.newarch.di.module.NetworkModule
import com.nextcloud.talk.newarch.di.module.StorageModule
import com.nextcloud.talk.newarch.di.module.*
import com.nextcloud.talk.newarch.features.conversationsList.di.module.ConversationsListModule
import com.nextcloud.talk.newarch.local.dao.UsersDao
import com.nextcloud.talk.newarch.local.models.UserNgEntity
@ -165,13 +163,13 @@ class NextcloudTalkApplication : Application(), LifecycleObserver {
val signalingSettingsWork = OneTimeWorkRequest.Builder(SignalingSettingsWorker::class.java)
.build()
WorkManager.getInstance()
WorkManager.getInstance(this)
.enqueue(pushRegistrationWork)
WorkManager.getInstance()
WorkManager.getInstance(this)
.enqueue(accountRemovalWork)
WorkManager.getInstance()
WorkManager.getInstance(this)
.enqueue(signalingSettingsWork)
WorkManager.getInstance()
WorkManager.getInstance(this)
.enqueueUniquePeriodicWork(
"DailyCapabilitiesUpdateWork", ExistingPeriodicWorkPolicy.REPLACE,
periodicCapabilitiesUpdateWork
@ -195,7 +193,7 @@ class NextcloudTalkApplication : Application(), LifecycleObserver {
startKoin {
androidContext(this@NextcloudTalkApplication)
androidLogger()
modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsListModule))
modules(listOf(CommunicationModule, StorageModule, NetworkModule, ConversationsModule, ConversationsListModule, ManagementModule))
}
}

2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -123,7 +123,7 @@ class ChatController(args: Bundle) : BaseController(), MessagesListAdapter
@BindView(R.id.smileyButton)
@JvmField
var smileyButton: ImageButton? = null
@BindView(R.id.lobby_view)
@BindView(R.id.lobbyView)
@JvmField
var lobbyView: RelativeLayout? = null
@BindView(R.id.lobbyTextView)

8
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.kt
View File

@ -61,6 +61,10 @@ import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.koin.android.ext.android.inject
import org.parceler.Parcels
import retrofit2.HttpException
@ -150,6 +154,7 @@ class OperationsMenuController(args: Bundle) : BaseController() {
}
private fun processOperation() {
GlobalScope.launch {
currentUser = usersRepository.getActiveUser()
val operationsObserver = OperationsObserver()
@ -331,6 +336,8 @@ class OperationsMenuController(args: Bundle) : BaseController() {
}
}// Operation 7 is sharing, so we handle this differently
}
}
}
private fun performGroupCallWorkaround(credentials: String?) {
@ -400,6 +407,7 @@ class OperationsMenuController(args: Bundle) : BaseController() {
okButton!!.visibility = View.VISIBLE
}
}
}
private fun dispose() {
if (disposable != null && !disposable!!.isDisposed) {

62
app/src/main/java/com/nextcloud/talk/newarch/di/module/ConversationsModule.kt Normal file
View File

@ -0,0 +1,62 @@
package com.nextcloud.talk.newarch.di.module
import android.app.Application
import com.nextcloud.talk.newarch.data.source.remote.ApiErrorHandler
import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsRepository
import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository
import com.nextcloud.talk.newarch.domain.repository.online.NextcloudTalkRepository
import com.nextcloud.talk.newarch.domain.usecases.*
import com.nextcloud.talk.newarch.features.chat.ChatViewModelFactory
import com.nextcloud.talk.newarch.utils.ConversationsManager
import org.koin.dsl.module
val ConversationsModule = module {
single { createGetConversationsUseCase(get(), get()) }
single { createSetConversationFavoriteValueUseCase(get(), get()) }
single { createLeaveConversationUseCase(get(), get()) }
single { createDeleteConversationUseCase(get(), get()) }
single { createJoinConversationUseCase(get(), get()) }
single { createExitConversationUseCase(get(), get()) }
factory { createChatViewModelFactory(get(), get(), get(), get(), get(), get()) }
}
fun createSetConversationFavoriteValueUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): SetConversationFavoriteValueUseCase {
return SetConversationFavoriteValueUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createGetConversationsUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): GetConversationsUseCase {
return GetConversationsUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createLeaveConversationUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): LeaveConversationUseCase {
return LeaveConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createDeleteConversationUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): DeleteConversationUseCase {
return DeleteConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createJoinConversationUseCase(nextcloudTalkRepository: NextcloudTalkRepository, apiErrorHandler: ApiErrorHandler): JoinConversationUseCase {
return JoinConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createExitConversationUseCase(nextcloudTalkRepository: NextcloudTalkRepository, apiErrorHandler: ApiErrorHandler): ExitConversationUseCase {
return ExitConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createChatViewModelFactory(application: Application, joinConversationUseCase: JoinConversationUseCase, exitConversationUseCase: ExitConversationUseCase, conversationsRepository: ConversationsRepository, messagesRepository: MessagesRepository, conversationsManager: ConversationsManager): ChatViewModelFactory {
return ChatViewModelFactory(application, joinConversationUseCase, exitConversationUseCase, conversationsRepository, messagesRepository, conversationsManager)
}

38
app/src/main/java/com/nextcloud/talk/newarch/di/module/ManagementModule.kt Normal file
View File

@ -0,0 +1,38 @@
/*
* Nextcloud Talk application
*
* @author Mario Danic
* Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.newarch.di.module
import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsRepository
import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
import com.nextcloud.talk.newarch.domain.usecases.GetConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.JoinConversationUseCase
import com.nextcloud.talk.newarch.utils.ConversationsManager
import okhttp3.OkHttpClient
import org.koin.dsl.module
import java.net.CookieManager
val ManagementModule = module {
single{ createConversationsManager(get(), get(), get(), get(), get(), get()) }
}
fun createConversationsManager(usersRepository: UsersRepository, cookieManager: CookieManager, okHttpClient: OkHttpClient, conversationsRepository: ConversationsRepository, getConversationUseCase: GetConversationUseCase, joinConversationUseCase: JoinConversationUseCase): ConversationsManager {
return ConversationsManager(usersRepository, cookieManager, okHttpClient, conversationsRepository, joinConversationUseCase, getConversationUseCase)
}

4
app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModel.kt
View File

@ -15,6 +15,7 @@ import com.nextcloud.talk.newarch.domain.usecases.ExitConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.JoinConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.newarch.utils.ConversationsManager
import kotlinx.coroutines.launch
import org.koin.core.parameter.parametersOf
@ -22,7 +23,8 @@ class ChatViewModel constructor(application: Application,
private val joinConversationUseCase: JoinConversationUseCase,
private val exitConversationUseCase: ExitConversationUseCase,
private val conversationsRepository: ConversationsRepository,
private val messagesRepository: MessagesRepository) : BaseViewModel<ChatView>(application) {
private val messagesRepository: MessagesRepository,
private val conversationsManager: ConversationsManager) : BaseViewModel<ChatView>(application) {
lateinit var user: UserNgEntity
val conversation: MutableLiveData<Conversation?> = MutableLiveData()
val messagesLiveData = Transformations.switchMap(conversation) {

6
app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatViewModelFactory.kt
View File

@ -7,18 +7,20 @@ import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsReposit
import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository
import com.nextcloud.talk.newarch.domain.usecases.ExitConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.JoinConversationUseCase
import com.nextcloud.talk.newarch.utils.ConversationsManager
class ChatViewModelFactory constructor(
private val application: Application,
private val joinConversationUseCase: JoinConversationUseCase,
private val exitConversationUseCase: ExitConversationUseCase,
private val conversationsRepository: ConversationsRepository,
private val messagesRepository: MessagesRepository
private val messagesRepository: MessagesRepository,
private val conversationsManager: ConversationsManager
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return ChatViewModel(
application, joinConversationUseCase, exitConversationUseCase, conversationsRepository, messagesRepository
application, joinConversationUseCase, exitConversationUseCase, conversationsRepository, messagesRepository, conversationsManager
) as T
}
}

32
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/di/module/ConversationsListModule.kt
View File

@ -34,10 +34,6 @@ import org.koin.android.ext.koin.androidApplication
import org.koin.dsl.module
val ConversationsListModule = module {
single { createGetConversationsUseCase(get(), get()) }
single { createSetConversationFavoriteValueUseCase(get(), get()) }
single { createLeaveConversationUseCase(get(), get()) }
single { createDeleteConversationuseCase(get(), get()) }
//viewModel { ConversationsListViewModel(get(), get()) }
factory {
createConversationListViewModelFactory(
@ -47,34 +43,6 @@ val ConversationsListModule = module {
}
}
fun createSetConversationFavoriteValueUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): SetConversationFavoriteValueUseCase {
return SetConversationFavoriteValueUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createGetConversationsUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): GetConversationsUseCase {
return GetConversationsUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createLeaveConversationUseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): LeaveConversationUseCase {
return LeaveConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createDeleteConversationuseCase(
nextcloudTalkRepository: NextcloudTalkRepository,
apiErrorHandler: ApiErrorHandler
): DeleteConversationUseCase {
return DeleteConversationUseCase(nextcloudTalkRepository, apiErrorHandler)
}
fun createConversationListViewModelFactory(
application: Application,
getConversationsUseCase:

4
app/src/main/java/com/nextcloud/talk/newarch/utils/ConversationsManager.kt
View File

@ -50,11 +50,13 @@ class ConversationsManager constructor(usersRepository: UsersRepository,
init {
currentUserLiveData.observeForever { user ->
if (user.id != previousUser?.id) {
cookieManager.cookieStore.removeAll()
okHttpClient.dispatcher().cancelAll()
//okHttpClient.dispatcher().cancelAll()
currentConversation = null
}
}
}
suspend fun getConversation(conversationToken: String) {
val currentUser = currentUserLiveData.value

1
app/src/main/java/com/nextcloud/talk/newarch/utils/ConversationsManagerInterface.kt
View File

@ -24,5 +24,6 @@ import com.nextcloud.talk.models.json.conversations.Conversation
import com.nextcloud.talk.newarch.local.models.UserNgEntity
interface ConversationsManagerInterface {
fun gotConversationInfoForuser(userNgEntity: UserNgEntity, conversation: Conversation?)
fun joinedConversationForUser(userNgEntity: UserNgEntity, conversation: Conversation?)
}