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

cleanup

Browse Source
This commit is contained in:
Benoit Marty 2020-06-30 00:51:11 +02:00
parent c14b226c92
commit 6721e33c7e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt
View File

@ -52,10 +52,10 @@ internal class Request<DATA : Any>(private val eventBus: EventBus?) {
// Check if this is a certificateException // Check if this is a certificateException
CertUtil.getCertificateException(exception) CertUtil.getCertificateException(exception)
// TODO Support certificate error once logged // TODO Support certificate error once logged
//?.also { unrecognizedCertificateException -> // ?.also { unrecognizedCertificateException ->
// // Send the error to the bus, for a global management // // Send the error to the bus, for a global management
// eventBus?.post(GlobalError.CertificateError(unrecognizedCertificateException)) // eventBus?.post(GlobalError.CertificateError(unrecognizedCertificateException))
//} // }
?.also { unrecognizedCertificateException -> throw unrecognizedCertificateException } ?.also { unrecognizedCertificateException -> throw unrecognizedCertificateException }
if (isRetryable && currentRetryCount++ < maxRetryCount && exception.shouldBeRetried()) { if (isRetryable && currentRetryCount++ < maxRetryCount && exception.shouldBeRetried()) {

3
vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt
View File

@ -145,7 +145,6 @@ class UnrecognizedCertificateDialog @Inject constructor(
builder.setOnDismissListener { builder.setOnDismissListener {
Timber.d("Dismissed!") Timber.d("Dismissed!")
openDialogIds.remove(dialogId) openDialogIds.remove(dialogId)
} }
builder.show() builder.show()
@ -168,4 +167,4 @@ class UnrecognizedCertificateDialog @Inject constructor(
*/ */
fun onReject() fun onReject()
} }
} }