From 84e2b4ad3bedc50f03cf854fb5c899bfbe02923e Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 21:13:16 +0530
Subject: [PATCH 01/22] New App: com.pavit.docker

---
 metadata/com.pavit.docker.yml | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 metadata/com.pavit.docker.yml

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
new file mode 100644
index 00000000000..45b1978ef8e
--- /dev/null
+++ b/metadata/com.pavit.docker.yml
@@ -0,0 +1,44 @@
+Categories:
+  - System
+License: GPL-3.0-or-later
+AuthorName: Pavit Chhabra
+AuthorWebSite: https://github.com/theSoberSobber
+WebSite: https://github.com/theSoberSobber/Docker-Manager
+SourceCode: https://github.com/theSoberSobber/Docker-Manager
+IssueTracker: https://github.com/theSoberSobber/Docker-Manager/issues
+
+AutoName: Docker Manager
+Name: Docker Manager
+Summary: Comprehensive Docker container management application
+
+Description: |
+    Docker Manager is a comprehensive Docker container management application built with Flutter.
+    It allows you to easily manage Docker containers, images, and volumes through an intuitive
+    mobile interface.
+
+    Features:
+    * Connect to remote Docker hosts via SSH
+    * View and manage Docker containers
+    * Start, stop, restart, and remove containers
+    * Inspect container details and logs
+    * Search functionality across all tabs
+    * Support for both password and private key authentication
+    * Dark mode support
+
+RepoType: git
+Repo: https://github.com/theSoberSobber/Docker-Manager
+
+Builds:
+  - versionName: '1.0.1'
+    versionCode: 2
+    commit: v2025.10.04.1603
+    subdir: android
+    gradle:
+      - yes
+    output: build/app/outputs/flutter-apk/app-release.apk
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+VercodeOperation: '%c'
+CurrentVersion: '1.0.1'
+CurrentVersionCode: 2
-- 
GitLab


From 69ce871c8e580fc7947bc1e5ae0d6c6e10b5a20c Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 21:46:13 +0530
Subject: [PATCH 02/22] Fix VercodeOperation format - use array instead of
 string

---
 metadata/com.pavit.docker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 45b1978ef8e..55a22f46ea9 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -39,6 +39,7 @@ Builds:
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-VercodeOperation: '%c'
+VercodeOperation:
+  - '%c'
 CurrentVersion: '1.0.1'
 CurrentVersionCode: 2
-- 
GitLab


From 41f45b27d75ddd8b32bfaaf4b8c1d7c87e7cfc51 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 21:47:25 +0530
Subject: [PATCH 03/22] Fix checkupdates: use Static mode instead of Tags for
 version detection

---
 metadata/com.pavit.docker.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 55a22f46ea9..4321572e296 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -37,9 +37,7 @@ Builds:
       - yes
     output: build/app/outputs/flutter-apk/app-release.apk
 
-AutoUpdateMode: Version
-UpdateCheckMode: Tags
-VercodeOperation:
-  - '%c'
+AutoUpdateMode: None
+UpdateCheckMode: Static
 CurrentVersion: '1.0.1'
 CurrentVersionCode: 2
-- 
GitLab


From 0b0b3d149024c9a2dfd9a9108f7d1d8ccd8c91ef Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 21:51:58 +0530
Subject: [PATCH 04/22] Fix lint formatting issues: reorder fields, fix
 indentation, remove quotes

---
 metadata/com.pavit.docker.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 4321572e296..558ade05a23 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -7,29 +7,28 @@ WebSite: https://github.com/theSoberSobber/Docker-Manager
 SourceCode: https://github.com/theSoberSobber/Docker-Manager
 IssueTracker: https://github.com/theSoberSobber/Docker-Manager/issues
 
-AutoName: Docker Manager
 Name: Docker Manager
+AutoName: Docker Manager
 Summary: Comprehensive Docker container management application
-
 Description: |
-    Docker Manager is a comprehensive Docker container management application built with Flutter.
-    It allows you to easily manage Docker containers, images, and volumes through an intuitive
-    mobile interface.
+  Docker Manager is a comprehensive Docker container management application built with Flutter.
+  It allows you to easily manage Docker containers, images, and volumes through an intuitive
+  mobile interface.
 
