-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'epic/new-sso-login-flow' into feat/newlogin-sso
- Loading branch information
Showing
279 changed files
with
3,991 additions
and
1,900 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,3 +64,57 @@ runs: | |
| GITHUB_TOKEN: ${{ inputs.github-token }} | ||
| run: | | ||
| gh pr comment "${{ github.event.pull_request.number }}" --body "Built [wire-android-${{ inputs.build-flavour }}-${{ inputs.build-variant }}-pr-${{ github.event.pull_request.number }}.apk](${{ steps.upload.outputs.file-url }}) is available for download" | ||
| - name: Extract version and version code from APK filename | ||
| shell: bash | ||
| run: | | ||
| filename=${{ steps.path.outputs.apk_full_path }} | ||
| # Extract version name and version code | ||
| version=$(echo "$filename" | sed -E 's/.*-v([0-9]+\.[0-9]+\.[0-9]+).*/\1/') | ||
| version_code=$(echo "$filename" | sed -E 's/.*-([0-9]+)-${{ inputs.build-flavour }}-${{ inputs.build-variant }}\.apk/\1/') | ||
| # Print the extracted version and version code | ||
| echo "Extracted version: v$version" | ||
| echo "Extracted version code: $version_code" | ||
| # set them as environment variables for later use | ||
| echo "VERSION=v$version" >> $GITHUB_ENV | ||
| echo "VERSION_CODE=$version_code" >> $GITHUB_ENV | ||
| - name: Rename mapping file | ||
| if: ${{ inputs.build-variant != 'debug' }} | ||
| shell: bash | ||
| id: mapping | ||
| run: | | ||
| capitalized_variant=$(echo "${{ inputs.build-variant }}" | awk '{print toupper(substr($0,1,1)) tolower(substr($0,2))}') | ||
| echo "Capitalized Variant: $capitalized_variant" | ||
| mapping_full_path="app/build/outputs/mapping/${{ inputs.build-flavour }}${capitalized_variant}/mapping.txt" | ||
| new_mapping_file_name="mapping-${{ env.VERSION }}-${{ env.VERSION_CODE }}-${{ inputs.build-flavour }}-${{ inputs.build-variant }}.txt" | ||
| mv "$mapping_full_path" "$new_mapping_file_name" | ||
| # Set the new mapping file name as an environment variable | ||
| echo "new_mapping_file_name=$new_mapping_file_name" >> $GITHUB_ENV | ||
| - name: Upload mapping file to S3 from branch | ||
| if: ${{ github.event.pull_request.number == '' && inputs.build-variant != 'debug' }} | ||
| id: upload-mapping-from-branch | ||
| uses: hkusu/[email protected] | ||
| with: | ||
| aws-access-key-id: ${{ inputs.aws-access-key-id }} | ||
| aws-secret-access-key: ${{ inputs.aws-secret-access-key }} | ||
| aws-region: 'eu-central-1' | ||
| aws-bucket: ${{ inputs.aws-bucket }} | ||
| destination-dir: "megazord/android/reloaded/${{ inputs.build-flavour }}/${{ inputs.build-variant }}/" | ||
| file-path: ${{ env.new_mapping_file_name }} | ||
| output-file-url: 'false' | ||
| public: false | ||
| - name: Upload mapping file to S3 from PR | ||
| if: ${{ github.event.pull_request.number != '' && inputs.build-variant != 'debug' }} | ||
| id: upload-mapping-from-PR | ||
| uses: hkusu/[email protected] | ||
| with: | ||
| aws-access-key-id: ${{ inputs.aws-access-key-id }} | ||
| aws-secret-access-key: ${{ inputs.aws-secret-access-key }} | ||
| aws-region: 'eu-central-1' | ||
| aws-bucket: ${{ inputs.aws-bucket }} | ||
| destination-dir: "megazord/android/reloaded/${{ inputs.build-flavour }}/${{ inputs.build-variant }}/PR-${{ github.event.pull_request.number }}/" | ||
| file-path: ${{ env.new_mapping_file_name }} | ||
| output-file-url: 'false' | ||
| public: false | ||
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
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
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
61 changes: 61 additions & 0 deletions
61
app/src/main/kotlin/com/wire/android/di/accountScoped/BackupModule.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,61 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2025 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.di.accountScoped | ||
|
|
||
| import com.wire.android.di.CurrentAccount | ||
| import com.wire.android.di.KaliumCoreLogic | ||
| import com.wire.kalium.logic.CoreLogic | ||
| import com.wire.kalium.logic.data.user.UserId | ||
| import com.wire.kalium.logic.feature.backup.BackupScope | ||
| import com.wire.kalium.util.DelicateKaliumApi | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.android.components.ViewModelComponent | ||
| import dagger.hilt.android.scopes.ViewModelScoped | ||
|
|
||
| @Module | ||
| @InstallIn(ViewModelComponent::class) | ||
| class BackupModule { | ||
|
|
||
| @ViewModelScoped | ||
| @Provides | ||
| fun provideBackupScope(@KaliumCoreLogic coreLogic: CoreLogic, @CurrentAccount currentAccount: UserId): BackupScope = | ||
| coreLogic.getSessionScope(currentAccount).backup | ||
|
|
||
| @ViewModelScoped | ||
| @Provides | ||
| fun provideCreateBackupUseCase(backupScope: BackupScope) = | ||
| backupScope.create | ||
|
|
||
| @ViewModelScoped | ||
| @Provides | ||
| fun provideVerifyBackupUseCase(backupScope: BackupScope) = | ||
| backupScope.verify | ||
|
|
||
| @ViewModelScoped | ||
| @Provides | ||
| fun provideRestoreBackupUseCase(backupScope: BackupScope) = | ||
| backupScope.restore | ||
|
|
||
| @OptIn(DelicateKaliumApi::class) | ||
| @ViewModelScoped | ||
| @Provides | ||
| fun provideOnboardingBackupUseCase(backupScope: BackupScope) = | ||
| backupScope.createUnEncryptedCopy | ||
| } |
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
Oops, something went wrong.