Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fee5f2aa authored by Philipp Kewisch's avatar Philipp Kewisch
Browse files

Uplift changes from main to beta for 8.0b5

parents 21890f97 e1b9bf64

.github/ISSUE_TEMPLATE/config.yml

+2 −2
Original line number Diff line number Diff line 
blank_issues_enabled: false

contact_links:

  - name: K-9 Mail Forum

    url: https://forum.k9mail.app/

  - name: Mozilla Support Forum (SUMO)

    url: https://support.mozilla.org/en-US/products/thunderbird-android

    about: Most issues are not bugs. Ask the community for help.

.github/pull_request_template.md

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 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 spotlessCheck` to check and `gradlew spotlessFormat` to format your source code; will be checked by CI).

- Follows our existing codestyle (`gradlew spotlessCheck` to check and `gradlew spotlessApply` 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.

.github/workflows/shippable_builds.yml

+3 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ jobs: 


          # Ready to commit. Make sure to pull again to reduce likelihood of race conditions

          git status

          git pull

          git commit -m "Release: ${APPLICATION_LABEL} ${FULL_VERSION_NAME}"

          git pull --rebase -X ours

          git log -n 5



          set +e
@@ -337,6 +337,7 @@ jobs: 
            echo "Push rejected, trying again once in 5 seconds"

            sleep 5

            git pull --rebase -X ours

            git log -n 5

            git push

          fi
@@ -840,7 +841,7 @@ jobs: 
          matrixRoomId: ${{ vars.MATRIX_NOTIFY_ROOM }}

          matrixToken: ${{ secrets.MATRIX_NOTIFY_TOKEN }}

          message: >-

            ${{ needs.publish_release.k9mail_full_version_name }} [is available](${{ needs.publish_release.outputs.k9mail_release_url }})

            ${{ needs.publish_release.outputs.k9mail_full_version_name }} [is available](${{ needs.publish_release.outputs.k9mail_release_url }})



      - name: Notify Success (Daily)

        if: ${{ vars.MATRIX_NOTIFY_ROOM && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && needs.dump_config.outputs.releaseType == 'daily' && steps.last_status.outputs.last_status == 'failure' }}

app-k9mail/build.gradle.kts

+1 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ android { 
                "ar",

                "be",

                "bg",

                "br",

                "ca",

                "co",

                "cs",
@@ -80,7 +79,7 @@ android { 
                "fi",

                "fr",

                "fy",

                "gd",

                "ga",

                "gl",

                "hr",

                "hu",
@@ -92,7 +91,6 @@ android { 
                "ko",

                "lt",

                "lv",

                "ml",

                "nb",

                "nl",

                "nn",
@@ -101,7 +99,6 @@ android { 
                "pt_PT",

                "ro",

                "ru",

                "sk",

                "sl",

                "sq",

                "sr",

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import app.k9mail.widget.appWidgetModule 
import com.fsck.k9.AppConfig

import com.fsck.k9.BuildConfig

import com.fsck.k9.activity.MessageCompose

import com.fsck.k9.preferences.FilePrefixProvider

import com.fsck.k9.provider.K9ThemeProvider

import com.fsck.k9.provider.UnreadWidgetProvider

import com.fsck.k9.widget.list.MessageListWidgetProvider
@@ -39,7 +40,9 @@ val appModule = module { 
    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

    single<AppConfig> { appConfig }

    single<OAuthConfigurationFactory> { K9OAuthConfigurationFactory() }

    single { K9AppNameProvider(androidContext()) } binds arrayOf(AppNameProvider::class, BrandNameProvider::class)

    single {

        K9AppNameProvider(androidContext())

    } binds arrayOf(AppNameProvider::class, BrandNameProvider::class, FilePrefixProvider::class)

    single<ThemeProvider> { K9ThemeProvider() }

    single<FeatureThemeProvider> { K9FeatureThemeProvider() }

    single<FeatureFlagFactory> { K9FeatureFlagFactory() }