-    Features:
-    * Connect to remote Docker hosts via SSH
-    * View and manage Docker containers
-    * Start, stop, restart, and remove containers
-    * Inspect container details and logs
-    * Search functionality across all tabs
-    * Support for both password and private key authentication
-    * Dark mode support
+  Features:
+  * Connect to remote Docker hosts via SSH
+  * View and manage Docker containers
+  * Start, stop, restart, and remove containers
+  * Inspect container details and logs
+  * Search functionality across all tabs
+  * Support for both password and private key authentication
+  * Dark mode support
 
 RepoType: git
 Repo: https://github.com/theSoberSobber/Docker-Manager
 
 Builds:
-  - versionName: '1.0.1'
+  - versionName: 1.0.1
     versionCode: 2
     commit: v2025.10.04.1603
     subdir: android
@@ -39,5 +38,5 @@ Builds:
 
 AutoUpdateMode: None
 UpdateCheckMode: Static
-CurrentVersion: '1.0.1'
+CurrentVersion: 1.0.1
 CurrentVersionCode: 2
-- 
GitLab


From 7458c9a12e7c2b24b08412545cbc529f9501a974 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:12:02 +0530
Subject: [PATCH 05/22] Fix summary: make it shorter and more translatable

---
 metadata/com.pavit.docker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 558ade05a23..008eebc52d0 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -9,7 +9,6 @@ IssueTracker: https://github.com/theSoberSobber/Docker-Manager/issues
 
 Name: Docker Manager
 AutoName: Docker Manager
-Summary: Comprehensive Docker container management application
 Description: |
   Docker Manager is a comprehensive Docker container management application built with Flutter.
   It allows you to easily manage Docker containers, images, and volumes through an intuitive
-- 
GitLab


From deb06c81c841e19bcbc2e9d3f5b645018687b430 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:19:32 +0530
Subject: [PATCH 06/22] Add Flutter SDK setup for F-Droid build environment

---
 metadata/com.pavit.docker.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 008eebc52d0..4170e0ffa57 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -31,6 +31,17 @@ Builds:
     versionCode: 2
     commit: v2025.10.04.1603
     subdir: android
+    sudo:
+      - apt-get update
+      - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
+    prebuild:
+      - cd ..
+      - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.5-stable.tar.xz -o flutter.tar.xz
+      - tar xf flutter.tar.xz
+      - export PATH="$PATH:`pwd`/flutter/bin"
+      - flutter config --no-analytics
+      - flutter pub get
+      - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
     gradle:
       - yes
     output: build/app/outputs/flutter-apk/app-release.apk
-- 
GitLab


From 0715df0bef90b9ff686982318c182f40df657c21 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:30:56 +0530
Subject: [PATCH 07/22] Fix lint formatting and update Flutter to 3.35.5

- Reorder gradle/output fields before prebuild
- Split curl command for proper YAML formatting
- Update Flutter SDK from 3.24.5 to 3.35.5 to match Dart SDK requirement ^3.9.2
---
 metadata/com.pavit.docker.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 4170e0ffa57..27f82f1f62f 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -34,17 +34,18 @@ Builds:
     sudo:
       - apt-get update
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
+    gradle:
+      - yes
+    output: build/app/outputs/flutter-apk/app-release.apk
     prebuild:
       - cd ..
-      - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.5-stable.tar.xz -o flutter.tar.xz
+      - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.5-stable.tar.xz
+        -o flutter.tar.xz
       - tar xf flutter.tar.xz
       - export PATH="$PATH:`pwd`/flutter/bin"
       - flutter config --no-analytics
       - flutter pub get
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
-    gradle:
-      - yes
-    output: build/app/outputs/flutter-apk/app-release.apk
 
 AutoUpdateMode: None
 UpdateCheckMode: Static
-- 
GitLab


From 8a8e96ae2a67c8250636aa1f5e3088503b0cb36e Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:36:00 +0530
Subject: [PATCH 08/22] Fix local.properties formatting issue

- Add empty line before flutter.sdk to prevent concatenation
- Ensures proper local.properties file format for Flutter builds
---
 metadata/com.pavit.docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 27f82f1f62f..e4022d7b77d 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -45,6 +45,7 @@ Builds:
       - export PATH="$PATH:`pwd`/flutter/bin"
       - flutter config --no-analytics
       - flutter pub get
+      - echo "" >> android/local.properties
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
 
 AutoUpdateMode: None
