-
Notifications
You must be signed in to change notification settings - Fork 677
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8578 from vector-im/feature/bma/crashFixes
Crash fixes
- Loading branch information
Showing
9 changed files
with
159 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapErrorFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright (c) 2023 New Vector Ltd | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package im.vector.app.features.crypto.recover | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import com.airbnb.mvrx.parentFragmentViewModel | ||
| import com.airbnb.mvrx.withState | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import im.vector.app.R | ||
| import im.vector.app.core.epoxy.onClick | ||
| import im.vector.app.core.extensions.setTextOrHide | ||
| import im.vector.app.core.platform.VectorBaseFragment | ||
| import im.vector.app.databinding.FragmentBootstrapErrorBinding | ||
|
|
||
| @AndroidEntryPoint | ||
| class BootstrapErrorFragment : | ||
| VectorBaseFragment<FragmentBootstrapErrorBinding>() { | ||
|
|
||
| override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapErrorBinding { | ||
| return FragmentBootstrapErrorBinding.inflate(inflater, container, false) | ||
| } | ||
|
|
||
| val sharedViewModel: BootstrapSharedViewModel by parentFragmentViewModel() | ||
|
|
||
| override fun invalidate() = withState(sharedViewModel) { state -> | ||
| when (state.step) { | ||
| is BootstrapStep.Error -> { | ||
| views.bootstrapDescriptionText.setTextOrHide(errorFormatter.toHumanReadable(state.step.error)) | ||
| } | ||
| else -> { | ||
| // Should not happen, show a generic error | ||
| views.bootstrapDescriptionText.setTextOrHide(getString(R.string.unknown_error)) | ||
| } | ||
| } | ||
| views.bootstrapRetryButton.onClick { | ||
| sharedViewModel.handle(BootstrapActions.Retry) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="200dp" | ||
| android:padding="16dp"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/bootstrapDescriptionText" | ||
| style="@style/Widget.Vector.TextView.Body" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="8dp" | ||
| android:text="@string/error_check_network" | ||
| android:textColor="?vctr_content_primary" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/bootstrapRetryButton" | ||
| style="@style/Widget.Vector.Button" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/layout_vertical_margin" | ||
| android:text="@string/global_retry" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/bootstrapDescriptionText" | ||
| tools:ignore="MissingConstraints" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |