From c7d05d4bd6b917701adbee09b6c128ebfe4f00a8 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 14 Feb 2024 15:04:47 +0000
Subject: [PATCH] Organic Maps: re-enable AUM

---
 metadata/app.organicmaps.yml | 96 +++---------------------------------
 1 file changed, 7 insertions(+), 89 deletions(-)

diff --git a/metadata/app.organicmaps.yml b/metadata/app.organicmaps.yml
index ec8b6f039e..5265be78e1 100644
--- a/metadata/app.organicmaps.yml
+++ b/metadata/app.organicmaps.yml
@@ -1,7 +1,8 @@
 AntiFeatures:
   NonFreeNet:
-    en-US: Depends on a maps download service (cdn*.organicmaps.app) which is free
-      and open source, but is not changeable by a user.
+    en-US: Map download service (cdn*.organicmaps.app) is free and open source, but
+      not user changeable. Hotel widget includes a link to kayak.com not contained
+      in original map data.
 Categories:
   - Navigation
 License: Apache-2.0
@@ -1446,10 +1447,9 @@ Builds:
       - ./b2 headers
     ndk: r25c
 
-  - versionName: 2023.11.17-17-FDroid
-    versionCode: 23111717
-    disable: https://github.com/organicmaps/organicmaps/issues/6967#issuecomment-1890782874
-    commit: 1a466dcec23ba554f5a32c67d1e41247ab6e2e47
+  - versionName: 2024.02.06-11-FDroid
+    versionCode: 24020611
+    commit: b158a546a53f5c19dc17e836763332e34356dc61
     subdir: android/app
     submodules: true
     sudo:
@@ -1480,90 +1480,8 @@ Builds:
       - ./bootstrap.sh
       - ./b2 headers
     ndk: r26b
-    antifeatures:
-      Ads:
-        en-US: Hotel features have paid referral links to Kayak not contained in original
-          map data.
 
-  - versionName: 2023.12.18-11-FDroid
-    versionCode: 23121811
-    disable: https://github.com/organicmaps/organicmaps/issues/6967#issuecomment-1890782874
-    commit: ccde5da061b16ec27554f39259772b15a72849ae
-    subdir: android/app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y g++ ninja-build
-      - apt-get install -t bullseye-backports cmake
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    gradle:
-      - fdroid
-    rm:
-      - iphone
-      - qt
-      - tools/shaders_compiler
-      - xcode
-    prebuild:
-      - sed -i -e '/com.google.firebase/d; /gms/d' build.gradle
-      - touch secure.properties
-      - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
-        src/main/res/xml/network_security_config.xml
-      - cp ../../private_default.h ../../private.h
-    scanignore:
-      - data/*.bin
-    scandelete:
-      - 3party
-    build:
-      - cd ../../3party/boost
-      - ./bootstrap.sh
-      - ./b2 headers
-    ndk: r26b
-    antifeatures:
-      Ads:
-        en-US: Hotel features have paid referral links to Kayak not contained in original
-          map data.
-
-  - versionName: 2023.12.20-4-FDroid
-    versionCode: 23122004
-    disable: https://github.com/organicmaps/organicmaps/issues/6967#issuecomment-1890782874
-    commit: b7489fa2a66285c48aeda5047d7e18c8a2b9bd19
-    subdir: android/app
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y g++ ninja-build
-      - apt-get install -t bullseye-backports cmake
-      - apt-get install -y openjdk-17-jdk-headless
-      - update-java-alternatives -a
-    gradle:
-      - fdroid
-    rm:
-      - iphone
-      - qt
-      - tools/shaders_compiler
-      - xcode
-    prebuild:
-      - sed -i -e '/com.google.firebase/d; /gms/d' build.gradle
-      - touch secure.properties
-      - echo '<?xml version="1.0" encoding="utf-8"?><network-security-config/>' >
-        src/main/res/xml/network_security_config.xml
-      - cp ../../private_default.h ../../private.h
-    scanignore:
-      - data/*.bin
-    scandelete:
-      - 3party
-    build:
-      - cd ../../3party/boost
-      - ./bootstrap.sh
-      - ./b2 headers
-    ndk: r26b
-    antifeatures:
-      Ads:
-        en-US: Hotel features have paid referral links to Kayak not contained in original
-          map data.
-
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags .*android$
 UpdateCheckData: android/app/src/fdroid/play/version.yaml|version:\s.+\+(\d+)|.|version:\s(.+)\+
 CurrentVersion: 2024.02.06-11-FDroid