filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-08 16:18:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issue after library upgrade

Browse Source
This commit is contained in:
Benoit Marty 2020-12-02 13:34:34 +01:00
parent 89a7ec6d4b
commit 9881c9f61c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
View File

@ -24,7 +24,9 @@ import io.reactivex.Single
fun <T> singleBuilder(builder: (MatrixCallback<T>) -> Cancelable): Single<T> = Single.create { emitter -> fun <T> singleBuilder(builder: (MatrixCallback<T>) -> Cancelable): Single<T> = Single.create { emitter ->
val callback = object : MatrixCallback<T> { val callback = object : MatrixCallback<T> {
override fun onSuccess(data: T) { override fun onSuccess(data: T) {
emitter.onSuccess(data) // Add `!!` to fix the warning:
// "Type mismatch: type parameter with nullable bounds is used T is used where T was expected. This warning will become an error soon"
emitter.onSuccess(data!!)
} }
override fun onFailure(failure: Throwable) { override fun onFailure(failure: Throwable) {

4
vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
View File

@ -74,6 +74,10 @@ class PinFragment @Inject constructor(
Toast.makeText(requireContext(), getString(R.string.create_pin_confirm_failure), Toast.LENGTH_SHORT).show() Toast.makeText(requireContext(), getString(R.string.create_pin_confirm_failure), Toast.LENGTH_SHORT).show()
} }
override fun onPinCodeEnteredFirst(pinCode: String?): Boolean {
return false
}
override fun onCodeCreated(encodedCode: String) { override fun onCodeCreated(encodedCode: String) {
lifecycleScope.launch { lifecycleScope.launch {
pinCodeStore.storeEncodedPin(encodedCode) pinCodeStore.storeEncodedPin(encodedCode)