filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-30 10:54:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix CI

Browse Source
This commit is contained in:
valere 2022-12-02 15:49:32 +01:00
parent b9045eb25f
commit 2ae4b87f2f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/elementr.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
target: [ Gplay, Fdroid ] target: [ Gplay, Fdroid ]
# Allow all jobs on develop. Just one per PR. # Allow all jobs on develop. Just one per PR.
concurrency: concurrency:
group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }} group: ${{ github.ref == 'refs/heads/develop' && format('elementr-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }}
cancel-in-progress: true cancel-in-progress: true
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

2
.github/workflows/nightly_er.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
rm towncrier.toml.bak rm towncrier.toml.bak
yes n | towncrier build --version nightly yes n | towncrier build --version nightly
- name: Build and upload Gplay Nightly APK - name: Build and upload Gplay Nightly ER APK
run: | run: |
./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES ./gradlew assembleGplayRustCryptoNightly appDistributionUploadGplayRustCryptoNightly $CI_GRADLE_ARG_PROPERTIES
env: env:

4
vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt
View File

@ -290,7 +290,7 @@ class SelfVerificationController @Inject constructor(
} }
is Success -> { is Success -> {
// Success => There is an active transaction // Success => There is an active transaction
renderTransaction(state, transaction = transaction.invoke()) renderTransaction(transaction = transaction.invoke())
} }
is Fail -> { is Fail -> {
// todo // todo
@ -300,7 +300,7 @@ class SelfVerificationController @Inject constructor(
} }
} }
private fun renderTransaction(state: SelfVerificationViewState, transaction: VerificationTransactionData) { private fun renderTransaction(transaction: VerificationTransactionData) {
when (transaction) { when (transaction) {
is VerificationTransactionData.QrTransactionData -> { is VerificationTransactionData.QrTransactionData -> {
renderQrTransaction(transaction, null) renderQrTransaction(transaction, null)