filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation issue after rebase

Browse Source
This commit is contained in:
Benoit Marty 2019-11-15 14:44:32 +01:00
parent ca4e75a1a0
commit fb46a14172
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/DefaultRegistrationService.kt
View File

@ -16,6 +16,7 @@
package im.vector.matrix.android.internal.auth.registration package im.vector.matrix.android.internal.auth.registration
import dagger.Lazy
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
import im.vector.matrix.android.api.auth.registration.RegistrationService import im.vector.matrix.android.api.auth.registration.RegistrationService
import im.vector.matrix.android.api.auth.registration.RegistrationWizard import im.vector.matrix.android.api.auth.registration.RegistrationWizard
@ -25,10 +26,10 @@ import im.vector.matrix.android.internal.di.Unauthenticated
import im.vector.matrix.android.internal.network.RetrofitFactory import im.vector.matrix.android.internal.network.RetrofitFactory
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import javax.inject.Provider
// TODO Add @Inject
internal class DefaultRegistrationService(@Unauthenticated internal class DefaultRegistrationService(@Unauthenticated
private val okHttpClient: Provider<OkHttpClient>, private val okHttpClient: Lazy<OkHttpClient>,
private val retrofitFactory: RetrofitFactory, private val retrofitFactory: RetrofitFactory,
private val coroutineDispatchers: MatrixCoroutineDispatchers, private val coroutineDispatchers: MatrixCoroutineDispatchers,
private val sessionParamsStore: SessionParamsStore, private val sessionParamsStore: SessionParamsStore,

8
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/registration/DefaultRegistrationWizard.kt
View File

@ -16,6 +16,7 @@
package im.vector.matrix.android.internal.auth.registration package im.vector.matrix.android.internal.auth.registration
import dagger.Lazy
import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.api.auth.data.SessionParams
@ -27,18 +28,15 @@ import im.vector.matrix.android.api.util.NoOpCancellable
import im.vector.matrix.android.internal.SessionManager import im.vector.matrix.android.internal.SessionManager
import im.vector.matrix.android.internal.auth.AuthAPI import im.vector.matrix.android.internal.auth.AuthAPI
import im.vector.matrix.android.internal.auth.SessionParamsStore import im.vector.matrix.android.internal.auth.SessionParamsStore
import im.vector.matrix.android.internal.di.Unauthenticated
import im.vector.matrix.android.internal.network.RetrofitFactory import im.vector.matrix.android.internal.network.RetrofitFactory
import im.vector.matrix.android.internal.util.CancelableCoroutine import im.vector.matrix.android.internal.util.CancelableCoroutine
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import javax.inject.Provider
internal class DefaultRegistrationWizard(private val homeServerConnectionConfig: HomeServerConnectionConfig, internal class DefaultRegistrationWizard(private val homeServerConnectionConfig: HomeServerConnectionConfig,
@Unauthenticated private val okHttpClient: Lazy<OkHttpClient>,
private val okHttpClient: Provider<OkHttpClient>,
private val retrofitFactory: RetrofitFactory, private val retrofitFactory: RetrofitFactory,
private val coroutineDispatchers: MatrixCoroutineDispatchers, private val coroutineDispatchers: MatrixCoroutineDispatchers,
private val sessionParamsStore: SessionParamsStore, private val sessionParamsStore: SessionParamsStore,
@ -100,7 +98,7 @@ internal class DefaultRegistrationWizard(private val homeServerConnectionConfig:
} }
private fun buildAuthAPI(): AuthAPI { private fun buildAuthAPI(): AuthAPI {
val retrofit = retrofitFactory.create(okHttpClient.get(), homeServerConnectionConfig.homeServerUri.toString()) val retrofit = retrofitFactory.create(okHttpClient, homeServerConnectionConfig.homeServerUri.toString())
return retrofit.create(AuthAPI::class.java) return retrofit.create(AuthAPI::class.java)
} }
} }

2
vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
View File

@ -99,7 +99,7 @@ class LoginFragment @Inject constructor(
passwordFieldTil.error = null passwordFieldTil.error = null
loginSubmit.isEnabled = it loginSubmit.isEnabled = it
} }
.disposeOnDestroy() .disposeOnDestroyView()
loginSubmit.setOnClickListener { authenticate() } loginSubmit.setOnClickListener { authenticate() }
} }

2
vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt
View File

@ -73,7 +73,7 @@ class LoginResetPasswordFragment @Inject constructor(
passwordFieldTil.error = null passwordFieldTil.error = null
resetPasswordSubmit.isEnabled = it resetPasswordSubmit.isEnabled = it
} }
.disposeOnDestroy() .disposeOnDestroyView()
resetPasswordSubmit.setOnClickListener { submit() } resetPasswordSubmit.setOnClickListener { submit() }
} }

2
vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
View File

@ -58,7 +58,7 @@ class LoginServerUrlFormFragment @Inject constructor(
{ {
// Ignore error // Ignore error
}) })
.disposeOnDestroy() .disposeOnDestroyView()
loginServerUrlFormHomeServerUrl.setOnEditorActionListener { _, actionId, _ -> loginServerUrlFormHomeServerUrl.setOnEditorActionListener { _, actionId, _ ->
if (actionId == EditorInfo.IME_ACTION_DONE) { if (actionId == EditorInfo.IME_ACTION_DONE) {