[generator] add country signing

Signed-off-by: zyphlar <zyphlar@gmail.com>

.forgejo/workflows/map-generator.yml

@@ -490,6 +490,7 @@ jobs:
       volumes:
         - /mnt/4tbexternal/:/mnt/4tbexternal/
         - /mnt/4tbexternal/osm-planet:/home/planet
+        - /root/keys:~/keys
       options: --ulimit nofile=262144:262144
     concurrency:
       group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
@@ -518,6 +519,18 @@ jobs:
         run: |
           cd ~/comaps
           bash ./tools/unix/maps/docker_maps_generator.sh
+      - name: Sign countries.txt and copy to latest
+        shell: bash
+        run: |
+          shopt -s nullglob
+          buildfolder=$(find /mnt/4tbexternal/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5)
+          builddate=$(find /mnt/4tbexternal/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6)
+          cd /mnt/4tbexternal/osm-maps/$buildfolder/$builddate
+          openssl pkeyutl -sign -inkey ~/keys/countries_ed25519_sk.pem -rawin -in countries.txt -out countries.txt.sig
+          openssl pkeyutl -verify -pubin -inkey ~/keys/countries_ed25519_pk.pem -rawin -in countries.txt -sigfile countries.txt.sig
+          cd ..
+          mkdir -p latest
+          cp /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/countries* latest
       - name: Notify Zulip
         run: |
           curl -X POST https://comaps.zulipchat.com/api/v1/messages \
@@ -566,6 +579,9 @@ jobs:
             echo "<$(date +%T)> Found top level: $(ls -alt /mnt/4tbexternal/osm-maps/*)"
             echo "<$(date +%T)> Found second level: $(ls -alt /mnt/4tbexternal/osm-maps/$buildfolder/*)"
           fi
+
+          echo "<$(date +%T)> Uploading countries.txt/sig from $buildfolder/latest..."
+          ./upload_to_cdn.sh /mnt/4tbexternal/osm-maps/$buildfolder/latest
       - name: Notify Zulip
         run: |
           curl -X POST https://comaps.zulipchat.com/api/v1/messages \

android/app/src/main/res/drawable/ic_follow_16dp.xml

@@ -1,5 +0,0 @@
-<vector android:height="16dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M 20.215 3.79 L 2.215 11.32 L 2.215 12.29 L 9.055 14.95 L 11.715 21.79 L 12.675 21.79 Z"/>
-</vector>

android/app/src/main/res/layout/item_search_result.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -66,12 +65,9 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_alignParentEnd="true"
-    android:gravity="center_vertical"
     android:layout_alignBaseline="@id/region"
     android:layout_below="@id/description"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    app:drawableStartCompat="@drawable/ic_follow_16dp"
-    app:drawableTint="?colorSecondary"
     android:textColor="?colorSecondary"
     tools:text="500 km"/>
 </RelativeLayout>