From a8dcd52db0bf033923b067a813b558cef9215765 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Jul 2024 14:46:05 +0200
Subject: [PATCH 1/2] Add `--alignment-preserved true` when signing APK for
 F-Droid. Closes #3151

---
 tools/release/release.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/release/release.sh b/tools/release/release.sh
index 1a39150588..60ee3b06e4 100755
--- a/tools/release/release.sh
+++ b/tools/release/release.sh
@@ -227,6 +227,7 @@ cp "${fdroidTargetPath}"/app-fdroid-arm64-v8a-release.apk \
    "${fdroidTargetPath}"/app-fdroid-arm64-v8a-release-signed.apk
 "${buildToolsPath}"/apksigner sign \
        -v \
+       --alignment-preserved true \
        --ks "${keyStorePath}" \
        --ks-pass pass:"${keyStorePassword}" \
        --ks-key-alias elementx \
@@ -238,6 +239,7 @@ cp "${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release.apk \
    "${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release-signed.apk
 "${buildToolsPath}"/apksigner sign \
        -v \
+       --alignment-preserved true \
        --ks "${keyStorePath}" \
        --ks-pass pass:"${keyStorePassword}" \
        --ks-key-alias elementx \
@@ -249,6 +251,7 @@ cp "${fdroidTargetPath}"/app-fdroid-x86-release.apk \
    "${fdroidTargetPath}"/app-fdroid-x86-release-signed.apk
 "${buildToolsPath}"/apksigner sign \
        -v \
+       --alignment-preserved true \
        --ks "${keyStorePath}" \
        --ks-pass pass:"${keyStorePassword}" \
        --ks-key-alias elementx \
@@ -260,6 +263,7 @@ cp "${fdroidTargetPath}"/app-fdroid-x86_64-release.apk \
    "${fdroidTargetPath}"/app-fdroid-x86_64-release-signed.apk
 "${buildToolsPath}"/apksigner sign \
        -v \
+       --alignment-preserved true \
        --ks "${keyStorePath}" \
        --ks-pass pass:"${keyStorePassword}" \
        --ks-key-alias elementx \

From 03ce6cf975bc5a6b24549f41f7d0ab63f6ffa908 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Jul 2024 14:48:11 +0200
Subject: [PATCH 2/2] Remove `Type of change` from the PR template, we are now
 using PR- labels.

---
 .github/pull_request_template.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2307ea6e3e..ea44e3a5d0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,5 @@
 <!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
  
-## Type of change
-
-- [ ] Feature
-- [ ] Bugfix
-- [ ] Technical
-- [ ] Other :
-
 ## Content
 
 <!-- Describe shortly what has been changed -->