-- 
GitLab


From 4c00089938a63b050dde285fbf116582ba1a452e Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:44:20 +0530
Subject: [PATCH 09/22] Add scanner ignore and cleanup for Flutter SDK

- Ignore flutter/ directory from F-Droid scanner
- Clean up Flutter SDK and archive after build
- Prevents scanner from flagging Flutter SDK binaries as problematic
---
 metadata/com.pavit.docker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index e4022d7b77d..ede3e8f7806 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -47,6 +47,12 @@ Builds:
       - flutter pub get
       - echo "" >> android/local.properties
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
+    scanignore:
+      - flutter/
+    postbuild:
+      - cd ..
+      - rm -rf flutter/
+      - rm -f flutter.tar.xz
 
 AutoUpdateMode: None
 UpdateCheckMode: Static
-- 
GitLab


From 3b5d0120ee09c560a424f2fbf6a95aa6c3a8b7a6 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:55:53 +0530
Subject: [PATCH 10/22] Fix APK output path for F-Droid build structure

- Change output path to android/build/app/outputs/flutter-apk/app-release.apk
- Accounts for F-Droid's build directory structure
---
 metadata/com.pavit.docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index ede3e8f7806..cd309fe7ee0 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -36,7 +36,7 @@ Builds:
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
     gradle:
       - yes
-    output: build/app/outputs/flutter-apk/app-release.apk
+    output: android/build/app/outputs/flutter-apk/app-release.apk
     prebuild:
       - cd ..
       - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.5-stable.tar.xz
-- 
GitLab


From dfef6351179c4c13f696e16649d6e61d7f51d10d Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 22:56:36 +0530
Subject: [PATCH 11/22] Fix APK output path for F-Droid build structure

- Change output path to android/build/app/outputs/flutter-apk/app-release.apk
- Accounts for F-Droid's build directory structure
---
 check-for-unattached-signatures.py.json     | 1 +
 check-keyalias-collision.py.json            | 1 +
 check-metadata-summary-whitespace.py.json   | 1 +
 metadata/com.pavit.docker/en-US/summary.txt | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 check-for-unattached-signatures.py.json
 create mode 100644 check-keyalias-collision.py.json
 create mode 100644 check-metadata-summary-whitespace.py.json
 create mode 100644 metadata/com.pavit.docker/en-US/summary.txt

diff --git a/check-for-unattached-signatures.py.json b/check-for-unattached-signatures.py.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/check-for-unattached-signatures.py.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/check-keyalias-collision.py.json b/check-keyalias-collision.py.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/check-keyalias-collision.py.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/check-metadata-summary-whitespace.py.json b/check-metadata-summary-whitespace.py.json
new file mode 100644
index 00000000000..8e325a93ba7
--- /dev/null
+++ b/check-metadata-summary-whitespace.py.json
@@ -0,0 +1 @@
+[{"description": "metadata .txt file has incorrect whitespace", "check_name": "check-metadata-summary-whitespace.py", "fingerprint": "check-metadata-summary-whitespace.pymetadata/com.pavit.docker.yml076b17920cbb2d89c295e11505f4cffeb47955afb6cd8f21fc3f073eb31a5188", "severity": "minor", "location": {"path": "metadata/com.pavit.docker.yml", "lines": {"begin": 0}}}]
\ No newline at end of file
diff --git a/metadata/com.pavit.docker/en-US/summary.txt b/metadata/com.pavit.docker/en-US/summary.txt
new file mode 100644
index 00000000000..c2dc4df7c7a
--- /dev/null
+++ b/metadata/com.pavit.docker/en-US/summary.txt
@@ -0,0 +1 @@
+Manage Docker containers via SSH
-- 
GitLab


From 63648af76c9bf29fafba4e4357b6edbf33083d13 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:07:40 +0530
Subject: [PATCH 12/22] Fix APK output path - remove android prefix

- Change output to build/app/outputs/flutter-apk/app-release.apk
- Since subdir: android, the path should be relative to android/ directory
- Prevents path duplication (android/android/...)
---
 metadata/com.pavit.docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index cd309fe7ee0..ede3e8f7806 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -36,7 +36,7 @@ Builds:
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
     gradle:
       - yes
-    output: android/build/app/outputs/flutter-apk/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     prebuild:
       - cd ..
       - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.5-stable.tar.xz
