[pull] master from home-assistant:master

.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+
+[*.{kt,kts}]
+ktlint_code_style = android_studio
+# Disable wildcard imports
+ij_kotlin_name_count_to_use_star_import = 9999
+ij_kotlin_name_count_to_use_star_import_for_members = 9999
+# ktlint overrides
+ktlint_function_naming_ignore_when_annotated_with=Composable
+# Allow trailing commas but do not enforce it
+ktlint_standard_trailing-comma-on-call-site = disabled
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+ij_kotlin_allow_trailing_comma = true
+max_line_length = off

.gitattributes

@@ -0,0 +1,37 @@
+# Set default behavior to automatically normalize line endings
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted to native line endings on checkout.
+*.kt text
+*.kts text
+*.xml text
+*.gradle text
+*.md text
+*.json text
+*.yml text
+*.yaml text
+*.toml text
+*.properties text
+*.pro text
+*.txt text
+*.bash text eol=lf
+*.css text diff=css
+*.sh text eol=lf
+
+# Declare binary files to be preserved as-is
+*.png binary
+*.jpg binary
+*.jar binary
+
+# Custom merge driver for Gradle lock files
+gradle.lockfile merge=union
+
+# Ensure shell scripts have UNIX line endings
+*.sh text eol=lf
+
+# Ensure Windows batch files have CRLF line endings
+*.bat text eol=crlf
+
+# Handle Android Studio specific files
+*.iml text
+*.idea/** text

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -15,24 +15,30 @@ assignees: ''
   DO NOT DELETE ANY TEXT from this template! All requested information is important.
 -->
 
-**Home Assistant Android version:**
+<!-- If you are reporting an issue for Wear OS please list both devices for the below 3 fields -->
+**Home Assistant Android app version(s):**
 
-**Android version:**
+**Android version(s):**
 
-**Phone model:**
+**Device model(s):**
 
 **Home Assistant version:**
 
 **Last working Home Assistant release (if known):**
 
-**Description of problem:**
+**Description of problem, include YAML if issue is related to notifications:**
 
-**Traceback (if applicable, to get the logs you may refer to: https://companion.home-assistant.io/docs/troubleshooting/faqs/#android-crash-logs):**
+<!--
+- For Wear OS devices we will need the LogCat logs from the device.
+- For Android Auto the logs can be retrieved from the connected device.
+- Logs from the device can be taken from Settings > Companion App Troubleshooting > Show and Share Logs
+-->
+**Companion App Logs:**
 
 ```
 
 ```
 
-**Screenshot of problem:**
+**Screenshot or video of problem:**
 
 **Additional information:**

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Incorrect or missing information in the app documentation
+    url: https://github.com/home-assistant/companion.home-assistant/issues
+    about: Our documentation has its own issue tracker. Please report issues with the companion docs there.
+  - name: I'm unsure where to go
+    url: https://www.home-assistant.io/join-chat
+    about: If you are unsure where to go, then joining our chat is recommended; Just ask!

.github/actions/create-release-notes/action.yml

@@ -1,26 +1,56 @@
-name: 'Create Release Notes'
-description: 'Creates the current releases release notes'
+name: "Create Release Notes"
+description: "Creates the current releases release notes"
+inputs:
+  tag-name:
+    description: "Name of the tag that will be used for this release"
+    required: true
+  gh-token:
+    description: "The GitHub token used to get details from the API"
+    required: true
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
+    - name: Get Previous Release Tag
+      uses: actions/github-script@v7
+      id: latest-release-tag
+      with:
+        github-token: ${{ inputs.gh-token }}
+        result-encoding: string
+        script: |
+          const { data } = await github.rest.repos.getLatestRelease({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          })
+          return data.tag_name
+    - name: Get Generated Release Notes
+      uses: actions/github-script@v7
+      id: generate-notes
+      with:
+        github-token: ${{ inputs.gh-token }}
+        result-encoding: string
+        script: |
+          const { data } = await github.rest.repos.generateReleaseNotes({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            tag_name: '${{ inputs.tag-name }}',
+            target_commitish: 'master',
+            previous_tag_name: '${{ steps.latest-release-tag.outputs.result }}',
+          })
+          return data.body.replaceAll('`', '\'').replaceAll('"', '\'')
     - name: Generate Release Notes
       id: version-generator
       shell: bash
       run: |
         mkdir -p ./app/build/outputs/
-
-        echo "Previous Release Commit:"
-        git tag -l --sort=-creatordate | grep -v beta- | head -n 1
-        previous=`git tag -l --sort=-creatordate | grep -v beta- | head -n 1`
-
-        echo "# Changes:" > ./app/build/outputs/changelogGithub
-        echo "Changlog:"
-        git log --format="* %s" ${previous}..HEAD
-        git log --format="* %s" ${previous}..HEAD >> ./app/build/outputs/changelogGithub
 
-        echo "Beta Changelog"
+        echo "Previous Release Tag:"
+        echo "${{ steps.latest-release-tag.outputs.result }}"
+
+        echo "Full Changelog:"
+        CHANGELOG="${{ steps.generate-notes.outputs.result }}"
+        echo -e "$CHANGELOG"
+        printf "$CHANGELOG" > ./app/build/outputs/changelogGithub
+
+        echo "Beta Changelog:"
         git log --format="* %s" HEAD^..HEAD
         git log --format="* %s" HEAD^..HEAD > ./app/build/outputs/changelogBeta
-
-        mkdir -p app/src/main/play/release-notes/en-US/
-        echo "Full release change log: https://github.com/home-assistant/android/releases/latest" > app/src/main/play/release-notes/en-US/default.txt

.github/actions/create-release-number/action.yml

@@ -1,36 +1,27 @@
-name: 'Create Release Numbers'
-description: 'Creates the current release number based on checked out code'
-inputs:
-  beta:
-    description: 'If this is a beta build'
-    required: true
-    default: false
+name: "Create Release Numbers"
+description: "Creates the current release number based on checked out code"
 outputs:
-  version:
-    description: 'The current app version'
-    value: ${{ steps.version-generator.outputs.version }}
   version-code:
-    description: 'The numeric app version'
+    description: "The numeric app version"
     value: ${{ steps.version-generator.outputs.version-code }}
+  version:
+    description: "The app version"
+    value: ${{ steps.version-generator.outputs.version }}
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: Set Build Number
       id: version-generator
       shell: bash
       run: |
+        ./gradlew versionFile
         COMMITS=`git rev-list --count HEAD`
         TAGS=`git tag | grep -v beta | wc -l`
-        VC=$(((COMMITS+TAGS) << 1))
-        HASH=`git rev-parse --short HEAD`
-        if [ "${{inputs.beta}}" = "true" ]; then
-           VERSION=beta-$VC-$HASH
-        else
-           VERSION=`git describe --tags`
-        fi
+        VC=$((((COMMITS+TAGS) * 3) << 1))
         echo Number Commits $COMMITS
         echo Number Tags $TAGS
-        echo Version $VERSION
         echo Version Code $VC
-        echo ::set-output name=version::$VERSION
-        echo ::set-output name=version-code::$VC
+        echo "version-code=$VC" >> $GITHUB_OUTPUT
+        VERSION=`cat version.txt`
+        echo Version $VERSION
+        echo "version=$VERSION" >> $GITHUB_OUTPUT

.github/actions/download-translations/action.yml

@@ -1,14 +1,14 @@
-name: 'Download Translations'
-description: 'Reaches out to Lokalise to download the latest translations.'
+name: "Download Translations"
+description: "Reaches out to Lokalise to download the latest translations."
 inputs:
   lokalise-project:
-    description: 'The project id in lokalise'
+    description: "The project id in lokalise"
     required: true
   lokalise-token:
-    description: 'An API token that has read access to the desired project'
+    description: "An API token that has read access to the desired project"
     required: true
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: Get Translations
       id: translations
@@ -35,4 +35,19 @@ runs:
 
         echo "Download Complete, unzipping"
         unzip -n strings.zip
+        echo "Unzipped strings, generating locales_config.xml"
+
+        XML_START='<?xml version="1.0" encoding="utf-8"?>\n<locale-config xmlns:android="http://schemas.android.com/apk/res/android">\n'
+        XML_LOCALES=''
+        XML_END='</locale-config>'
+        for i in common/src/main/res/values*/strings.xml; do
+          FOLDER="$(basename $(dirname $i))"
+          CODE="${FOLDER#*-}" # remove "values-"
+          CODE="${CODE/-r/-}" # replace region "-rXX" with "-XX"
+          if [ "$CODE" == "values" ]; then CODE="en"; fi
+          XML_LOCALES="$XML_LOCALES    <locale android:name=\"$CODE\"/>\n"
+        done
+        printf "$XML_START$XML_LOCALES$XML_END" > app/src/main/res/xml/locales_config.xml
+        printf "$XML_START$XML_LOCALES$XML_END" > wear/src/main/res/xml/locales_config.xml
+
         echo "Complete"

