From 85449dff9993df05e14b318ed7b2365492036ebf Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Fri, 6 Dec 2024 18:50:44 +0000
Subject: [PATCH 01/17] update to my package

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8eb2bee2e..07134a36d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,7 +18,7 @@ android {
     compileSdk 35
 
     defaultConfig {
-        applicationId "com.httpsms"
+        applicationId "com.brightsoftwares.httpsmsswh33"
         minSdk 28
         targetSdk 35
         versionCode 1

From 69af1babce7dc629ba2cf1456bd76c7c6742d5fa Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Fri, 6 Dec 2024 18:55:35 +0000
Subject: [PATCH 02/17] adapt to my project

---
 android/gradlew  | 0
 web/.firebaserc  | 2 +-
 web/package.json | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 android/gradlew

diff --git a/android/gradlew b/android/gradlew
old mode 100644
new mode 100755
diff --git a/web/.firebaserc b/web/.firebaserc
index cad220fc5..e96b08382 100644
--- a/web/.firebaserc
+++ b/web/.firebaserc
@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "httpsms-86c51"
+    "default": "httpsms-swh33"
   }
 }
diff --git a/web/package.json b/web/package.json
index 9fb601e08..8d09919ec 100644
--- a/web/package.json
+++ b/web/package.json
@@ -14,7 +14,8 @@
     "lint": "yarn lint:js && yarn lint:style && yarn lint:prettier",
     "lintfix": "prettier --write --list-different . && yarn lint:js --fix && yarn lint:style --fix",
     "api:models": "npx swagger-typescript-api -p ..\\api\\docs\\swagger.json -o ./models -n api.ts --no-client",
