Merge tag '6.702' into update_to_upstream_6_703

insert_final_newline = true

[*.{kt,kts}]

ij_kotlin_imports_layout = *,^*

ij_kotlin_imports_layout = *,^

ij_kotlin_allow_trailing_comma = true

ij_kotlin_allow_trailing_comma_on_call_site = true

[*.{yml,yaml}]

[*.{yml,yaml,json,toml}]

indent_size = 2

If the app is not behaving like it should, it's not necessarily a bug. Please consult the following resources before

submitting a new issue.

* [User Manual](https://docs.k9mail.app/)

* [Frequently Asked Questions](https://forum.k9mail.app/c/faq)

* [Support Forum](https://forum.k9mail.app/)

- [User Manual](https://docs.k9mail.app/)

- [Frequently Asked Questions](https://forum.k9mail.app/c/faq)

- [Support Forum](https://forum.k9mail.app/)

### Bug report guidelines

* The issue tracker is solely for bug reports and feature/enhancement requests. If you have a question of any kind,

- The issue tracker is solely for bug reports and feature/enhancement requests. If you have a question of any kind,

  please use the [support forum](https://forum.k9mail.app/c/support) instead.

* Search the [existing issues](https://github.com/thundernest/k-9/issues?q=) first to make sure your issue hasn't been

- Search the [existing issues](https://github.com/thundernest/k-9/issues?q=) first to make sure your issue hasn't been

  reported before.

## Translations

We're using [Transifex](https://www.transifex.com/k-9/k9mail/) to manage translations.

## Contributing code

We love [pull requests](https://github.com/thundernest/k-9/pulls) from everyone!

Please ensure that your pull request meets the following requirements - thanks!

* Does not contain merge commits. Rebase instead.

* Contains commits with descriptive titles.

* New code is written in Kotlin whenever possible.

* Follows our existing codestyle (`gradlew ktlintCheck`; will be checked by CI).

* Does not break any unit tests (`gradlew testDebugUnitTest`; will be checked by CI).

* Uses a descriptive title; don't put issue numbers in there.

* Contains a reference to the issue that it fixes (e.g. *Closes #XXX* or *Fixes #XXX*) in the body text.

* For cosmetic changes add one or multiple images, if possible.

- Does not contain merge commits. Rebase instead.

- Contains commits with descriptive titles.

- New code is written in Kotlin whenever possible.

- Follows our existing codestyle (`gradlew spotlessCheck` to check and `gradlew spotlessFormat` to format your source code; will be checked by CI).

- Does not break any unit tests (`gradlew testDebugUnitTest`; will be checked by CI).

- Uses a descriptive title; don't put issue numbers in there.

- Contains a reference to the issue that it fixes (e.g. _Closes #XXX_ or _Fixes #XXX_) in the body text.

- For cosmetic changes add one or multiple images, if possible.

Finally, please replace this template text with a description of the change and additional context if necessary.

      - uses: actions/checkout@v3

      - uses: actions/setup-java@v3

        with:

          distribution: 'zulu'

          distribution: temurin

          java-version: 17

      - uses: gradle/gradle-build-action@v2

      - run: ./gradlew assembleDebug ktlintCheck testsOnCi

      - run: ./gradlew assembleDebug detekt spotlessCheck testsOnCi

name: CodeQL - Code scanning

on:

  schedule:

    - cron: '0 10 * * 1'

jobs:

  codeql-scan:

    strategy:

      fail-fast: false

    runs-on: ubuntu-latest

    permissions:

      security-events: write

    steps:

      - uses: actions/checkout@v3

      - uses: actions/setup-java@v3

        with:

          distribution: temurin

          java-version: 17

      - uses: gradle/gradle-build-action@v2

      - uses: github/codeql-action/init@v2

        with:

          languages: java

      - name: Autobuild

        uses: github/codeql-action/autobuild@v2

      - name: Perform CodeQL Analysis

        uses: github/codeql-action/analyze@v2