-- 
GitLab


From ed84d7b1196688982bd268f91f3e65a40bf3aae1 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:08:56 +0530
Subject: [PATCH 13/22] Add debug output to find actual APK location

- Add find commands to locate where APK is actually built
- List directory structure to understand F-Droid build layout
- This will help us set the correct output path
---
 metadata/com.pavit.docker.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index ede3e8f7806..d70cb3d8542 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -51,6 +51,14 @@ Builds:
       - flutter/
     postbuild:
       - cd ..
+      - echo "=== DEBUG: Listing all APK files ==="
+      - find . -name "*.apk" -type f
+      - echo "=== DEBUG: Directory structure around app/outputs ==="
+      - find . -path "*/app/outputs*" -type d
+      - find . -path "*/app/outputs*" -name "*.apk"
+      - echo "=== DEBUG: Android directory structure ==="
+      - ls -la android/
+      - ls -la android/build/ || echo "No android/build directory"
       - rm -rf flutter/
       - rm -f flutter.tar.xz
 
-- 
GitLab


From 4e35a321a29f38048a63db88c1dbdd698c035b58 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:22:05 +0530
Subject: [PATCH 14/22] Add manual build and debug output to prebuild

- Manually run gradlew assembleRelease to see where APK is built
- Add debug output to show actual APK location
- This will run before F-Droid's APK lookup fails
---
 metadata/com.pavit.docker.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index d70cb3d8542..a4762b00024 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -47,6 +47,14 @@ Builds:
       - flutter pub get
       - echo "" >> android/local.properties
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
+      - echo "=== DEBUG: Building APK manually to see output ==="
+      - cd android
+      - ./gradlew assembleRelease
+      - echo "=== DEBUG: Post-manual-build APK search ==="
+      - find . -name "*.apk" -type f
+      - echo "=== DEBUG: Build directory structure ==="
+      - find . -path "*/build/app/outputs*" -type d
+      - ls -la build/app/outputs/flutter-apk/ || echo "No flutter-apk directory found"
     scanignore:
       - flutter/
     postbuild:
-- 
GitLab


From d3ad5da9903cee089a0082155faffc45557876df Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:27:05 +0530
Subject: [PATCH 15/22] Fix debug echo commands syntax

- Remove special characters that were causing bash parsing errors
- Simplify echo statements to avoid YAML/bash conflicts
---
 metadata/com.pavit.docker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index a4762b00024..cff06195a3d 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -47,12 +47,12 @@ Builds:
       - flutter pub get
       - echo "" >> android/local.properties
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
-      - echo "=== DEBUG: Building APK manually to see output ==="
+      - echo "DEBUG - Building APK manually to see output"
       - cd android
       - ./gradlew assembleRelease
-      - echo "=== DEBUG: Post-manual-build APK search ==="
+      - echo "DEBUG - Post-manual-build APK search"
       - find . -name "*.apk" -type f
-      - echo "=== DEBUG: Build directory structure ==="
+      - echo "DEBUG - Build directory structure"
       - find . -path "*/build/app/outputs*" -type d
       - ls -la build/app/outputs/flutter-apk/ || echo "No flutter-apk directory found"
     scanignore:
-- 
GitLab


From ef769dc610c38f44302b794cf76e247c61a4e009 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:38:07 +0530
Subject: [PATCH 16/22] Remove manual gradlew call, let F-Droid handle build

- Remove ./gradlew assembleRelease that was failing (no gradlew file)
- Add directory inspection to understand gradle setup
- Let F-Droid's normal gradle build process handle the build
- Keep postbuild debug to see where APK ends up
---
 metadata/com.pavit.docker.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index cff06195a3d..7814b0eb2e4 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -47,24 +47,24 @@ Builds:
       - flutter pub get
       - echo "" >> android/local.properties
       - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
-      - echo "DEBUG - Building APK manually to see output"
+      - echo "DEBUG - Checking android directory contents"
       - cd android
-      - ./gradlew assembleRelease
-      - echo "DEBUG - Post-manual-build APK search"
-      - find . -name "*.apk" -type f
-      - echo "DEBUG - Build directory structure"
-      - find . -path "*/build/app/outputs*" -type d
-      - ls -la build/app/outputs/flutter-apk/ || echo "No flutter-apk directory found"
+      - pwd
+      - ls -la
+      - echo "DEBUG - Looking for gradle files"
+      - find . -name "gradle*" -type f
+      - echo "DEBUG - Checking if build directory exists"
+      - ls -la build/ || echo "No build directory yet"
     scanignore:
       - flutter/
     postbuild:
       - cd ..