-    "test": "jest"
+    "test": "jest",
+    "postbuild": "cp .env .output/server/.env"
   },
   "lint-staged": {
     "*.{js,ts,vue}": "eslint --cache",

From 2bd832a4add14feb7e28ed1c3710eabc4b139fa5 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sat, 7 Dec 2024 19:11:06 +0000
Subject: [PATCH 03/17] after successful deployment to GCP

---
 android/app/google-services.json.gpg | Bin 0 -> 429 bytes
 android/build_apk.sh                 |   1 +
 api/commands_for_deployment.txt      |  13 +++++++++++++
 firebase-credentials.json.gpg        | Bin 0 -> 1754 bytes
 google-services.json.gpg             | Bin 0 -> 431 bytes
 install_android_studio.sh            |  24 +++++++++++++++++++++++
 install_gui_env.sh                   |  28 +++++++++++++++++++++++++++
 start_ubuntu_desktop.sh              |  18 +++++++++++++++++
 web/commands_for_deployment.txt      |   3 +++
 9 files changed, 87 insertions(+)
 create mode 100644 android/app/google-services.json.gpg
 create mode 100644 android/build_apk.sh
 create mode 100644 api/commands_for_deployment.txt
 create mode 100644 firebase-credentials.json.gpg
 create mode 100644 google-services.json.gpg
 create mode 100644 install_android_studio.sh
 create mode 100644 install_gui_env.sh
 create mode 100644 start_ubuntu_desktop.sh
 create mode 100644 web/commands_for_deployment.txt

diff --git a/android/app/google-services.json.gpg b/android/app/google-services.json.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..fabb2986520c1bf4d9dbe104e551f086879bcae3
GIT binary patch
literal 429
zcmV;e0aE^q4Fm}T0(9qQ<{lL&vj5V++W}se;vU0{Yh@W+C?+bKiV#K*l8~56Lb>q4
zX&G2ois~UbhRoD$LY1gG8ucryNFbsv*b5mM6m*87_%k1dBxV=*dT1zWJ+&0|B?ee@
zZoQDHTIwn(vzdu{uKpq)=vio7`suCz2wC;+vI@Mt?0#Ud@LG{EjE6LkEQT+Z(MNzq
z35#0wG}$gw0gan47+w(~@pfIF<;ZUNlb%L4_TWP|d=D%2VR8IymQhq)1RuF8m(`IQ
z6-Taph`^NDs6V!xyBd2Z`|wyS9x|?=Iyj_B<6Zp$M{AL-^6f_2?W)1LM+J{^db6}t
z@z~0W;=DuWj7h(5!vdNWthFLm*;AW`x?IocHvid2ehs(b`2M<8szU>G^5brzG!}0W
zyhCThPj}=*NNiCqmVpJ=#<PDhinPeRM)@ZdF&7m?z_k5uu=q1BG*L!c?8G5B=Hl_S
z6GO3D4D7b@`dkGgdM|K#hFyW7js}}+;Y?3_1^^~ocrYLc3dbNUa%BkYa39&17H{7x
XN*C12WJQlEq?9nj&cZI){vY||89dC=

literal 0
HcmV?d00001

diff --git a/android/build_apk.sh b/android/build_apk.sh
new file mode 100644
index 000000000..f2ad9c547
--- /dev/null
+++ b/android/build_apk.sh
@@ -0,0 +1 @@
+gradlew assembleDebug
\ No newline at end of file
diff --git a/api/commands_for_deployment.txt b/api/commands_for_deployment.txt
new file mode 100644
index 000000000..80949ec88
--- /dev/null
+++ b/api/commands_for_deployment.txt
@@ -0,0 +1,13 @@
+35  cd api
+   36  cd ../api/
+   37  dir
+   38  ll
+   39  docker images
+   40  docker build -t httpsms-backend:v1 .
+   41  gcloud artifacts repositories
+   42  gcloud artifacts repositories list
+   43  docker images
+   44  docker tag httpsms-backend:v1 europe-west9-docker.pkg.dev/httpsms-swh33/httpsms-repo/httpsms-backend
+   45  history
+   46  docker push europe-west9-docker.pkg.dev/httpsms-swh33/httpsms-repo/httpsms-backend
+   47  history
\ No newline at end of file
diff --git a/firebase-credentials.json.gpg b/firebase-credentials.json.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..2edf235033474a8121fc25627f2b8381381c240e
GIT binary patch
literal 1754
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

literal 0
HcmV?d00001

diff --git a/google-services.json.gpg b/google-services.json.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..2842e842f947a0c68a733110b06ae169093fb885
GIT binary patch
literal 431
zcmV;g0Z{&o4Fm}T0vY|5K*#Z9rvK8w-2qkXn-=TFdZ4g66neEY-OdosET1QdUa~qY
zpuWX+Q*E)O+Hn$G{84cq0>*2s%98hzRwo4wZX{%ln%o4%BgRJk_2gf6z{JC(z*Ga8
zuJq(Xie^*=W!w1XBZ``jY}U1f78_zGY~Y|f^0x^TZ{!=8P1!|naP65Ex2LOlCTl}V
zs<v;fK8ppTsYr{s0q-BA#q+(VZYWupt}aRv*`nt!g~%9o(wRMXR;air9tX2!{tP-@
zQ-p+gt!=`5%|=LTLT9aOb&1QWs9GDyI1-<xe|;W((Z2!|3RY>0`B6FsH@b+!qTbAU
zri^a-Fqy(kihuymBdbio+B#trA|mP->vdS#ZRnGfz%``MQZp=AVjFT9nuY-vi4zzc
zW1cz5!PQ<R<^%C2UQ*S?<6<tpx<z=r$Z?fFYh8i&u0OLI&S2zX-gsKgS`B7+^tU5p
ziE9<(?YdsJP!%%$w6V_7EiE1?dV5(U`W?k&Z7w}Yg^~ZUvS;9Dj{p4$-uywi)xx>C
Z`$EMp(+8%;{rrTQ5qj9;{*D$@I8^<c)$ITP

literal 0
HcmV?d00001

diff --git a/install_android_studio.sh b/install_android_studio.sh
new file mode 100644
index 000000000..0be69dc45
--- /dev/null
+++ b/install_android_studio.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+# export DEBIAN_FRONTEND=noninteractive
+#androidstudio_download_url = "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.1.10/android-studio-2024.2.1.10-linux.tar.gz"
+
+
+echo "Checking current architecture = it should be amd64"
+sudo dpkg --print-architecture 
+
+echo "Checking foreign architecture = you shouldn't see anything"
+sudo dpkg --print-foreign-architectures 
+
+echo "Add the 32bit architecture"
+sudo dpkg --add-architecture i386
+
+echo "Checking foreign architecture - now you should see the i386 in the list"
+sudo dpkg --print-foreign-architectures 
+
+
+sudo apt-get update -y && sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2-1.0:i386 -y
+
+wget "https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.1.10/android-studio-2024.2.1.10-linux.tar.gz" # $androidstudio_download_url
+tar xvfz android-studio-2024.2.1.10-linux.tar.gz
+bash android-studio/bin/studio
\ No newline at end of file
diff --git a/install_gui_env.sh b/install_gui_env.sh
new file mode 100644
index 000000000..4344568e9
--- /dev/null
+++ b/install_gui_env.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+export DEBIAN_FRONTEND=noninteractive
+
+# Upgrade the distribution
+echo "Upgrading the operating system"
+sudo apt-get update -y && sudo apt-get dist-upgrade -y
+sudo DEBIAN_FRONTEND=noninteractive apt-get install xfce4 xfce4-goodies novnc python3-websockify python3-numpy tightvncserver htop nano neofetch -y
+
+echo "Creating the vnc startup file"
+
+echo "Configure the vnc server. Forward to /dev/null so that mv fail silently"
+if [ -f /home/codespace/.vnc/xstartup ]; then
+    echo "File xstartup found! Renaming"
+    mv /home/codespace/.vnc/xstartup /home/codespace/.vnc/xstartup.bak.install
+else
+    echo "File xstartup does not exist. No renaming"
+fi
+
+echo "Creating the vnc startup file"
+mkdir -p /home/codespace/.vnc/
+cat > /home/codespace/.vnc/xstartup << EOF
+#!/bin/bash
+xrdb $HOME/.Xresources
+startxfce4 &
+EOF
+
+sudo chmod +x /home/codespace/.vnc/xstartup
\ No newline at end of file
diff --git a/start_ubuntu_desktop.sh b/start_ubuntu_desktop.sh
new file mode 100644
index 000000000..93b12a5fb
--- /dev/null
+++ b/start_ubuntu_desktop.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -e
+export DEBIAN_FRONTEND=noninteractive
+
+echo "Running post create commands"
+
+echo "Generating the ssl certificate"
+openssl req -x509 -nodes -newkey rsa:3072 -keyout novnc.pem -out novnc.pem -days 3650 -subj "/C=US/ST=New Sweden/L=Stockholm/O=.../OU=.../CN=.../emailAddress=..."
+echo "Done"
+
+echo "Web socketifying"
+websockify -D --web=/usr/share/novnc/ --cert=/home/ubuntu/novnc.pem 6080 localhost:5901
+echo "Done"
+
+echo "Starting vncserver"
+export USER=codespace
+vncserver
+echo "Done"
\ No newline at end of file
diff --git a/web/commands_for_deployment.txt b/web/commands_for_deployment.txt
new file mode 100644
index 000000000..dee29cb09
--- /dev/null
+++ b/web/commands_for_deployment.txt
@@ -0,0 +1,3 @@
+  32  pnpm install
+   33  pnpm run generate
+   34  firebase deploy
\ No newline at end of file

From a141629625f8ce22ad52575c94543cb1ea3df644 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 16:40:11 +0000
Subject: [PATCH 04/17] adding workflow to build the app

---
 .github/workflows/android_apk.yml | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/android_apk.yml

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
new file mode 100644
index 000000000..300032492
--- /dev/null
+++ b/.github/workflows/android_apk.yml
@@ -0,0 +1,41 @@
+name: Build and deploy android apk
+
+on: 
+  push:
+    branches:
+        - main
+  workflow_dispatch:
+
+jobs:
+  build_and_deploy:
+    #needs: build-test
+    name: Build and deploy
+    runs-on: ubuntu-latest
+    #runs-on: self-hosted
+
+    #env:
+    #  TARGET_HOSTS: docker_hosts_newgen
+
+    steps:
+      - name: "Checkout the code"
+        uses: actions/checkout@v2
+
+      - name: Decrypt the files
+        run: |
+          echo "Decrypting the inventory file"
+          ls -lah android/app/
+          gpg --quiet --batch --yes --decrypt --passphrase=${{ secrets.PGP_PASSPHRASE }} --output android/app android/app/google-services.json.gpg
+          echo "Decrypted"
+          ls -lah android/app/
+
+      - name: Build the app
+        #if: ${{ false }} # A trick to skip this step and go tot he next one 
+        run: |
+          echo "Move into the android directory"
+          cd android 
+          echo "Building android application"
+          gradlew assembleDebug
+          echo "Building done"
+
+
+

From fe3212a6b00945bbb80548d4ab38165fd045b2cd Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 16:45:00 +0000
Subject: [PATCH 05/17] disable auto build on main for deploy

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69d3aff09..a6fef741a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 defaults:
   run:

From 023f13ca5cab6b2a13c2656d9764f9a2f53d9ed4 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 16:47:18 +0000
Subject: [PATCH 06/17] fix decryption

---
 .github/workflows/android_apk.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 300032492..04b34b09b 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -24,7 +24,7 @@ jobs:
         run: |
           echo "Decrypting the inventory file"
           ls -lah android/app/
-          gpg --quiet --batch --yes --decrypt --passphrase=${{ secrets.PGP_PASSPHRASE }} --output android/app android/app/google-services.json.gpg
+          gpg --quiet --batch --yes --decrypt --passphrase=${{ secrets.PGP_PASSPHRASE }} --output android/app/google-services.json android/app/google-services.json.gpg
           echo "Decrypted"
           ls -lah android/app/
 

From bc274c173c82c3f20abc7229e903ae6cd3ebdb05 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 16:48:06 +0000
Subject: [PATCH 07/17] disable ci

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6fef741a..0f70d23e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
 name: ci
 
 on:
-  push:
-    branches:
-      - main
+  #push:
+  #  branches:
+  #    - main
   workflow_dispatch:
 
 defaults:

From e3452b8e043a31e7e6cf919af5725a8f9289014b Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:49:04 +0100
Subject: [PATCH 08/17] fix app building

---
 .github/workflows/android_apk.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 04b34b09b..fe4008b3b 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -34,7 +34,7 @@ jobs:
           echo "Move into the android directory"
           cd android 
           echo "Building android application"
-          gradlew assembleDebug
+          ./gradlew assembleDebug
           echo "Building done"
 
 

From 3c7215e2ca2276b1aeea6208ab14af1e2c0e78c3 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:55:54 +0100
Subject: [PATCH 09/17] Add java

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

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index fe4008b3b..305fb3a5c 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -28,6 +28,11 @@ jobs:
           echo "Decrypted"
           ls -lah android/app/
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '21'
+
       - name: Build the app
         #if: ${{ false }} # A trick to skip this step and go tot he next one 
         run: |

From 47900926013f49e42e0e32a23de7d12ecdc44744 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:01:53 +0000
Subject: [PATCH 10/17] add release

---
 .github/workflows/android_apk.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 305fb3a5c..a8fd8b7ac 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -42,5 +42,19 @@ jobs:
           ./gradlew assembleDebug
           echo "Building done"
 
+      - name: Create Release
+        id: create_release
+        uses: comnoco/create-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Changes in this Release
+            - First Change
+            - Second Change
+          draft: false
+          prerelease: false
 
 

From 432d6846b76e4562b04bb396ac5065521cc94dbb Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:05:10 +0000
Subject: [PATCH 11/17] fix release

---
 .github/workflows/android_apk.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index a8fd8b7ac..3e76b22ca 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: comnoco/create-release@v2
+        uses: comnoco/create-release-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         with:

From 3f9426b662caf39cca994540ed14bd89347641af Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:18:35 +0000
Subject: [PATCH 12/17] add another release step

---
 .github/workflows/android_apk.yml | 45 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 3e76b22ca..d943e3ce3 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -2,10 +2,15 @@ name: Build and deploy android apk
 
 on: 
   push:
-    branches:
-        - main
+    #branches:
+    #  - main
+    tags:
+      - "v*"
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   build_and_deploy:
     #needs: build-test
@@ -42,19 +47,29 @@ jobs:
           ./gradlew assembleDebug
           echo "Building done"
 
-      - name: Create Release
-        id: create_release
-        uses: comnoco/create-release-action@v2
+      #- name: Create Release
+      #  id: create_release
+      #  uses: comnoco/create-release-action@v2
+      #  env:
+      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      #  with:
+      #    tag_name: ${{ github.ref }}
+      #    release_name: Release ${{ github.ref }}
+      #    body: |
+      #      Changes in this Release
+      #      - First Change
+      #      - Second Change
+      #    draft: false
+      #    prerelease: false
+
+      - name: Create release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: |
-            Changes in this Release
-            - First Change
-            - Second Change
-          draft: false
-          prerelease: false
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          gh release create "$tag" \
+              --repo="$GITHUB_REPOSITORY" \
+              --title="${tag#v}" \
+              --generate-notes
 
 

From 22daa43152a0aa74ce56a25b91acbb9a624e8f35 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:36:09 +0000
Subject: [PATCH 13/17] check that apkis well generated

---
 .github/workflows/android_apk.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index d943e3ce3..ee6843486 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -62,6 +62,12 @@ jobs:
       #    draft: false
       #    prerelease: false
 
+      - name: Check that the apk is there
+        run: |
+          echo "Checking the apk"
+          ls -lR android/app/build/
+
+
       - name: Create release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -70,6 +76,7 @@ jobs:
           gh release create "$tag" \
               --repo="$GITHUB_REPOSITORY" \
               --title="${tag#v}" \
-              --generate-notes
+              --generate-notes \
+              android/app/build/outputs/apk/
 
 

From 8b05268c301f26621c41bcf15f13ceafb8015114 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:48:19 +0000
Subject: [PATCH 14/17] some debug

---
 .github/workflows/android_apk.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index ee6843486..37f7b4d14 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Check that the apk is there
         run: |
           echo "Checking the apk"
-          ls -lR android/app/build/
+          ls -lR android/app/build/outputs/
 
 
       - name: Create release

From 7ba1e5d470ebb2e9b7c9b89ec7ff713992805985 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 17:55:02 +0000
Subject: [PATCH 15/17] add target apk

---
 .github/workflows/android_apk.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 37f7b4d14..8bbbbb110 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -2,8 +2,8 @@ name: Build and deploy android apk
 
 on: 
   push:
-    #branches:
-    #  - main
+    branches:
+      - main
     tags:
       - "v*"
   workflow_dispatch:
@@ -67,6 +67,8 @@ jobs:
           echo "Checking the apk"
           ls -lR android/app/build/outputs/
 
+          [ -f "android/app/build/outputs/apk/debug/app-debug.apk" ] && cp "android/app/build/outputs/apk/debug/app-debug.apk" "android/app/build/outputs/apk/debug/http-sms-$tag.apk"
+
 
       - name: Create release
         env:
@@ -77,6 +79,6 @@ jobs:
               --repo="$GITHUB_REPOSITORY" \
               --title="${tag#v}" \
               --generate-notes \
-              android/app/build/outputs/apk/
+              "android/app/build/outputs/apk/debug/http-sms-$tag.apk"
 
 

From 366a17721291bc22214405871021c1c7d54e1326 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 18:01:25 +0000
Subject: [PATCH 16/17] add target apk

---
 .github/workflows/android_apk.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index 8bbbbb110..e0c795777 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -2,8 +2,8 @@ name: Build and deploy android apk
 
 on: 
   push:
-    branches:
-      - main
+    #branches:
+    #  - main
     tags:
       - "v*"
   workflow_dispatch:
@@ -65,9 +65,9 @@ jobs:
       - name: Check that the apk is there
         run: |
           echo "Checking the apk"
+          [ -f "android/app/build/outputs/apk/debug/app-debug.apk" ] && cp "android/app/build/outputs/apk/debug/app-debug.apk" "android/app/build/outputs/apk/debug/http-sms-$tag.apk"
           ls -lR android/app/build/outputs/
 
-          [ -f "android/app/build/outputs/apk/debug/app-debug.apk" ] && cp "android/app/build/outputs/apk/debug/app-debug.apk" "android/app/build/outputs/apk/debug/http-sms-$tag.apk"
 
 
       - name: Create release

From 873a339257bb8c69f14e2d4bdb9ff6c92ef4ef06 Mon Sep 17 00:00:00 2001
From: fullbright <full3right@gmail.com>
Date: Sun, 8 Dec 2024 18:05:43 +0000
Subject: [PATCH 17/17] add target apk

---
 .github/workflows/android_apk.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android_apk.yml b/.github/workflows/android_apk.yml
index e0c795777..fad17155d 100644
--- a/.github/workflows/android_apk.yml
+++ b/.github/workflows/android_apk.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Check that the apk is there
         run: |
           echo "Checking the apk"
-          [ -f "android/app/build/outputs/apk/debug/app-debug.apk" ] && cp "android/app/build/outputs/apk/debug/app-debug.apk" "android/app/build/outputs/apk/debug/http-sms-$tag.apk"
+          [ -f "android/app/build/outputs/apk/debug/app-debug.apk" ] && cp "android/app/build/outputs/apk/debug/app-debug.apk" "android/app/build/outputs/apk/debug/http-sms-${{ github.ref_name }}.apk"
           ls -lR android/app/build/outputs/