mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Code review fixes.

Browse source
This commit is contained in:
onurays 2020-04-08 14:10:31 +03:00
parent dcb6af6c45
commit 5b1f887760
7 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkInfoReceiver.kt
View file

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
// This BroadcastReceiver is used only if the build code is below 24.
@file:Suppress("DEPRECATION") @file:Suppress("DEPRECATION")
package im.vector.matrix.android.internal.network package im.vector.matrix.android.internal.network

4
vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt
View file

@ -188,6 +188,6 @@ fun Context.toast(resId: Int) {
} }
// Not in KTX anymore // Not in KTX anymore
fun Context.toast(message: String) { fun Context.toast(message: String?) {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show() Toast.makeText(this, message ?: getString(R.string.generic_exception_error), Toast.LENGTH_SHORT).show()
} }

2
vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
View file

@ -153,7 +153,7 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
} }
override fun onFailure(failure: Throwable) { override fun onFailure(failure: Throwable) {
failure.localizedMessage?.let { toast(it) } toast(failure.localizedMessage ?: getString(R.string.unexpected_error))
hideWaitingView() hideWaitingView()
} }
}) })

9
vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt
View file

@ -46,8 +46,10 @@ import im.vector.matrix.android.api.util.MatrixItem
import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.api.util.toMatrixItem
import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64 import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64
import im.vector.matrix.android.internal.crypto.crosssigning.isVerified import im.vector.matrix.android.internal.crypto.crosssigning.isVerified
import im.vector.riotx.R
import im.vector.riotx.core.extensions.exhaustive import im.vector.riotx.core.extensions.exhaustive
import im.vector.riotx.core.platform.VectorViewModel import im.vector.riotx.core.platform.VectorViewModel
import im.vector.riotx.core.resources.StringProvider
import timber.log.Timber import timber.log.Timber
data class VerificationBottomSheetViewState( data class VerificationBottomSheetViewState(
@ -71,7 +73,8 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
@Assisted initialState: VerificationBottomSheetViewState, @Assisted initialState: VerificationBottomSheetViewState,
@Assisted val args: VerificationBottomSheet.VerificationArgs, @Assisted val args: VerificationBottomSheet.VerificationArgs,
private val session: Session, private val session: Session,
private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider) private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
private val stringProvider: StringProvider)
: VectorViewModel<VerificationBottomSheetViewState, VerificationAction, VerificationBottomSheetViewEvents>(initialState), : VectorViewModel<VerificationBottomSheetViewState, VerificationAction, VerificationBottomSheetViewEvents>(initialState),
VerificationService.Listener { VerificationService.Listener {
@ -362,9 +365,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
} }
} }
} catch (failure: Throwable) { } catch (failure: Throwable) {
failure.localizedMessage?.let { _viewEvents.post(VerificationBottomSheetViewEvents.ModalError(failure.localizedMessage ?: stringProvider.getString(R.string.unexpected_error)))
_viewEvents.post(VerificationBottomSheetViewEvents.ModalError(it))
}
} }
} }
}.exhaustive }.exhaustive

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
View file

@ -782,7 +782,7 @@ class RoomDetailFragment @Inject constructor(
updateComposerText("") updateComposerText("")
} }
is RoomDetailViewEvents.SlashCommandResultError -> { is RoomDetailViewEvents.SlashCommandResultError -> {
sendMessageResult.throwable.localizedMessage?.let { displayCommandError(it) } displayCommandError(sendMessageResult.throwable.localizedMessage ?: getString(R.string.unexpected_error))
} }
is RoomDetailViewEvents.SlashCommandNotImplemented -> { is RoomDetailViewEvents.SlashCommandNotImplemented -> {
displayCommandError(getString(R.string.not_implemented)) displayCommandError(getString(R.string.not_implemented))

2
vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View file

@ -332,7 +332,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
} }
override fun onFailure(failure: Throwable) { override fun onFailure(failure: Throwable) {
failure.localizedMessage?.let { appContext.toast(it) } appContext.toast(failure.localizedMessage ?: getString(R.string.unexpected_error))
hideLoadingView() hideLoadingView()
} }
}) })

2
vector/src/main/res/values/strings_riotX.xml
View file

@ -52,7 +52,7 @@
<!-- BEGIN Strings added by Onuray --> <!-- BEGIN Strings added by Onuray -->
<string name="unexpected_error">An unexpected error occurred</string>
<!-- END Strings added by Onuray --> <!-- END Strings added by Onuray -->