.github/actions/inflate-secrets/action.yml

@@ -1,20 +1,20 @@
-name: 'Inflate Secrets'
-description: 'Inflates the secret values into the appropriate files'
+name: "Inflate Secrets"
+description: "Inflates the secret values into the appropriate files"
 inputs:
   keystore:
-    description: 'The keystore to inflate'
+    description: "The keystore to inflate"
     required: true
   google-services:
-    description: 'The google-services.json to inflate'
+    description: "The google-services.json to inflate"
     required: true
   firebase-creds:
-    description: 'The firebase credentials to inflate'
+    description: "The firebase credentials to inflate"
     required: true
   playstore-creds:
-    description: 'The playstore credentials to inflate'
+    description: "The playstore credentials to inflate"
     required: true
 runs:
-  using: 'composite'
+  using: "composite"
   steps:
     - name: Mock debug google-services.json
       shell: bash
@@ -26,9 +26,10 @@ runs:
       shell: bash
       env:
         KEYSTORE: ${{ inputs.keystore }}
-      run: | 
+      run: |
         echo $KEYSTORE | base64 --decode > app/release_keystore.keystore
         echo $KEYSTORE | base64 --decode > wear/release_keystore.keystore
+        echo $KEYSTORE | base64 --decode > automotive/release_keystore.keystore
 
     - name: Inflate google-services.json
       shell: bash
