Resolve merge conflicts with upstream main

Adapt UnifiedPush code to upstream refactoring: AppVersion, MessagingToken
types, updated lint baselines and lockfiles.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: aaronstealth

.editorconfig

@@ -4,6 +4,14 @@ root = true
 charset = utf-8
 indent_size = 4
 indent_style = space
+insert_final_newline = true
+end_of_line = lf
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_size = 2
+ij_yaml_spaces_within_braces = false
+ij_yaml_spaces_within_brackets = false
 
 [*.{kt,kts}]
 ktlint_code_style = android_studio
@@ -12,9 +20,11 @@ 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
+# Disable converting functions to expression bodies
+ktlint_standard_function-expression-body = disabled
+max_line_length = 120
+
+[**/test/**.kt]
 max_line_length = off

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Enforce trailing comma
+93871a5e078ffaf6d7809e298592703f89e78530
+
+# Update dependency org.jlleitschuh.gradle.ktlint to v13 (max line length 120)
+a2eb66ee40bf1d8e4b0624502d1e2668bd7cc447
+
+# Replace android.util.Log with timber.log.Timber
+5c6c6e149fea2c2e406d4d7a53434ff932c40c56

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,20 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Incorrect or missing information in the app documentation
+  - name: Issue or suggestion for 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
+    about: Please report any errors, missing information, or suggestions for the companion app documentation here.
+  - name: Issue or suggestion for the developer documentation
+    url: https://github.com/home-assistant/developers.home-assistant/issues
+    about: Please report any errors, missing information, or suggestions for the developer documentation here.
+  - name: Request a feature for the Android application
+    url: https://github.com/orgs/home-assistant/discussions/new?category=android
+    about: Request a new feature for the Android application.
+  - name: Problem with your dashboard
+    url: https://github.com/home-assistant/frontend/issues
+    about: Most of the app's interface is provided by the Home Assistant frontend (WebView). Please report dashboard issues here.
+  - name: I have a question or need support
+    url: https://www.home-assistant.io/help
+    about: GitHub is for tracking bugs and feature requests. For help and support, please visit our help page.
+  - name: I'm not sure 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!
+    about: If you're unsure where to report your issue or ask your question, join our chat and we'll help

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,53 @@
+name: Task
+description: For staff only - Create a task
+type: Task
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## ⚠️ RESTRICTED ACCESS
+
+        **This form is restricted to Open Home Foundation staff and authorized contributors only.**
+
+        If you are a community member wanting to contribute, please:
+        - For bug reports: Use the [bug report form](https://github.com/home-assistant/android/issues/new?template=Bug_report.md)
+        - For feature requests: Submit to [Feature Requests](https://github.com/orgs/home-assistant/discussions)
+
+        ---
+
+        ### For authorized contributors
+
+        Use this form to create tasks for development work, improvements, or other actionable items that need to be tracked.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Provide a clear and detailed description of the task that needs to be accomplished.
+
+        Be specific about what needs to be done, why it's important, and any constraints or requirements.
+      placeholder: |
+        Describe the task, including:
+        - What needs to be done
+        - Why this task is needed
+        - Expected outcome
+        - Any constraints or requirements
+    validations:
+      required: true
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional context
+      description: |
+        Any additional information, links, research, or context that would be helpful.
+
+        Include links to related issues, research, prototypes, roadmap opportunities etc.
+      placeholder: |
+        - Roadmap opportunity: [link]
+        - Epic: [link]
+        - Feature request: [link]
+        - Technical design documents: [link]
+        - Prototype/mockup: [link]
+        - Dependencies: [links]
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/task.yml

@@ -11,7 +11,7 @@ runs:
   using: "composite"
   steps:
     - name: Get Previous Release Tag
-      uses: actions/github-script@v7
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
       id: latest-release-tag
       with:
         github-token: ${{ inputs.gh-token }}
@@ -23,33 +23,38 @@ runs:
           })
           return data.tag_name
     - name: Get Generated Release Notes
-      uses: actions/github-script@v7
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
       id: generate-notes
+      env:
+        TAG_NAME: ${{ inputs.tag-name }}
+        PREVIOUS_TAG: ${{ steps.latest-release-tag.outputs.result }}
       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 }}',
+            tag_name: process.env.TAG_NAME,
             target_commitish: 'main',
-            previous_tag_name: '${{ steps.latest-release-tag.outputs.result }}',
+            previous_tag_name: process.env.PREVIOUS_TAG,
           })
           return data.body.replaceAll('`', '\'').replaceAll('"', '\'')
     - name: Generate Release Notes
       id: version-generator
       shell: bash
+      env:
+        PREVIOUS_TAG: ${{ steps.latest-release-tag.outputs.result }}
+        CHANGELOG: ${{ steps.generate-notes.outputs.result }}
       run: |
         mkdir -p ./app/build/outputs/
 
         echo "Previous Release Tag:"
-        echo "${{ steps.latest-release-tag.outputs.result }}"
+        echo "$PREVIOUS_TAG"
 
         echo "Full Changelog:"
-        CHANGELOG="${{ steps.generate-notes.outputs.result }}"
         echo -e "$CHANGELOG"
-        printf "$CHANGELOG" > ./app/build/outputs/changelogGithub
+        printf "%s" "$CHANGELOG" > ./app/build/outputs/changelogGithub
 
         echo "Beta Changelog:"
         git log --format="* %s" HEAD^..HEAD

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

@@ -13,10 +13,13 @@ runs:
     - name: Get Translations
       id: translations
       shell: bash
+      env:
+        LOKALISE_PROJECT: ${{ inputs.lokalise-project }}
+        LOKALISE_TOKEN: ${{ inputs.lokalise-token }}
       run: |
         ZIP=`\
-          curl --location --request POST "https://api.lokalise.com/api2/projects/${{inputs.lokalise-project}}/files/download" \
-            --header "X-Api-Token: ${{inputs.lokalise-token}}" \
+          curl --location --request POST "https://api.lokalise.com/api2/projects/${LOKALISE_PROJECT}/files/download" \
+            --header "X-Api-Token: ${LOKALISE_TOKEN}" \
             --header 'Content-Type: application/json' \
             --data-raw '{
                 "format": "xml",
@@ -31,7 +34,7 @@ runs:
 
         echo "Download Ready: $ZIP"
 
-        curl $ZIP --output strings.zip
+        curl "$ZIP" --output strings.zip
 
         echo "Download Complete, unzipping"
         unzip -n strings.zip

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

@@ -24,13 +24,13 @@ runs:
         cp .github/mock-google-services.json automotive/google-services.json
 
     - name: Set up JDK 21
-      uses: actions/setup-java@v4.7.1
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         distribution: "temurin"
         java-version: "21"
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
       with:
         cache-disabled: ${{ inputs.cache-disabled == 'true'}}
         cache-encryption-key: ${{ inputs.cache-encryption-key}}

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

@@ -14,14 +14,14 @@ runs:
 
     - name: Upload SARIF results
       if: ${{ !cancelled() && hashFiles('merged_results.sarif') != '' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
       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
+      uses: github/codeql-action/upload-sarif@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
       with:
         sarif_file: "./merged_results.sarif"
         category: ${{ inputs.category }}

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

@@ -0,0 +1,25 @@
+name: "Upload test results"
+description: "Upload test result (always) and test reports (on failure) as artifacts."
+inputs:
+  test-name:
+    description: "Name of the test used as prefix for the artifact names."
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Upload test results
+      if: always()
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: ${{ inputs.test-name }} results
+        path: |
+          **/build/test-results/**/TEST-*.xml
+          **/build/outputs/*/connected/*
+
+    - name: Upload test reports
+      if: failure()
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: ${{ inputs.test-name }} reports
+        path: |
+          **/build/reports/**