From dd8b1c81ea6f36602edbf47085c62c1ff7452c41 Mon Sep 17 00:00:00 2001
From: timklge <2026103+timklge@users.noreply.github.com>
Date: Fri, 2 May 2025 00:03:35 +0200
Subject: [PATCH 1/3] Update installation instructions

---
 README.md | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 099bde7..c7b8ab6 100644
--- a/README.md
+++ b/README.md
@@ -31,16 +31,7 @@ to your current power output / heart rate zone as setup in your Karoo settings.
 
 ## Installation
 
-If you are using a Karoo 3, you can use [Hammerhead's sideloading procedure](https://support.hammerhead.io/hc/en-us/articles/31576497036827-Companion-App-Sideloading) to install the app:
-
-1. Using the browser on your phone, long-press [this download link](https://github.com/timklge/karoo-powerbar/releases/latest/download/app-release.apk) and share it with the Hammerhead Companion app.
-2. Your karoo should show an info screen about the app now. Press "Install".
-
-If you are using a Karoo 2, you can use manual sideloading:
-
-1. Download the apk from the [releases page](https://github.com/timklge/karoo-powerbar/releases) (or build it from source)
-2. Set up your Karoo for sideloading. DC Rainmaker has a great [step-by-step guide](https://www.dcrainmaker.com/2021/02/how-to-sideload-android-apps-on-your-hammerhead-karoo-1-karoo-2.html).
-3. Install the app by running `adb install app-release.apk`.
+This extension is available as part of the extension library on your Karoo device. More information is available in the [Hammerhead FAQ](https://support.hammerhead.io/hc/en-us/articles/34676015530907-Karoo-OS-Extensions-Library).
 
 ## Credits
 

From dbfe5352d45544afdb28a5e49bfeeb99125ab147 Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Wed, 28 May 2025 15:04:47 +0200
Subject: [PATCH 2/3] Add android sdk setup step

---
 .github/workflows/android.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e5beb98..87397d0 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -36,6 +36,9 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
@@ -57,4 +60,4 @@ jobs:
         generateReleaseNotes: true
         artifacts: app/build/outputs/apk/release/app-release.apk, app/manifest.json, app/karoo-powerbar.png, powerbar_min.gif, powerbar0.png, powerbar2.png
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 63bda81fbefa1d93603da9ac4d9c6043a7a7c60f Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Wed, 28 May 2025 15:12:46 +0200
Subject: [PATCH 3/3] Use provided github user if not set

---
 .github/workflows/android.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 87397d0..64a6073 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -20,8 +20,8 @@ jobs:
 
     - name: Set up environment variables
       run: |
-        echo "GPR_USER=${{ github.actor }}" >> $GITHUB_ENV
-        echo "GPR_KEY=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
+        echo "GPR_USER=${{ secrets.GHUB_USER || github.actor }}" >> $GITHUB_ENV
+        echo "GPR_KEY=${{ secrets.GHUB_TOKEN || secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
         echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> $GITHUB_ENV
         echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> $GITHUB_ENV
         echo "KEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> $GITHUB_ENV