@@ -37,6 +38,7 @@ runs:
       run: |
         echo $GOOGLE_SERVICES > app/google-services.json
         echo $GOOGLE_SERVICES > wear/google-services.json
+        echo $GOOGLE_SERVICES > automotive/google-services.json
 
     - name: Inflate firebaseAppDistributionServiceCredentialsFile.json
       shell: bash
@@ -52,3 +54,4 @@ runs:
       run: |
         echo $CREDS > app/playStorePublishServiceCredentialsFile.json
         echo $CREDS > wear/playStorePublishServiceCredentialsFile.json
+        echo $CREDS > automotive/playStorePublishServiceCredentialsFile.json

.github/actions/setup-build-env/action.yml

@@ -0,0 +1,32 @@
+name: "Setup build environment"
+description: "Setup the runner with all the tools we need to build our project."
+inputs:
+  mock-google-services:
+    description: "Mock the google-services.json file inside the gradle modules."
+    default: "false"
+    required: false
+  cache-disabled:
+    description: When 'true', all caching is disabled. No entries will be written to or read from the cache.
+    required: false
+    default: "false"
+runs:
+  using: "composite"
+  steps:
+    - name: Mock google-services.json
+      shell: bash
+      if: ${{ inputs.mock-google-services == 'true' }}
+      run: |
+        cp .github/mock-google-services.json app/google-services.json
+        cp .github/mock-google-services.json wear/google-services.json
+        cp .github/mock-google-services.json automotive/google-services.json
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4.7.0
+      with:
+        distribution: "temurin"
+        java-version: "21"
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+      with:
+        cache-disabled: ${{ inputs.cache-disabled == 'true'}}

.github/actions/upload-sarif-results/action.yml

@@ -0,0 +1,27 @@
+name: "Upload SARIF results"
+description: "Merge and adjust the SARIF files to be compatible with GitHub Security Code Scanning and upload it to the GitHub Security tab."
+inputs:
+  category:
+    description: "Category used to group the SARIF results."
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Merge ${{ inputs.category }} report into one
+      shell: bash
+      if: ${{ !cancelled() && hashFiles('**/*.sarif') != '' }}
+      run: python3 ./.github/scripts/merge_sarif.py
+
+    - name: Upload SARIF results
+      if: ${{ !cancelled() && hashFiles('merged_results.sarif') != '' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.category }}_sarif_results
+        path: merged_results.sarif
+
+    - name: Upload ${{ inputs.category }} reports (SARIF)
+      if: ${{ !cancelled() && hashFiles('merged_results.sarif') != '' }}
+      uses: github/codeql-action/upload-sarif@v3
+      with:
+        sarif_file: "./merged_results.sarif"
+        category: ${{ inputs.category }}