-      - echo "=== DEBUG: Listing all APK files ==="
+      - echo "DEBUG - Listing all APK files"
       - find . -name "*.apk" -type f
-      - echo "=== DEBUG: Directory structure around app/outputs ==="
+      - echo "DEBUG - Directory structure around app/outputs"
       - find . -path "*/app/outputs*" -type d
       - find . -path "*/app/outputs*" -name "*.apk"
-      - echo "=== DEBUG: Android directory structure ==="
+      - echo "DEBUG - Android directory structure"
       - ls -la android/
       - ls -la android/build/ || echo "No android/build directory"
       - rm -rf flutter/
-- 
GitLab


From f4e27779552e698c2a162c7c4eee6adcd4ba82e5 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:49:10 +0530
Subject: [PATCH 17/22] Fix APK output path - use relative path from android
 subdir

- Change from build/app/outputs/flutter-apk/app-release.apk
- To ../build/app/outputs/flutter-apk/app-release.apk
- Flutter builds relative to project root, not android subdirectory
- F-Droid runs gradle from android/ dir due to subdir: android
---
 metadata/com.pavit.docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 7814b0eb2e4..fbb53aa2364 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -36,7 +36,7 @@ Builds:
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
     gradle:
       - yes
-    output: build/app/outputs/flutter-apk/app-release.apk
+    output: ../build/app/outputs/flutter-apk/app-release.apk
     prebuild:
       - cd ..
       - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.5-stable.tar.xz
-- 
GitLab


From a91f1cf8adbd3f13d363e3f7a635f797b85f7105 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Sun, 5 Oct 2025 23:59:39 +0530
Subject: [PATCH 18/22] Fix version code mismatch with gradle properties

- Add gradleprops to explicitly set flutter.versionName=1.0.1
- Add gradleprops to explicitly set flutter.versionCode=2
- Ensures APK version matches F-Droid metadata expectations
- APK was showing 1.0+1 instead of expected 1.0.1+2
---
 metadata/com.pavit.docker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index fbb53aa2364..b74b565929c 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -36,6 +36,9 @@ Builds:
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
     gradle:
       - yes
+    gradleprops:
+      - flutter.versionName=1.0.1
+      - flutter.versionCode=2
     output: ../build/app/outputs/flutter-apk/app-release.apk
     prebuild:
       - cd ..
-- 
GitLab


From 57eabab6fcc564c3fc39e4cd23c4273c5c0f5935 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Mon, 6 Oct 2025 00:11:23 +0530
Subject: [PATCH 19/22] Major restructure: Follow Flutter McSweepy approach

- Remove subdir: android (build from project root like McSweepy)
- Change from gradle: to build: with flutter build apk --release
- Use correct output path: build/app/outputs/flutter-apk/app-release.apk
- Remove gradle properties and local.properties setup
- Remove debug commands (no longer needed)
- This matches the successful Flutter McSweepy F-Droid build approach
---
 metadata/com.pavit.docker.yml | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index b74b565929c..c413ec40cbf 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -30,46 +30,23 @@ Builds:
   - versionName: 1.0.1
     versionCode: 2
     commit: v2025.10.04.1603
-    subdir: android
     sudo:
       - apt-get update
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
-    gradle:
-      - yes
-    gradleprops:
-      - flutter.versionName=1.0.1
-      - flutter.versionCode=2
-    output: ../build/app/outputs/flutter-apk/app-release.apk
+    output: build/app/outputs/flutter-apk/app-release.apk
     prebuild:
-      - cd ..
       - curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.5-stable.tar.xz
         -o flutter.tar.xz
       - tar xf flutter.tar.xz
       - export PATH="$PATH:`pwd`/flutter/bin"
       - flutter config --no-analytics
       - flutter pub get
