Skip to content

Commit

Permalink
Merge branch 'expandable-fab' into qr-scanner-manual-entry
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/res/values/strings.xml
  • Loading branch information
SaintPatrck committed Mar 29, 2024
2 parents 24835c9 + 1ee3bef commit 6db1d64
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# Default file owners
* @bitwarden/tech-leads
* @bitwarden/dept-development-mobile

# DevOps for Actions and other workflow changes
.github/workflows @bitwarden/dept-devops
17 changes: 10 additions & 7 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ on:
pull_request_target:
types: [opened, synchronize]

permissions: read-all

jobs:
check-run:
name: Check PR run
Expand All @@ -22,6 +20,8 @@ jobs:
runs-on: ubuntu-22.04
needs: check-run
permissions:
contents: read
pull-requests: write
security-events: write

steps:
Expand All @@ -40,17 +40,20 @@ jobs:
base_uri: https://ast.checkmarx.net/
cx_client_id: ${{ secrets.CHECKMARX_CLIENT_ID }}
cx_client_secret: ${{ secrets.CHECKMARX_SECRET }}
additional_params: --report-format sarif --output-path . ${{ env.INCREMENTAL }}
# additional_params: --report-format sarif --output-path . ${{ env.INCREMENTAL }}

- name: Upload Checkmarx results to GitHub
uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
with:
sarif_file: cx_result.sarif
# - name: Upload Checkmarx results to GitHub
# uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
# with:
# sarif_file: cx_result.sarif

quality:
name: Quality scan
runs-on: ubuntu-22.04
needs: check-run
permissions:
contents: read
pull-requests: write

steps:
- name: Check out repo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.x8bit.bitwarden.authenticator.ui.platform.components.model.IconResour
sealed class ItemListingExpandableFabAction(
label: Text?,
icon: IconResource,
onFabOptionClick: () -> Unit
onFabOptionClick: () -> Unit,
) : ExpandableFabOption(label, icon, onFabOptionClick) {

class ScanQrCode(
Expand All @@ -30,4 +30,4 @@ sealed class ItemListingExpandableFabAction(
onEnterSetupKeyClick
)

}
}

0 comments on commit 6db1d64

Please sign in to comment.