mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-24 14:05:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

trying to extract flow value

Browse source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-20 21:28:32 +02:00
parent f7ca1ec804
commit 27d5059e92
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
View file

@ -53,7 +53,6 @@ import android.widget.Toast
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.lifecycle.lifecycleScope
import androidx.work.OneTimeWorkRequest import androidx.work.OneTimeWorkRequest
import androidx.work.WorkManager import androidx.work.WorkManager
import autodagger.AutoInjector import autodagger.AutoInjector
@ -64,7 +63,6 @@ import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import com.nextcloud.talk.BuildConfig import com.nextcloud.talk.BuildConfig
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApi
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.setAppTheme import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.setAppTheme
@ -150,10 +148,12 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
resources!!.getString(R.string.nc_settings) resources!!.getString(R.string.nc_settings)
private fun getCurrentUser() { private fun getCurrentUser() {
(activity as MainActivity).lifecycleScope.launchWhenCreated { scope.launch {
currentUserProvider.currentUser.collect { currentUserProvider.currentUser.collect {
currentUser = it Log.e(TAG, "User: $it")
credentials = ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token) this@SettingsController.currentUser = it
this@SettingsController.credentials =
ApiUtils.getCredentials(currentUser!!.username, currentUser!!.token)
} }
} }
} }
@ -325,7 +325,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
var port = -1 var port = -1
val uri: URI val uri: URI
try { try {
uri = URI(currentUser!!.baseUrl) uri = URI(this@SettingsController.currentUser!!.baseUrl)
host = uri.host host = uri.host
port = uri.port port = uri.port
} catch (e: URISyntaxException) { } catch (e: URISyntaxException) {