-      - echo "" >> android/local.properties
-      - echo "flutter.sdk=`pwd`/flutter" >> android/local.properties
-      - echo "DEBUG - Checking android directory contents"
-      - cd android
-      - pwd
-      - ls -la
-      - echo "DEBUG - Looking for gradle files"
-      - find . -name "gradle*" -type f
-      - echo "DEBUG - Checking if build directory exists"
-      - ls -la build/ || echo "No build directory yet"
+    build:
+      - export PATH="$PATH:`pwd`/flutter/bin"
+      - flutter build apk --release
     scanignore:
       - flutter/
     postbuild:
-      - cd ..
-      - echo "DEBUG - Listing all APK files"
-      - find . -name "*.apk" -type f
-      - echo "DEBUG - Directory structure around app/outputs"
-      - find . -path "*/app/outputs*" -type d
-      - find . -path "*/app/outputs*" -name "*.apk"
-      - echo "DEBUG - Android directory structure"
-      - ls -la android/
-      - ls -la android/build/ || echo "No android/build directory"
       - rm -rf flutter/
       - rm -f flutter.tar.xz
 
-- 
GitLab


From 036a240381ffed6b6011e5424ee877f1cfe4f1f9 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Mon, 6 Oct 2025 00:22:32 +0530
Subject: [PATCH 20/22] Disable R8 shrinking to avoid APK signing block issues

- Add android.useR8=false to gradle.properties
- Add --no-shrink flag to flutter build
- This should prevent 'Dependency metadata' signing block that F-Droid rejects
- Similar to how other Flutter apps avoid this F-Droid scanner issue
---
 metadata/com.pavit.docker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index c413ec40cbf..b4c4b4adaa8 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -41,9 +41,10 @@ Builds:
       - export PATH="$PATH:`pwd`/flutter/bin"
       - flutter config --no-analytics
       - flutter pub get
+      - echo "android.useR8=false" >> android/gradle.properties
     build:
       - export PATH="$PATH:`pwd`/flutter/bin"
-      - flutter build apk --release
+      - flutter build apk --release --no-shrink
     scanignore:
       - flutter/
     postbuild:
-- 
GitLab


From da27e1852606e2ea3457c3f168d18fb02d8d0d7e Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Mon, 6 Oct 2025 00:35:17 +0530
Subject: [PATCH 21/22] Fix APK signing block issue with scandelete

---
 metadata/com.pavit.docker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index b4c4b4adaa8..5bcf49b0e17 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -30,6 +30,8 @@ Builds:
   - versionName: 1.0.1
     versionCode: 2
     commit: v2025.10.04.1603
+    scandelete:
+      - build/app/outputs/flutter-apk/app-release.apk.idsig
     sudo:
       - apt-get update
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
@@ -48,6 +50,10 @@ Builds:
     scanignore:
       - flutter/
     postbuild:
+      - cd build/app/outputs/flutter-apk/
+      - /opt/android-sdk/build-tools/*/zipalign -v 4 app-release.apk app-release-aligned.apk || true
+      - mv app-release-aligned.apk app-release.apk || true
+      - cd ../../../..
       - rm -rf flutter/
       - rm -f flutter.tar.xz
 
-- 
GitLab


From 185e331ad87dd334be97b190431d988ac6555cf0 Mon Sep 17 00:00:00 2001
From: theSoberSobber <pavitchhabra1611@gmail.com>
Date: Mon, 6 Oct 2025 00:41:47 +0530
Subject: [PATCH 22/22] Fix scanignore to properly handle .idsig files

---
 metadata/com.pavit.docker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/metadata/com.pavit.docker.yml b/metadata/com.pavit.docker.yml
index 5bcf49b0e17..5dd00f3fe5f 100644
--- a/metadata/com.pavit.docker.yml
+++ b/metadata/com.pavit.docker.yml
@@ -30,8 +30,6 @@ Builds:
   - versionName: 1.0.1
     versionCode: 2
     commit: v2025.10.04.1603
-    scandelete:
-      - build/app/outputs/flutter-apk/app-release.apk.idsig
     sudo:
       - apt-get update
       - apt-get install -y --no-install-recommends curl git unzip xz-utils zip libglu1-mesa
@@ -49,6 +47,7 @@ Builds:
       - flutter build apk --release --no-shrink
     scanignore:
       - flutter/
+      - '**/*.idsig'
     postbuild:
       - cd build/app/outputs/flutter-apk/
       - /opt/android-sdk/build-tools/*/zipalign -v 4 app-release.apk app-release-aligned.apk || true
-- 
GitLab