Uplift changes from main to beta for 8.0b4

.github/workflows/daily_builds.yml

@@ -9,3 +9,5 @@ jobs:
   trigger_daily_build:
     uses: ./.github/workflows/shippable_builds.yml
     secrets: inherit
+    permissions:
+      contents: write

.gitignore

@@ -33,7 +33,6 @@ out/
 # IDEA/Android Studio includes
 !.idea/icon.png
 !.idea/codeStyles/
-!.idea/inspectionProfiles/
 !.idea/fileTemplates/
 
 # Android Studio captures folder

README.md

@@ -1,70 +1,85 @@
-# K-9 Mail
+# Thunderbird for Android
 
-[![Latest release](https://img.shields.io/github/release/thunderbird/thunderbird-android.svg?style=flat-square)](https://github.com/thunderbird/thunderbird-android/releases/latest)
-[![Latest beta release](https://img.shields.io/github/v/release/thunderbird/thunderbird-android.svg?include_prereleases&style=flat-square)](https://github.com/thunderbird/thunderbird-android/releases)
+<a href="https://play.google.com/store/apps/details?id=net.thunderbird.android.beta&utm_source=thunderbird-android-github&utm_campaign=badge" target="_blank"><img alt="Get it on Google Play" src="https://www.mozilla.org/media/img/l10n/en-US/firefox/android/btn-google-play-high-res.87d9720bbc8b.png" height="28"></a>
+[![Latest release](https://img.shields.io/github/release/thunderbird/thunderbird-android.svg?style=for-the-badge)](https://github.com/thunderbird/thunderbird-android/releases/latest)
+[![Latest beta release](https://img.shields.io/github/v/release/thunderbird/thunderbird-android.svg?include_prereleases&style=for-the-badge&label=beta&filter=THUNDERBIRD_*&logo=thunderbird)](https://github.com/thunderbird/thunderbird-android/releases)
 
-K-9 Mail is an open-source email client for Android.
+Thunderbird for Android is a powerful, privacy-focused email app. Effortlessly manage multiple email accounts from one app, with a Unified Inbox option for maximum productivity. Built on open-source technology and supported by a dedicated team of developers alongside a global community of volunteers, Thunderbird never treats your private data as a product.
+
+Thunderbird for Android is based on K-9 Mail, which comes with a rich history of success and functionality in open source email.
 
 ## Download
 
-K-9 Mail can be downloaded from a couple of sources:
+Thunderbird for Android can be downloaded from a couple of sources:
 
-- [Google Play](https://play.google.com/store/apps/details?id=com.fsck.k9)
-- [F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9)
+- [Thunderbird Beta on Google Play](https://play.google.com/store/apps/details?id=net.thunderbird.android.beta&utm_source=thunderbird-android-github&utm_campaign=download-section)
 - [Github Releases](https://github.com/thunderbird/thunderbird-android/releases)
+- F-Droid coming soon
 
-You might also be interested in becoming a [tester](https://forum.k9mail.app/t/how-do-i-become-a-beta-tester/68) to get an early look at new versions.
+By using Thunderbird for Android Beta, you have early access to current development and are able to try new features earlier. The final release for Thunderbird [is coming soon](https://blog.thunderbird.net/2024/09/help-us-test-the-thunderbird-for-android-beta/)!
 
-## Release Notes
+Check out the [Release Notes](https://github.com/thunderbird/thunderbird-android/releases) to find out what changed in each version of Thunderbird for Android.
 
-Check out the [Release Notes](https://github.com/thunderbird/thunderbird-android/wiki/ReleaseNotes) to find out what changed
-in each version of K-9 Mail. For a more up to date list of changes, see the XML [Changelog](app/ui/legacy/src/main/res/raw/changelog_master.xml).
+## Need Help? Found a bug? Have an idea? Want to chat?
 
-## Need Help?
+If the app is not behaving like it should, or you are not sure if you've encoutered a bug:
 
-If the app is not behaving like it should, you might find these resources helpful:
+- Check out our [knowledge base and frequently asked questions](https://support.mozilla.org/products/thunderbird-android)
+- Ask a question on our [support forum](https://support.mozilla.org/en-US/questions/new/thunderbird-android)
 
-- [Frequently Asked Questions](https://forum.k9mail.app/c/faq)
-- [Support Forum](https://forum.k9mail.app/)
+If you are certain you've identified a bug in Thunderbird for Android and would like to help fix it:
 
-## Translations
+- File an issue on [our GitHub issue tracker](https://github.com/thunderbird/thunderbird-android/issues)
 
-Interested in helping to translate K-9 Mail? Contribute here:
+If you have an idea how to improve Thunderbird for Android:
 
-- [K-9 Mail localization](https://hosted.weblate.org/projects/tb-android/)
+- Tell us about and vote on your feature ideas on [connect.mozilla.org](https://connect.mozilla.org/t5/ideas/idb-p/ideas/label-name/thunderbird%20android).
 
-## Contributing
+The Thunderbird Community uses Matrix to communicate:
 
-We welcome contributions from everyone. Please see the [CONTRIBUTING](docs/CONTRIBUTING.md) guide for more information.
+- General chat about Thunderbird for Android and K-9 Mail: [#tb-android:mozilla.org](https://matrix.to/#/#tb-android:mozilla.org)
+- Development and other ways to contribute: [#tb-android-dev:mozilla.org](https://matrix.to/#/#tb-android-dev:mozilla.org)
+- Reach the broader Thunderbird Community in the [community space](https://matrix.to/#/#thunderbird-community:mozilla.org)
 
-### Forking
+## Contributing
 
-If you want to use a fork of this project please ensure that you replace the OAuth client setup in the `app-k9mail/src/{debug,release}/kotlin/app/k9mail/auth/K9OAuthConfigurationFactory.kt` and `app-thunderbird/src/{debug,daily,beta,release}/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt` with your own OAuth client setup and ensure that the `redirectUri` is different to the one used in the main project. This is to prevent conflicts with the main app when both are installed on the same device.
+We welcome contributions from everyone.
+
+- Development: Have you done a little bit of Kotlin? The [CONTRIBUTING](docs/CONTRIBUTING.md) guide will help you get started
+- Translations: Do you speak a language aside from English? [Translating is easy](https://hosted.weblate.org/projects/tb-android/) and just takes a few minutes for your first success.
+- We have [a number of other contribution opportunities](https://blog.thunderbird.net/2024/09/contribute-to-thunderbird-for-android/) available.
+- Thunderbird is supported solely by financial contributions from users like you.[Make a financial contribution today](https://www.thunderbird.net/donate/mobile/?form=tfa)!
 
 ### Architecture Decision Records (ADR)
 
 We use [Architecture Decision Records](https://adr.github.io/) to document the architectural decisions made in the
-development of K-9 Mail. You can find them in the [`docs/architecture/adr`](docs/architecture/adr) directory.
+development of Thunderbird for Android. You can find them in the [`docs/architecture/adr`](docs/architecture/adr) directory.
 
 For more information about our ADRs, please see the [ADRs README](docs/architecture/adr/README.md).
 
 We encourage team members and contributors to read through our ADRs to understand the architectural decisions that
 have shaped this project so far. Feel free to propose new ADRs or suggest modifications to existing ones as needed.
 
-## Communication
-
-Aside from discussing changes in [pull requests](https://github.com/thunderbird/thunderbird-android/pulls) and
-[issues](https://github.com/thunderbird/thunderbird-android/issues) we use the following communication services:
-
-- Matrix: [#tb-android:mozilla.org](https://matrix.to/#/#tb-android:mozilla.org)
-
 ## Security
 
 The code in this repository was undergoing an extensive security audit in collaboration with the Open Source Technology
 Improvement Fund ([OSTIF](https://ostif.org/)) and [7ASecurity](https://7asecurity.com/) in the first half of 2023. For
 more details, see
 our [blog post](https://blog.thunderbird.net/2023/07/k-9-mail-collaborates-with-ostif-and-7asecurity-security-audit/).
 
+You can report a security vulnerability [through the respective issues form](https://github.com/thunderbird/thunderbird-android/security/advisories/new).
+
+## K-9 Mail
+
+Thunderbird for Android is continuing the precious work the K-9 Dog Walkers have started. If you'd like to try K-9 Mail as well, you can find it at:
+
+- [K-9 Mail on Google Play](https://play.google.com/store/apps/details?id=com.fsck.k9&utm_source=thunderbird-android-github&utm_campaign=download-section)
+- [K-9 Mail on F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9)
+
+## Forking
+
+If you want to use a fork of this project please ensure that you replace the OAuth client setup in the `app-k9mail/src/{debug,release}/kotlin/app/k9mail/auth/K9OAuthConfigurationFactory.kt` and `app-thunderbird/src/{debug,daily,beta,release}/kotlin/net/thunderbird/android/auth/TbOAuthConfigurationFactory.kt` with your own OAuth client setup and ensure that the `redirectUri` is different to the one used in the main project. This is to prevent conflicts with the main app when both are installed on the same device.
+
 ## License
 
     Licensed under the Apache License, Version 2.0 (the "License");

app-k9mail/badging/release-badging.txt

@@ -13,7 +13,6 @@ uses-permission: name='android.permission.WAKE_LOCK'
 uses-permission: name='android.permission.FOREGROUND_SERVICE'
 uses-permission: name='android.permission.FOREGROUND_SERVICE_DATA_SYNC'
 uses-permission: name='android.permission.SCHEDULE_EXACT_ALARM'
-uses-permission: name='android.permission.CAMERA'
 uses-permission: name='android.permission.USE_BIOMETRIC'
 uses-permission: name='android.permission.USE_FINGERPRINT'
 uses-permission: name='com.fsck.k9.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
@@ -54,6 +53,7 @@ application-label-lv:'K-9 pasts'
 application-label-ml:'K-9 Mail'
 application-label-nb:'K-9 e-post'
 application-label-nl:'K-9 Mail'
+application-label-nn:'K-9 e-post'
 application-label-pl:'K-9 Mail'
 application-label-pt:'K-9 Mail'
 application-label-pt-BR:'K-9 Mail'
@@ -84,7 +84,6 @@ launchable-activity: name='com.fsck.k9.activity.MessageList'  label='' icon=''
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
 feature-group: label=''
-  uses-feature-not-required: name='android.hardware.camera'
   uses-feature-not-required: name='android.hardware.touchscreen'
 provides-component:'app-widget'
 main
@@ -93,6 +92,6 @@ other-receivers
 other-services
 supports-screens: 'small' 'normal' 'large' 'xlarge'
 supports-any-density: 'true'
-locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'co' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'ko' 'lt' 'lv' 'ml' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'vi' 'zh' 'zh-CN' 'zh-TW'
+locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'co' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'ko' 'lt' 'lv' 'ml' 'nb' 'nl' 'nn' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'vi' 'zh' 'zh-CN' 'zh-TW'
 densities: '120' '160' '240' '320' '480' '640' '65534'
 native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64'

app-k9mail/build.gradle.kts

@@ -30,6 +30,7 @@ dependencies {
     implementation(projects.feature.telemetry.noop)
     implementation(projects.feature.funding.noop)
     implementation(projects.feature.onboarding.migration.noop)
+    implementation(projects.feature.migration.launcher.noop)
 
     implementation(libs.androidx.work.runtime)
 
@@ -94,6 +95,7 @@ android {
                 "ml",
                 "nb",
                 "nl",
+                "nn",
                 "pl",
                 "pt_BR",
                 "pt_PT",