Bump versions

Signed-off-by: biodranik <biodranik@users.noreply.github.com>

.github/CODEOWNERS

@@ -1,69 +1,9 @@
-# All non-assigned.
-* @organicmaps/mergers
-# Visual design.
-/android/app/src/main/res/drawable*/ @organicmaps/design
-/android/app/src/main/res/font/ @organicmaps/design
-/android/app/src/main/res/mipmap*/ @organicmaps/design
-/data/*.ttf @organicmaps/design
-/data/resources-svg/ @organicmaps/design
-/data/search-icons/ @organicmaps/design
-/iphone/Maps/Images.xcassets/ @organicmaps/design
-# Android.
-/android/ @organicmaps/android
-/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-/docs/JAVA_STYLE.md @organicmaps/android
-# no owner for translation changes
-/android/app/src/main/res/values*/strings.xml
-# iOS.
-/iphone/ @organicmaps/ios
-/xcode/ @organicmaps/ios
-/docs/OBJC_STYLE.md @organicmaps/ios
-# no owner for translation changes
-/iphone/plist.txt
-/iphone/Maps/LocalizedStrings/
-# Qt
-/qt/ @organicmaps/qt
-# Rendering
-/drape/ @organicmaps/rendering
-/drape_frontend/ @organicmaps/rendering
-# Map Data.
-/tools/python/maps_generator/ @organicmaps/data
-/generator/ @organicmaps/data
-/topography_generator/ @organicmaps/data
-/data/borders/ @organicmaps/data
-/data/conf/isolines/ @organicmaps/data
-/docs/SUBWAY_GENERATION.md @organicmaps/data
-/docs/MAPS.md @organicmaps/data
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
-# no owner (changed often to add a new POI)
-/generator/generator_tests/osm_type_test.cpp
-# Map Styles.
-/data/styles/ @organicmaps/styles
-/data/types.txt @organicmaps/styles
-/data/visibility.txt @organicmaps/styles
-/data/mapcss-mapping.csv @organicmaps/styles
-/data/replaced_tags.txt @organicmaps/styles
-/data/classificator.txt @organicmaps/styles
-/data/drules_* @organicmaps/styles
-/docs/STYLES.md
-/tools/kothic/ @organicmaps/styles
-# DevOps.
-/.github/workflows @organicmaps/devops
-/android/*gradle* @organicmaps/devops
-/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
-/xcode/fastlane/ @organicmaps/devops
-# Growth.
-README.md @organicmaps/growth
-/.github/FUNDING.yml @organicmaps/growth
-/android/app/src/fdroid/play/ @organicmaps/growth
-/android/app/src/google/play/ @organicmaps/growth
-/iphone/metadata/ @organicmaps/growth
-# Legal.
-LEGAL @organicmaps/legal
-LICENSE @organicmaps/legal
-NOTICE @organicmaps/legal
-CONTRIBUTORS @organicmaps/legal
-/docs/CODE_OF_CONDUCT.md @organicmaps/legal
-/docs/DCO.md @organicmaps/legal
-/docs/GOVERNANCE.md @organicmaps/legal
+# Require legal approval for all new graphics
+android/app/src/main/res/drawable*/ @organicmaps/legal
+android/app/src/main/res/fonts/ @organicmaps/legal
+android/app/src/main/res/mipmap*/ @organicmaps/legal
+data/*.ttf @organicmaps/legal
+data/resources*/ @organicmaps/legal
+data/search-icons/ @organicmaps/legal
+data/styles/clear/style-*/ @organicmaps/legal
+iphone/Maps/Images.xcassets/ @organicmaps/legal

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for Organic Maps
 title: ''
-labels: []
+labels: [Enhancement]
 assignees: ''
 
 ---

.github/workflows/android-beta.yaml

@@ -56,24 +56,19 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Restore beta keys
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
+
+      - name: Configure repo with private keys
         shell: bash
         run: |
-          echo "$PRIVATE_H" | base64 -d > private.h
-          echo "$FIREBASE_APP_DISTRIBUTION_JSON" | base64 -d > android/app/firebase-app-distribution.json
-          echo "$GOOGLE_SERVICES_JSON" | base64 -d > android/app/google-services.json
-          echo "$SECURE_PROPERTIES" | base64 -d > android/app/secure.properties
-          echo "$RELEASE_KEYSTORE" | base64 -d > android/app/release.keystore
-        env:
-          PRIVATE_H: ${{ secrets.PRIVATE_H }}
-          FIREBASE_APP_DISTRIBUTION_JSON: ${{ secrets.FIREBASE_APP_DISTRIBUTION_JSON }}
-          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
-          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
-          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
-
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
+          ./configure.sh ./private.git
+          rm -rf ./private.git
 
       - name: Compile
         shell: bash

.github/workflows/android-check.yaml

@@ -51,7 +51,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Configure repository
+      - name: Configure in Open Source mode
         shell: bash
         run: ./configure.sh
 
@@ -66,11 +66,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flavor: [WebDebug, FdroidDebug]
+        flavor: [WebDebug, FdroidBeta]
         include:
           - flavor: WebDebug
             arch: arm64
-          - flavor: FdroidDebug
+          - flavor: FdroidBeta
             arch: arm32
     # Cancels previous jobs if the same branch or PR was updated again.
     concurrency:
@@ -93,7 +93,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Configure repository
+      - name: Configure in Open Source mode
         shell: bash
         run: ./configure.sh
 

.github/workflows/android-monkey.yaml

@@ -56,26 +56,19 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
-      - name: Restore beta keys
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
+
+      - name: Configure repo with private keys
         shell: bash
         run: |
-          echo "$PRIVATE_H" | base64 -d > private.h
-          echo "$FIREBASE_TEST_LAB_JSON" | base64 -d > android/app/firebase-test-lab.json
-          echo "$FIREBASE_APP_DISTRIBUTION_JSON" | base64 -d > android/app/firebase-app-distribution.json
-          echo "$GOOGLE_SERVICES_JSON" | base64 -d > android/app/google-services.json
-          echo "$SECURE_PROPERTIES" | base64 -d > android/app/secure.properties
-          echo "$RELEASE_KEYSTORE" | base64 -d > android/app/release.keystore
-        env:
-          PRIVATE_H: ${{ secrets.PRIVATE_H }}
-          FIREBASE_TEST_LAB_JSON: ${{ secrets.FIREBASE_TEST_LAB_JSON }}
-          FIREBASE_APP_DISTRIBUTION_JSON: ${{ secrets.FIREBASE_APP_DISTRIBUTION_JSON }}
-          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
-          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
-          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
-
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
+          ./configure.sh ./private.git
+          rm -rf ./private.git
 
       - name: Compile
         shell: bash

.github/workflows/android-release-metadata.yaml

@@ -26,14 +26,19 @@ jobs:
           ref: master
           path: screenshots
 
-      - name: Restore release keys
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
+
+      - name: Configure repo with private keys
         shell: bash
         run: |
-          echo "$PRIVATE_H" | base64 -d > private.h
-          echo "$GOOGLE_PLAY_JSON" | base64 -d > android/app/google-play.json
-        env:
-          PRIVATE_H: ${{ secrets.PRIVATE_H }}
-          GOOGLE_PLAY_JSON: ${{ secrets.GOOGLE_PLAY_JSON }}
+          ./configure.sh ./private.git
+          rm -rf ./private.git
 
       - name: Upload
         shell: bash

.github/workflows/android-release.yaml

@@ -29,7 +29,7 @@ jobs:
           version=$(tools/unix/version.sh ios_version)
           # +1 because below a "Bump versions" commit is created.
           # TODO: Find a way to refactor FDroid versioning without that additional commit.
-          build=$(($(tools/unix/version.sh count) + 1))
+          build=$(($(tools/unix/version.sh ios_build) + 1))
           code=$(($(tools/unix/version.sh android_code) + 1))
           tag=$version-$build-android
           echo "::set-output name=version::$version"
@@ -100,26 +100,19 @@ jobs:
           ref: master
           path: screenshots
 
-      - name: Restore release keys
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
+
+      - name: Configure repo with private keys
         shell: bash
         run: |
-          echo "$PRIVATE_H" | base64 -d > private.h
-          echo "$GOOGLE_PLAY_JSON" | base64 -d > android/app/google-play.json
-          echo "$HUAWEI_APPGALLERY_JSON" | base64 -d > android/app/huawei-appgallery.json
-          echo "$AGCONNECT_SERVICES_JSON" | base64 -d > android/app/agconnect-services.json
-          echo "$SECURE_PROPERTIES" | base64 -d > android/app/secure.properties
-          echo "$RELEASE_KEYSTORE" | base64 -d > android/app/release.keystore
-        env:
-          PRIVATE_H: ${{ secrets.PRIVATE_H }}
-          GOOGLE_PLAY_JSON: ${{ secrets.GOOGLE_PLAY_JSON }}
-          HUAWEI_APPGALLERY_JSON: ${{ secrets.HUAWEI_APPGALLERY_JSON }}
-          AGCONNECT_SERVICES_JSON: ${{ secrets.AGCONNECT_SERVICES_JSON }}
-          SECURE_PROPERTIES: ${{ secrets.SECURE_PROPERTIES }}
-          RELEASE_KEYSTORE: ${{ secrets.RELEASE_KEYSTORE }}
-
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
+          ./configure.sh ./private.git
+          rm -rf ./private.git
 
       - name: Set up SDK
         shell: bash

.github/workflows/coverage-check.yaml

@@ -94,7 +94,7 @@ jobs:
               llvm \
               gcovr
 
-      - name: Configure repository
+      - name: Configure
         shell: bash
         run: ./configure.sh
 

.github/workflows/ios-beta.yaml

@@ -33,9 +33,9 @@ on:
 jobs:
   ios-beta:
     name: Apple TestFlight
-    runs-on: macos-15
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
@@ -52,23 +52,18 @@ jobs:
       - name: Parallel submodules checkout
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
-      - name: Restore beta keys
-        shell: bash
-        run: |
-          mkdir -p xcode/keys
-          echo "$PRIVATE_H" | base64 -d > private.h
-          echo "$APPSTORE_JSON" | base64 -d > xcode/keys/appstore.json
-          echo "$CERTIFICATES_DEV_P12" | base64 -d > xcode/keys/CertificatesDev.p12
-          echo "$CERTIFICATES_DISTR_P12" | base64 -d > xcode/keys/CertificatesDistr.p12
-        env:
-          PRIVATE_H: ${{ secrets.PRIVATE_H }}
-          APPSTORE_JSON: ${{ secrets.APPSTORE_JSON }}
-          CERTIFICATES_DEV_P12: ${{ secrets.CERTIFICATES_DEV_P12 }}
-          CERTIFICATES_DISTR_P12: ${{ secrets.CERTIFICATES_DISTR_P12 }}
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: private.git
 
-      - name: Configure repository
-        shell: bash
-        run: ./configure.sh
+      - name: Configure repo with private keys
+        run: |
+          ./configure.sh ./private.git
+          rm -rf ./private.git
 
       - name: Compile and upload to TestFlight
         run: |

.github/workflows/ios-check.yaml

@@ -35,9 +35,9 @@ on:
 jobs:
   ios-check:
     name: Build iOS
-    runs-on: macos-15
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
@@ -59,7 +59,7 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(sysctl -n hw.logicalcpu) * 20))
 
-      - name: Configure repository
+      - name: Configure
         shell: bash
         run: ./configure.sh
 
@@ -78,7 +78,7 @@ jobs:
             -scheme OMaps \
             -configuration Debug \
             -sdk iphonesimulator \
-            -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
+            -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' \
             -quiet \
             -resultBundlePath ${{ env.TEST_RESULTS_BUNDLE_NAME }}.xcresult \
             CODE_SIGNING_REQUIRED=NO \

.github/workflows/ios-release.yaml

@@ -5,9 +5,9 @@ on:
 jobs:
   ios-release:
     name: iOS Release
-    runs-on: macos-15
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
@@ -16,13 +16,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Restore release keys
+      - name: Checkout private keys
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ secrets.PRIVATE_REPO }}
+          ssh-key: ${{ secrets.PRIVATE_SSH_KEY }}
+          ref: master
+          path: ./private.git
+
+      - name: Configure repo with private keys
         shell: bash
         run: |
-          mkdir -p xcode/keys
-          echo "$APPSTORE_JSON" | base64 -d > xcode/keys/appstore.json
-        env:
-          APPSTORE_JSON: ${{ secrets.APPSTORE_JSON }}
+          mkdir -p xcode/keys/
+          cp -p ./private.git/xcode/keys/appstore.json xcode/keys/
+          rm -rf ./private.git
 
       - name: Checkout screenshots
         uses: actions/checkout@v4

.github/workflows/linux-check.yaml

@@ -61,17 +61,13 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
-              libxrandr-dev \
-              libxinerama-dev \
-              libxcursor-dev \
-              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
               libqt6positioning6-plugins \
               libqt6positioning6
 
-      - name: Configure repository
+      - name: Configure
         shell: bash
         run: ./configure.sh
 
@@ -132,17 +128,13 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
-              libxrandr-dev \
-              libxinerama-dev \
-              libxcursor-dev \
-              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
               libqt6positioning6-plugins \
               libqt6positioning6
 
-      - name: Configure repository
+      - name: Configure
         shell: bash
         run: ./configure.sh
 

.github/workflows/macos-check.yaml

@@ -30,9 +30,9 @@ on:
 jobs:
   macos-matrix:
     name: macOS builds and tests
-    runs-on: macos-15
+    runs-on: macos-14
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
       HOMEBREW_NO_ANALYTICS: 1
       HOMEBREW_NO_INSTALL_CLEANUP: 1
     strategy:
@@ -57,7 +57,7 @@ jobs:
         run: |
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja qt@6
 
-      - name: Configure repository
+      - name: Configure
         shell: bash
         run: ./configure.sh
 

.github/workflows/stale.yml

@@ -1,22 +0,0 @@
-name: Close stale PRs
-on:
-  schedule:
-    - cron: "0 0 * * *" # Runs every day at midnight
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-pr-stale: 180 # 6 months before warning
-          days-before-pr-close: 365 # Closed after 12 months
-          stale-pr-label: "stale"
-          stale-pr-message: "Hi! This PR has been inactive for 6 months. If it's still relevant, please update it to let us know you’d like to keep it open 😊"
-          close-pr-message: "This PR has been automatically closed after 12 months of inactivity."
-          days-before-issue-stale: -1 # Issues are never stale
-          days-before-issue-close: -1 # Issues are never closed
-          remove-stale-when-updated: true

.github/workflows/strings-check.yaml

@@ -0,0 +1,31 @@
+name: Validate translation strings
+on:
+  workflow_dispatch: # Manual trigger
+  pull_request:
+    paths:
+      - .github/workflows/strings-check.yaml  # Run check on self change
+      - data/strings/strings.txt
+      - data/strings/types_strings.txt
+      - data/strings/sound.txt
+      - data/countries_names.txt
+      - iphone/plist.txt
+      - tools/python/strings_utils.py
+
+jobs:
+  validate-translation-strings:
+    name: Validate translation strings
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3'
+
+      - name: Validate string files
+        shell: bash
+        run: |
+          for f in data/strings/strings.txt data/strings/types_strings.txt data/strings/sound.txt data/countries_names.txt iphone/plist.txt; do
+            ./tools/python/strings_utils.py --validate $f -o
+          done;
+          git diff --exit-code

.gitignore

@@ -20,7 +20,6 @@ data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
-data/edits.xml
 
 # Compiled Python
 *.pyc
@@ -85,7 +84,7 @@ data/[0-9][0-9][0-9][0-9][0-9][0-9]
 data/gps_track.dat
 # temporary files for downloader
 data/settings.ini
-data/test_data/world_feed_integration_tests_data
+data/world_feed_integration_tests_data
 
 # benchmark results
 data/benchmarks/*.trace

.gitmodules

@@ -4,9 +4,15 @@
 [submodule "tools/kothic"]
   path = tools/kothic
   url = https://github.com/organicmaps/kothic.git
+[submodule "tools/macdeployqtfix"]
+  path = tools/macdeployqtfix
+  url = https://github.com/aurelien-rainone/macdeployqtfix.git
 [submodule "3party/protobuf/protobuf"]
   path = 3party/protobuf/protobuf
   url = https://github.com/organicmaps/protobuf.git
+[submodule "tools/twine"]
+  path = tools/twine
+  url = https://github.com/organicmaps/twine.git
 [submodule "3party/Vulkan-Headers"]
   path = 3party/Vulkan-Headers
   url = https://github.com/KhronosGroup/Vulkan-Headers.git
@@ -56,12 +62,3 @@
 [submodule "3party/utfcpp"]
 	path = 3party/utfcpp
 	url = https://github.com/nemtrif/utfcpp.git
-[submodule "3party/glfw"]
-	path = 3party/glfw
-	url = https://github.com/glfw/glfw.git
-[submodule "3party/CMake-MetalShaderSupport"]
-	path = 3party/CMake-MetalShaderSupport
-	url = https://github.com/dpogue/CMake-MetalShaderSupport.git
-[submodule "3party/imgui/imgui"]
-	path = 3party/imgui/imgui
-	url = https://github.com/ocornut/imgui

3party/CMake-MetalShaderSupport

@@ -1 +0,0 @@
-Subproject commit 989857d2e5e54869c35ad06fb21a67d12a2dbc67

3party/CMakeLists.txt

@@ -22,6 +22,7 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   set(EXPAT_DTD OFF)
   set(EXPAT_NS ON)
   add_subdirectory(expat/expat)
+  add_library(expat::expat ALIAS expat)
 
   # Configure Jansson library.
   set(JANSSON_BUILD_DOCS OFF)
@@ -66,19 +67,4 @@ add_subdirectory(vulkan_wrapper)
 
 if (PLATFORM_DESKTOP)
   add_subdirectory(libtess2)
-
-  set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
-  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
-  set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
-  set(GLFW_INSTALL OFF CACHE BOOL "")
-  set(GLFW_VULKAN_STATIC OFF CACHE BOOL "")
-  set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
-  # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
-  set(CMAKE_OBJC_FLAGS "")
-  add_subdirectory(glfw)
-  set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
-  set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
-  set(CMAKE_OBJC_FLAGS -fobjc-arc)
-
-  add_subdirectory(imgui)
 endif()

3party/expat

@@ -1 +1 @@
-Subproject commit a0dc7d5efacbe2b744211289c276e2b9168bd4ae
+Subproject commit 6b3f93c6caa0308455beeced0268cfae04df3584

3party/glfw

@@ -1 +0,0 @@
-Subproject commit 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50

3party/imgui/CMakeLists.txt

@@ -1,16 +0,0 @@
-project(imgui)
-
-set(SRC
-  imgui/imgui_draw.cpp
-  imgui/imgui_tables.cpp
-  imgui/imgui_widgets.cpp
-  imgui/imgui.cpp
-  imgui/backends/imgui_impl_glfw.cpp
-)
-
-add_library(${PROJECT_NAME} ${SRC})
-target_include_directories(${PROJECT_NAME} 
-  PRIVATE ${OMIM_ROOT}/3party/glfw/include
-  PUBLIC ${OMIM_ROOT}/3party/imgui/imgui
-  PUBLIC .
-)

3party/imgui/imgui

@@ -1 +0,0 @@
-Subproject commit 6982ce43f5b143c5dce5fab0ce07dd4867b705ae

3party/vulkan_wrapper/CMakeLists.txt

@@ -17,9 +17,6 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC .)
 
-if (PLATFORM_LINUX)
-  target_compile_definitions(${PROJECT_NAME} PRIVATE VK_USE_PLATFORM_XLIB_KHR)
-endif()
 
 # dlopen
 target_link_libraries(${PROJECT_NAME} $<$<BOOL:CMAKE_DL_LIBS>:${CMAKE_DL_LIBS}>)

3party/vulkan_wrapper/vulkan_wrapper.cpp

@@ -22,20 +22,7 @@ extern "C" {
 #include <dlfcn.h>
 
 int InitVulkan(void) {
-#if defined(__APPLE__)
-    void* libvulkan = dlopen("libvulkan.dylib", RTLD_NOW | RTLD_LOCAL);
-    if (!libvulkan) {
-        libvulkan = dlopen("libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL);
-    }
-    if (!libvulkan) {
-        libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
-    }
-#else
-    void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
-    if (!libvulkan) {
-        libvulkan = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
-    }
-#endif
+    void* libvulkan = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
     if (!libvulkan) return 0;
 
     // Vulkan supported, set function addresses
@@ -558,10 +545,6 @@ int InitVulkan(void) {
     vkDestroyDebugReportCallbackEXT = reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>(dlsym(libvulkan, "vkDestroyDebugReportCallbackEXT"));
     vkDebugReportMessageEXT = reinterpret_cast<PFN_vkDebugReportMessageEXT>(dlsym(libvulkan, "vkDebugReportMessageEXT"));
 
-#if defined(__APPLE__)
-    vkCreateMacOSSurfaceMVK = reinterpret_cast<PFN_vkCreateMacOSSurfaceMVK>(dlsym(libvulkan, "vkCreateMacOSSurfaceMVK"));
-#endif
-
     return 1;
 }
 
@@ -1154,10 +1137,6 @@ PFN_vkCmdDecodeVideoKHR vkCmdDecodeVideoKHR;
 PFN_vkCmdEncodeVideoKHR vkCmdEncodeVideoKHR;
 #endif
 
-#if defined(__APPLE__)
-PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
-#endif
-
 #ifdef __cplusplus
 }
 #endif

3party/vulkan_wrapper/vulkan_wrapper.h

@@ -25,10 +25,6 @@ extern "C" {
 #define VK_USE_PLATFORM_ANDROID_KHR 1
 #include <vulkan/vulkan.h>
 
-#if defined(__APPLE__)
-#include <vulkan/vulkan_macos.h>
-#endif
-
 /* Initialize the Vulkan function pointer variables declared in this header.
  * Returns 0 if vulkan is not available, non-zero if it is available.
  */
@@ -504,10 +500,6 @@ extern PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
 extern PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
 extern PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
 
-#if defined(__APPLE__)
-extern PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
-#endif
-
 #ifdef __cplusplus
 }
 #endif

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.22.1)
+cmake_minimum_required(VERSION 3.18)
 project(omim C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
@@ -90,19 +90,6 @@ else()
   message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
 endif()
 
-if(${PLATFORM_MAC})
-  set(XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
-
-  # Metal language support
-  list(APPEND CMAKE_MODULE_PATH ${OMIM_ROOT}/3party/CMake-MetalShaderSupport/cmake)
-  include(CheckLanguage)
-  include(MetalShaderSupport)
-  check_language(Metal)
-  if(CMAKE_Metal_COMPILER)
-    enable_language(Metal)
-  endif()
-endif()
-
 # Sanitizer
 if (PLATFORM_DESKTOP)
   # https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
@@ -176,7 +163,6 @@ option(SKIP_QT_GUI "Skip building of Qt GUI" OFF)
 option(USE_PCH "Use precompiled headers" OFF)
 option(NJOBS "Number of parallel processes" OFF)
 option(ENABLE_VULKAN_DIAGNOSTICS "Enable Vulkan diagnostics" OFF)
-option(ENABLE_TRACE "Enable Tracing" OFF)
 
 if (NJOBS)
   message(STATUS "Number of parallel processes: ${NJOBS}")
@@ -233,11 +219,6 @@ if (ENABLE_VULKAN_DIAGNOSTICS)
   add_definitions(-DENABLE_VULKAN_DIAGNOSTICS)
 endif()
 
-if (ENABLE_TRACE)
-  message(STATUS "Tracing is enabled")
-  add_definitions(-DENABLE_TRACE)
-endif()
-
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 # Set environment variables
@@ -278,6 +259,16 @@ find_package(Threads REQUIRED)
 
 # Scripts
 
+if (NOT CMAKE_HOST_WIN32)
+  execute_process(
+      COMMAND "${OMIM_ROOT}/tools/unix/check_cert.sh"
+      RESULT_VARIABLE CheckCertResult
+  )
+  if (CheckCertResult)
+      message(FATAL_ERROR "Certificate check failed")
+  endif()
+endif()
+
 if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
   list(APPEND qt_components Core Network)
   if (NOT SKIP_QT_GUI OR NOT SKIP_TESTS OR PYBINDINGS)
@@ -397,7 +388,6 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(qt)
     omim_add_tool_subdirectory(skin_generator)
   endif()
-  add_subdirectory(dev_sandbox)
 endif()
 
 omim_add_test_subdirectory(qt_tstfrm)

CONTRIBUTORS

@@ -1,73 +1,35 @@
-This file contains a list of people who have contributed to this project.
-Its not neccesarily comprehensive.
-Feel free to add yourself here along with your first contribution!
+This file contains a list of people who have contributed to the
+public version of MAPS.ME and Organic Maps.
+
+Original MAPS.ME (MapsWithMe) design and implementation:
+  Yury Melnichek <yury@melnichek.com>
+  Alexander Borsuk <me@alex.bio>
+  Viktor Govako <viktor.govako@gmail.com>
+  Siarhei Rachytski <siarhei.rachytski@gmail.com>
 
 --------------------------------------------------------------------------------
-Organic Maps (formerly OMaps) contributors:
-(in alphabetic order)
+Organic Maps contributions:
 --------------------------------------------------------------------------------
+  Alexander Borsuk <me@alex.bio>
+  Roman Tsisyk <roman@tsisyk.com>
+  Viktor Govako <viktor.govako@gmail.com>
+  Caspar Nuël <casparnuel@yandex.com>
+  Konstantin Pastbin
+  Nishant Bhandari <nishantbhandari0019@gmail.com>
+  Sebastiao Sousa <sebastiao.sousa@tecnico.ulisboa.pt>
+  Harry Bond <me@hbond.xyz>
+
+Organic Maps translations:
+  Karina Kordon
+  Konstantin Pastbin
+  Metehan Özyürek
+  Joan Montané
+  Luna Rose
 
-Alexander Borsuk <me@alex.bio>
-Alexey Krasilnikov
-Andrew Shkrob
-Anton Makouski
-Arnaud Vergnet
-Arthur-GYT
-Atemu
-Caspar Nuël <casparnuel@yandex.com>
-cyber-toad
-David Martinez
-dbf
-Dzmitry Strekha
-Dzmitry Yarmolenka
-Fabian Wüthrich
-Ferenc Géczi
-Filip Czaplicki
-FinixFighter
-fparri
-Francesco Gazzetta
-gallegonovato
-Gonzalo Pesquero
-Harry Bond <me@hbond.xyz>
-Jaime Marquinez Ferrandiz
-Jean-Baptiste Charron
-Jenny Em
-Joan Montané
-Karina Kordon
-Kavi Khalique
-Kiryl Kaveryn
-Kiryl Razhdzestvenski
-Konstantin Pastbin
-Loïc Hernaut
-Lukas Hamm
-Lukas Kronberger
-Luna Rose
-map-per
-Markku Huotari
-Mateusz Konieczny
-Matheus Gomes
-MbTy1
-Meenbeese
-Metehan Özyürek
-Michał Brzozowski
-Nishant Bhandari <nishantbhandari0019@gmail.com>
-Ognjen Blagojevic
-Osyotr
-renderexpert
-Roman Kuznetsov
-Roman Tsisyk <roman@tsisyk.com>
-Rudo Kemper
-Sebastiao Sousa <sebastiao.sousa@tecnico.ulisboa.pt>
-Sergiy Kozyr
-Tobias G. <tobi.goergens@gmail.com>
-Veniamin Gvozdikov <g.veniamin@googlemail.com>
-Viktor Govako <viktor.govako@gmail.com>
-Will Bradley
 
 --------------------------------------------------------------------------------
-MAPS.ME at Mail.Ru Group (prior to the Organic Maps (OMaps) fork in 2020/2021):
+MAPS.ME contributions (before Organic Maps was forked in 2020-2021):
 --------------------------------------------------------------------------------
-
 Code contributions:
   Dmitry Yunitski
   Lev Dragunov
@@ -138,13 +100,3 @@ Special thanks to:
   Yuri Gurski
   Dmitry Matveev
   Anna Yakovleva
-
---------------------------------------------------------------------------------
-MAPS.ME (originally MapsWithMe) design and implementation at MapsWithMe GmbH
-(from 2010 till the acquisition by Mail.ru Group in 2014):
---------------------------------------------------------------------------------
-
-Yury Melnichek <yury@melnichek.com>
-Alexander Borsuk <me@alex.bio>
-Viktor Govako <viktor.govako@gmail.com>
-Siarhei Rachytski <siarhei.rachytski@gmail.com>

LEGAL

@@ -1,9 +0,0 @@
-Certain project resources, including but not limited to domain names, trademarks, hosting accounts, payment accounts, and others, are overseen and managed by Organic Maps OÜ. The governance of these digital assets is subject to policies established by Organic Maps OÜ, in compliance with applicable statutory laws.
-
-Organic Maps OÜ is a legal entity established on 2021-05-01 under the laws of the Republic of Estonia and the European Union, with registration number 16225385. The primary purpose of the entity is to shield the project's members from personal liability and to ensure the legal protection of the project's assets. Official up-to-date information about the entity can be found in the Estonian Business Register:
-
-https://ariregister.rik.ee/eng/company/16225385/Organic-Maps-O%C3%9C
-
-Organic Maps OÜ does not require contributors to transfer copyright ownership and does not retain any copyright over the code contributed to the repository. See the NOTICE file and docs/DCO.md for additional information.
-
-For any legal inquiries, feel free to contact legal@organicmaps.app.

README.md

@@ -1,17 +1,25 @@
-<div align="center">
-  <img src="qt/res/logo.png" height="100"/>
-</div>
-<h1 align="center"">Organic Maps</h1>
+# Organic Maps
+
+<a name="install"/>
 
 [Organic Maps](https://organicmaps.app) is a free Android & iOS offline maps app for travellers, tourists, drivers, hikers, and cyclists.
 It uses crowd-sourced [OpenStreetMap](https://www.openstreetmap.org) data and is developed with love by the creators of **MapsWithMe** (later renamed to **Maps.Me**) and by our community.
 No ads, no tracking, no data collection, no crapware. Your [donations](https://organicmaps.app/donate/) and positive reviews motivate and inspire us, thanks ❤️!
 
-[<img src="docs/badges/apple-appstore.png" alt="App Store" width="160">](https://apps.apple.com/app/organic-maps/id1567437057)
-[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.organicmaps)
-[<img src="docs/badges/huawei-appgallery.png" alt="AppGallery" width="160">](https://appgallery.huawei.com/#/app/C104325611)
-[<img src="docs/badges/obtainium.png" alt="Obtainium" width="160">](https://github.com/organicmaps/organicmaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)
-[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.organicmaps/)
+<p float="left">
+  <a href="https://apps.apple.com/app/organic-maps/id1567437057">
+    <img alt="Download on the App Store" src="docs/badges/apple-appstore.png" width="180">
+  </a>
+  <a href="https://play.google.com/store/apps/details?id=app.organicmaps">
+    <img alt="Get it on Google Play" src="docs/badges/google-play.png" width="180">
+  </a>
+  <a href="https://appgallery.huawei.com/#/app/C104325611">
+    <img alt="Explore it on AppGallery" src="docs/badges/huawei-appgallery.png" width="180">
+  </a>
+  <a href="https://f-droid.org/en/packages/app.organicmaps/">
+    <img alt="Get it on F-Droid" src="docs/badges/fdroid.png" width="180">
+  </a>
+</p>
 
 <p float="left">
   <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg" width="400" />
@@ -115,14 +123,6 @@ Beloved institutional sponsors below have provided targeted grants to cover some
       <a href="https://www.mythic-beasts.com/">Mythic Beasts</a> ISP <a href="https://www.mythic-beasts.com/blog/2021/10/06/improving-the-world-bit-by-expensive-bit/">provides us</a> two virtual servers with 400 TB/month of free bandwidth to host and serve maps downloads and updates.
     </td>
   </tr>
-  <tr>
-    <td>
-      <a href="https://44plus.vn"><img src="docs/sponsors/44plus.svg" alt="44+ Technologies" width="200px"></a>
-    </td>
-    <td>
-      <a href="https://44plus.vn">44+ Technologies</a> is <a href="https://44plus.vn/organicmaps">providing us </a>with a free dedicated server worth around $12,000/year to serve maps across Vietnam & Southeast Asia.
-    </td>
-  </tr>
   <tr>
     <td>
       <a href="https://futo.org"><img src="docs/sponsors/futo.svg" alt="FUTO" width="200px"></a>

android/app/build.gradle

@@ -22,7 +22,7 @@ buildscript {
       googleFirebaseServicesDefault
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.7.3'
+    classpath 'com.android.tools.build:gradle:8.5.1'
 
     if (googleFirebaseServicesEnabled) {
       println('Building with Google Firebase Services')
@@ -45,6 +45,7 @@ repositories {
 }
 
 apply plugin: 'com.android.application'
+apply from: 'secure.properties'
 if (googleFirebaseServicesEnabled) {
   apply plugin: 'com.google.gms.google-services'
   apply plugin: 'com.google.firebase.crashlytics'
@@ -83,12 +84,11 @@ def osName = System.properties['os.name'].toLowerCase()
 project.ext.appId = 'app.organicmaps'
 project.ext.appName = 'Organic Maps'
 
-// I have Java 21 installed, but this doesn't work on MacOS.
-//java {
-//  toolchain {
-//    languageVersion.set(JavaLanguageVersion.of(17))
-//  }
-//}
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
 
 android {
   namespace 'app.organicmaps'
@@ -100,7 +100,7 @@ android {
   // All properties are read from gradle.properties file
   compileSdk propCompileSdkVersion.toInteger()
 
-  ndkVersion '27.2.12479018'
+  ndkVersion '26.3.11579264'
 
   defaultConfig {
     // Default package name is taken from the manifest and should be app.organicmaps
@@ -129,11 +129,6 @@ android {
         enableVulkanDiagnostics = project.getProperty('enableVulkanDiagnostics')
       }
 
-      def enableTrace = 'OFF'
-      if (project.hasProperty('enableTrace')) {
-        enableTrace = project.getProperty('enableTrace')
-      }
-
       cmake {
         cppFlags '-fexceptions', '-frtti'
         // There is no sense to enable sections without gcc's --gc-sections flag.
@@ -141,8 +136,7 @@ android {
                '-Wno-extern-c-compat'
         arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static',
                   "-DOS=$osName", '-DSKIP_TESTS=ON', '-DSKIP_TOOLS=ON', "-DUSE_PCH=$pchFlag",
-                  "-DNJOBS=$njobs", "-DENABLE_VULKAN_DIAGNOSTICS=$enableVulkanDiagnostics",
-                  "-DENABLE_TRACE=$enableTrace"
+                  "-DNJOBS=$njobs", "-DENABLE_VULKAN_DIAGNOSTICS=$enableVulkanDiagnostics"
         targets 'organicmaps'
       }
     }
@@ -246,11 +240,6 @@ android {
     }
   }
 
-  def securityPropertiesFileExists = file('secure.properties').exists()
-  if (securityPropertiesFileExists) {
-    apply from: 'secure.properties'
-  }
-
   signingConfigs {
     debug {
       storeFile file('debug.keystore')
@@ -260,15 +249,10 @@ android {
     }
 
     release {
-      if (securityPropertiesFileExists) {
-        println('The release signing keys are available')
-        storeFile file(spropStoreFile)
-        storePassword spropStorePassword
-        keyAlias spropKeyAlias
-        keyPassword spropKeyPassword
-      } else {
-        println('The release signing keys are unavailable')
-      }
+      storeFile file(spropStoreFile)
+      storePassword spropStorePassword
+      keyAlias spropKeyAlias
+      keyPassword spropKeyPassword
     }
   }
 
@@ -363,7 +347,7 @@ android {
 }
 
 dependencies {
-  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
   // Google Play Location Services
   //
@@ -377,14 +361,11 @@ dependencies {
   webImplementation 'com.google.android.gms:play-services-location:21.3.0'
   googleImplementation 'com.google.android.gms:play-services-location:21.3.0'
   huaweiImplementation 'com.google.android.gms:play-services-location:21.3.0'
-  // This is the microG project's re-implementation which is permissible on
-  // F-droid because it's Apache-2.0.
-  fdroidImplementation 'org.microg.gms:play-services-location:0.3.6.244735'
 
   // Google Firebase Services
   if (googleFirebaseServicesEnabled) {
     // Import the BoM for the Firebase platform
-    implementation platform('com.google.firebase:firebase-bom:33.5.1')
+    implementation platform('com.google.firebase:firebase-bom:33.1.2')
     // Add the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation 'com.google.firebase:firebase-crashlytics'
@@ -395,29 +376,29 @@ dependencies {
   // > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable
   // We don't use Kotlin, but some dependencies are actively using it.
   // See https://stackoverflow.com/a/75719642
-  implementation 'androidx.core:core:1.15.0'
-  implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.1.10'))
-  implementation 'androidx.annotation:annotation:1.9.1'
+  implementation 'androidx.core:core:1.13.1'
+  implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.0.0'))
+  implementation 'androidx.annotation:annotation:1.8.1'
   implementation 'androidx.appcompat:appcompat:1.7.0'
-  implementation 'androidx.car.app:app:1.7.0-rc01'
-  implementation 'androidx.car.app:app-projected:1.7.0-rc01'
-  implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
-  implementation 'androidx.fragment:fragment:1.8.5'
+  implementation 'androidx.car.app:app:1.7.0-beta01'
+  implementation 'androidx.car.app:app-projected:1.7.0-beta01'
+  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+  implementation 'androidx.fragment:fragment:1.8.2'
   implementation 'androidx.preference:preference:1.2.1'
   implementation 'androidx.recyclerview:recyclerview:1.3.2'
-  implementation 'androidx.work:work-runtime:2.10.0'
-  implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
+  implementation 'androidx.work:work-runtime:2.9.0'
+  implementation 'androidx.lifecycle:lifecycle-process:2.8.4'
   implementation 'com.google.android.material:material:1.12.0'
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106
-  implementation 'com.google.guava:guava:33.3.0-android'
+  implementation 'com.google.guava:guava:33.2.1-android'
   implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha'
   implementation 'net.jcip:jcip-annotations:1.0'
 
   // Test Dependencies
   androidTestImplementation 'androidx.test.ext:junit:1.2.1'
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-core:5.15.2'
+  testImplementation 'org.mockito:mockito-core:5.12.0'
   testImplementation 'org.mockito:mockito-inline:5.2.0'
 }
 
@@ -462,7 +443,7 @@ task prepareGoogleReleaseListing {
 
 play {
   enabled.set(false)
-  track.set('production')
+  track.set('alpha')
   defaultToAppBundles.set(true)
   releaseStatus.set(ReleaseStatus.IN_PROGRESS)
   serviceAccountCredentials.set(file('google-play.json'))

android/app/src/androidTest/java/app/organicmaps/ExampleInstrumentedTest.java

@@ -0,0 +1,28 @@
+package app.organicmaps;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest
+{
+  @Test
+  public void useAppContext()
+  {
+    // Context of the app under test.
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+    assertEquals("app.organicmaps", appContext.getPackageName());
+  }
+}

android/app/src/fdroid/java/app/organicmaps/location

@@ -1 +0,0 @@
-../../../../google/java/app/organicmaps/location

android/app/src/fdroid/java/app/organicmaps/location/LocationProviderFactory.java

@@ -0,0 +1,18 @@
+package app.organicmaps.location;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+public class LocationProviderFactory
+{
+  public static boolean isGoogleLocationAvailable(@NonNull @SuppressWarnings("unused") Context context)
+  {
+    return false;
+  }
+
+  public static BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
+  {
+    return new AndroidNativeProvider(context, listener);
+  }
+}

android/app/src/fdroid/play/listings/ar/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/az-AZ/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/be/release-notes.txt

@@ -1,8 +1,9 @@
-• Новыя дадзеныя OpenStreetMap ад 21 студзеня
-• Адлюстраванне абмежавання хуткасці ў рэжыме навігацыі
-• Android Auto: сартаванне метак, палепшаны запыты на дазвол месцазнаходжання
-• На карту дададзены вежы
-• Дададзена настройка для адключэння спасылак на гатэлі з Kayak.com і магчымасць адмовы пры першым выкарыстанні
-• Дададзены сербская (кірыліца) і латышская мовы
+• Новыя дадзеныя OSM па стане на 10 жніўня
+• Адлюстраванне абмежавання хуткасці і святлафораў у навігатары
+• Аб'ява назваў вуліц у пешаходным навігатары
+• Падтрымка самаабслугоўвання і месцаў для сядзення на адкрытым паветры
+• Выпраўленыя напрамкі паваротаў у Android Auto
+• Імпартаваныя трэкі зараз можна выдаляць
+• Выпраўлена захаванне ў Google Drive, імпарт KMB, і экспарт назваў метак у GPX
 
-…і шматлікае іншае на omaps.org/news
+…больш падрабязней на omaps.org/news

android/app/src/fdroid/play/listings/bg/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/bn-BD/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ca/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/da-DK/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,8 +1,10 @@
-• Neue OpenStreetMap-Daten vom 21. Januar
-• Anzeige eines Geschwindigkeitsbegrenzungsschildes im Navigationsmodus
-• Serbische (Kyrillisch) und Lettische Sprachen hinzugefügt
-• Android Auto: Lesezeichen sortieren, verbessertes Erlebnis bei der Anforderung von Standortberechtigungen
-• Turm-POIs hinzugefügt
-• Eine Einstellung für Kayak.com-Hotellinks und eine Opt-out-Option bei der ersten Nutzung hinzugefügt.
+• Neue OSM-Daten ab 10. August
+• Geschwindigkeitsbegrenzung anzeigen
+• Straßennamen in der Fußgängernavigation ansagen
+• Unterstützung für Selbstbedienung und Sitzplätze im Freien
+• Abbiegehinweise in Android Auto korrigiert
+• Importierte Tracks können jetzt gelöscht werden
+• Speichern in Google Drive, KMB-Import und Export geänderter Lesezeichennamen in GPX korrigiert
+• Aktualisierte Übersetzungen und FAQ in der App
 
-…weitere Details unter omaps.org/news
+…mehr Details omaps.org/de/news

android/app/src/fdroid/play/listings/el-GR/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,8 +1,12 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display current speed limit and traffic light icons in car navigator
+• Announce street names in pedestrian navigation
+• Properly export modified bookmark names in GPX
+• Display road shields in India
+• Self-service and outdoor seating support
+• Fixed import of KMB files
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,8 +1,11 @@
-• Nuevos datos de OpenStreetMap del 21 de enero
-• Límite de velocidad en el modo de navegación
-• Añadidos idiomas serbio (cirílico) y letón
-• Android Auto: opción de ordenar marcadores, mejorada la experiencia al solicitar ubicación
-• Añadidos PDI de torres
-• Añadidas opciones para enlaces de hotel de Kayak.com y de exclusión al primer uso
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
-…más detalles en omaps.org/news
+…more details at omaps.org/news

android/app/src/fdroid/play/listings/et/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/eu-ES/release-notes.txt

@@ -1,8 +1,11 @@
-• Urtarrilaren 21ko OpenStreetMap-eko datu berriak
-• Abiadura muga erakusten da nabigazio moduan
-• Serbiera (zirilikoa) eta letoniera hizkuntzak gehitu dira
-• Android Auto: gogokoak ordena daitezke, kokapen permisuaren eskaeraren esperientzia hobetu da
-• Dorreen interes puntuak gehitu dira
-• Kayak.com-eko hotelen estekak eta lehenengo erabileran ez erakusteko aukera gehitu dira
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
-…zehaztasun gehiago omaps.org/news webgunean
+…more details at omaps.org/news

android/app/src/fdroid/play/listings/fa/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/fi-FI/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,8 +1,9 @@
-• Nouvelles données OpenStreetMap du 21 janvier
-• Afficher un panneau de limitation de vitesse en mode navigation
-• Ajout des langues serbe (cyrillique) et lettone
-• Android Auto : trier les signets, expérience de demande d'autorisation de localisation améliorée
-• Ajout de POI de tour
-• Ajout d'un paramètre pour les liens d'hôtel Kayak.com et d'une option de désinscription lors de la première utilisation
+• Nouvelles données OSM à partir du 10 août
+• Afficher la limite de vitesse
+• Annoncer les noms de rue dans la navigation piétonne
+• Prise en charge des informations relatives au libre-service et aux places assises en extérieur d'un lieu
+• Correction des directions de virage dans Android Auto
+• Les pistes importées peuvent désormais être supprimées
+• Correction de l'enregistrement sur Google Drive, de l'importation KMB et de l'exportation des noms de signets modifiés dans GPX
 
-…plus de détails sur omaps.org/news
+omaps.org/fr/news

android/app/src/fdroid/play/listings/gl-ES/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/gu/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/hi-IN/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/hr/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/hu-HU/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/id/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/it-IT/release-notes.txt

@@ -1,8 +1,12 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+Dati OSM aggiornati al 10 agosto
 
-…more details at omaps.org/news
+• Mostra limite di velocità
+• Annuncia nomi delle strade in modalità pedonale
+• Mostra self-service e posti a sedere all'aperto
+• Corrette indicazioni di svolta in Android Auto
+• Elimina tracce importate
+• Salva su Google Drive, importa KMB ed esporta segnalibri modificati in GPX
+• Pulsante livelli in alto a sinistra più evidente in modalità metro, altitudine o all'aperto
+• Traduzioni e FAQ aggiornate nell'app
+
+…ulteriori dettagli su omaps.org/it/news

android/app/src/fdroid/play/listings/iw-IL/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ja-JP/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ka-GE/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/kk/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/km-KH/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/kn-IN/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ko-KR/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/lo-LA/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/lt/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/lv/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/mk-MK/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ml-IN/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/mr-IN/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ms/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ne-NP/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/nl-NL/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/no-NO/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/pl-PL/release-notes.txt

@@ -1,8 +1,11 @@
-• Nowe dane OpenStreetMap z 21 stycznia
-• Wyświetlanie znaku ograniczenia prędkości w trybie nawigacji
-• Dodano języki serbski (cyrylica) i łotewski
-• Android Auto: sortowanie zakładek, ulepszono prośbę o pozwolenie na lokalizację
-• Dodano POI dla wieży
-• Dodano ustawienie dla linków do hoteli na Kayak.com oraz możliwość wyłączenia ich przy pierwszym uruchomieniu
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
-…więcej szczegółów na omaps.org/news
+…more details at omaps.org/news

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,8 +1,10 @@
-• Novos dados do OpenStreetMap de 21 de janeiro
-• Exibe um sinal de limite de velocidade no modo de navegação
-• Adicionados os idiomas sérvio (cirílico) e letão
-• Android Auto: classificar favoritos, experiência aprimorada de solicitação de permissão de localização
-• Adicionados POIs de torre
-• Adicionada uma configuração para links de hotéis Kayak.com e uma opção de cancelamento de primeiro uso
+• Novos dados OSM de 10/08
+• Mostra o limite de velocidade
+• Anuncia nomes de ruas para pedestres
+• Suporte para autoatendimento e assentos ao ar livre
+• Correção de direções de conversão no Android Auto
+• Trilhas importadas podem ser excluídas
+• Correção de salvamento no Google Drive, importação de KMB e exportação de nomes de favoritos modificados em GPX
+• Destaca o botão Camadas quando Ar-Livre, Relevo ou Metrô estiverem ativados
 
-…mais detalhes em omaps.org/news
+…mais detalhes em omaps.org/pt-BR/news

android/app/src/fdroid/play/listings/pt-PT/release-notes.txt

@@ -1,8 +1,10 @@
-• Novos dados do OpenStreetMap a 21 de janeiro
-• Exibir um sinal de limite de velocidade no modo de navegação
-• Adicionados os idiomas sérvio (cirílico) e letão
-• Android Auto: classificar favoritos, experiência melhorada de pedido de permissão de localização
-• Adicionados POIs de torre
-• Foi adicionada uma configuração para o Kayak.com Hotel Links e uma opção de cancelamento de primeira utilização
+• Novos dados OSM de 10/08
+• Mostra o limite de velocidade
+• Anuncia nomes de ruas para peões
+• Suporte para autoatendimento e assentos ao ar livre
+• Correção de direções de conversão no Android Auto
+• Trilhos importados podem ser excluídos
+• Correção de salvamento no Google Drive, importação de KMB e exportação de nomes de favoritos modificados em GPX
+• Destaca o botão Camadas quando Ar-Livre, Relevo ou Metro estiverem ativados
 
-…mais detalhes em omaps.org/news
+…mais detalhes em omaps.org/pt/news

android/app/src/fdroid/play/listings/ro/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,8 +1,9 @@
-• Новые данные OpenStreetMap от 21 января
-• Отображение ограничения скорости в режиме навигации
-• Android Auto: сортировка меток, улучшены запросы на разрешение местоположения
-• На карту добавлены башни
-• Добавлена ​​настройка для отключения ссылок на отели с Kayak.com и возможность отказа при первом использовании
-• Добавлены сербский (кириллица) и латышский языки
+• Новые данные OSM по состоянию на 10 августа
+• Отображение ограничения скорости и светофоров в навигаторе
+• Объявление названий улиц в пешеходном навигаторе
+• Поддержка самообслуживания и мест для сидения на открытом воздухе
+• Исправлены направления поворотов в Android Auto
+• Импортированные треки теперь можно удалять
+• Исправлено сохранение в Google Drive, импорт KMB, и экспорт названий меток в GPX
 
-…и многое другое на omaps.org/news
+…и многое другое на omaps.org/ru/news

android/app/src/fdroid/play/listings/si-LK/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/sk/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/sl/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/sr/full-description.txt

@@ -1,53 +1,53 @@
-‣ Наша бесплатна апликација вас не прати, нема рекламе и потребна јој је ваша подршка.
-‣ Континуирано се побољшава од стране сарадника и нашег малог тима, у наше слободно време.
-‣ Ако нешто није у реду или недостаје на мапи, исправите то на <b>OpenStreetMap-у</b> и видите своје промене у будућим ажурирањима мапа.
-‣ Ако навигација или претрага не раде, прво проверите то на osm.org, а затим нам пошаљите е-пошту. Одговарамо на <i>СВАКУ</i> поруку и поправљамо у најкраћем могућем року!
+‣ Our free app does not track you, does not have ads, and it needs your support.
+‣ It is constantly being improved by contributors and our small team, in our free time.
+‣ If something is wrong or missing on the map, please fix it in <b>OpenStreetMap</b> and see your changes in the future maps update.
+‣ If navigation or search doesn't work, please check it on osm.org first, and then email us. We reply to <i>EVERY</i> email, and we'll fix it ASAP!
 
-<b>Ваше повратне информације и рецензије са 5 звездица су најбољи мотиватори за нас!</b>
+<b>Your feedback and 5-star reviews are the best motivators for us!</b>
 
-Кључне карактеристике:
+Key features:
 
-• Бесплатно, отвореног кода, без реклама, без праћења
-• Детаљне мапе без интернета са местима која не постоје на Google мапама, захваљујући <b>OpenStreetMap</b> заједници
-• Бициклистичке стазе, пешачке стазе и стазе за шетњу
-• Контурне линије, профили надморске висине, врхови и нагиби
-• Пешачење, вожња бицикла и навигација скретање-по-скретање са гласовним навођењем и Андроид Аутом
-• Брза претрага без интернета
-• Извоз и увоз маркера и путања у KML, KMZ, GPX формату
-• Тамни режим за заштиту очију
+• Free, open-source, no ads, no tracking
+• Detailed offline maps with places that don't exist on Google maps, thanks to the <b>OpenStreetMap</b> community
+• Cycling routes, hiking trails, and walking paths
+• Contour lines, elevation profiles, peaks, and slopes
+• Turn-by-turn walking, cycling, and car navigation with voice guidance and Android Auto
+• Fast offline search
+• Bookmarks and tracks export and import in KML, KMZ, GPX formats
+• Dark mode to protect your eyes
 
-Нема јавног превоза, сателитских мапа и других занимљивих функција <i>још</i> у Organic Maps-у. Али из <i>вашу помоћ и подршку</i>, можемо постепено направити боље мапе.
+There is no public transport, satellite maps, and other cool features <i>yet</i> in Organic Maps. But with <i>your help and support</i>, we can make better maps step by step.
 
-Organic Maps је <b>чиста и органска, направљена с љубављу</b>:
+Organic Maps is <b>pure and organic, made with love</b>:
 
-• Невероватно брзо искуство без интернета
-• Поштује вашу приватност
-• Штеди батерију
-• Нема неочекиваних трошкова мобилних података
-• Једноставан за употребу, са укљученим само најважнијим функцијама
+• Blazing fast offline experience
+• Respects your privacy
+• Saves your battery
+• No unexpected mobile data charges
+• Simple to use, with only most important features included
 
-Без праћења и других лоших ствари:
+Free from trackers and other bad stuff:
 
-• Нема реклама
-• Нема праћења
-• Нема прикупљања података
-• Нема телефонирања кући
-• Нема досадне регистрације
-• Нема обавезних туторијала
-• Нема бучне нежељене е-поште
-• Нема пуш обавештења
-• Нема crapware-а
-• Б̶е̶з̶ ̶п̶е̶с̶т̶и̶ц̶и̶да̶ Чисто органско
+• No ads
+• No tracking
+• No data collection
+• No phoning home
+• No annoying registration
+• No mandatory tutorials
+• No noisy email spam
+• No push notifications
+• No crapware
+• N̶o̶ ̶p̶e̶s̶t̶i̶c̶i̶d̶e̶s̶ Purely organic
 
-Organic Maps, верује да је <b>приватност основно право човека</b>:
+At Organic Maps, we believe that <b>privacy is a fundamental human right</b>:
 
-• Organic Maps пројекат отвореног кода који води заједница
-• Штитимо приватност од радозналих очију технолошких гиганата
-• Будите безбедни где год да се налазите
+• Organic Maps is an indie community-driven open-source project
+• We protect privacy from Big Tech's prying eyes
+• Stay safe no matter wherever you are
 
-Према Exodus Privacy Report-у, откривено је нула трагача и само минимално потребне дозволе.
+Zero trackers and only minimally required permissions are found according to Exodus Privacy Report.
 
-Молимо посетите <b><i>organicmaps.app</i></b> веб-сајт за више информација и прочитајте FAQ, контактирајте нас путем Telegram-а директно на адресу @OrganicMapsApp.
+Please visit <b><i>organicmaps.app</i></b> website for additional details and FAQ, and contact us directly at @OrganicMapsApp in Telegram.
 
-Одбаците надзор - прихватите своју слободу.
-<b>Испробајте Organic Maps!</b>
+Reject surveillance - embrace your freedom.
+<b>Give Organic Maps a try!</b>

android/app/src/fdroid/play/listings/sr/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/sr/short-description.txt

@@ -1 +1 @@
-Отворене мапе из заједнице за путнике, туристе, бициклисте и планинаре
+Open-source, community-driven maps for travelers, tourists, cyclists & hikers

android/app/src/fdroid/play/listings/sr/title-google.txt

@@ -1 +1 @@
-Organic Maps — офлајн мапе
+Offline Organic Maps Hike Bike

android/app/src/fdroid/play/listings/sr/title.txt

@@ -1 +1 @@
-Organic Maps, офлајн мапе и GPS навигатор
+Organic Maps Offline Hike, Bike, GPS Navigation

android/app/src/fdroid/play/listings/sv-SE/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/th/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/tr-TR/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/uk/release-notes.txt

@@ -1,8 +1,9 @@
-• Нові дані OpenStreetMap від 21 січня
-• Знак перевищення швидкості підчас навігації
-• Додано перклади сербською (кирилиця) та латиською мовами
-• Android Auto: сортування міток, покращено процес запиту на отримання дозволу на розміщення
-• Вежі відображаються на мапі
-• Додано налаштування для посилань до Kayak.com для готелів та демонструється запит при першому використанні
+• Нові дані OSM станом на 10 серпня
+• Відображення обмеження швидкості та світлофорів у навігаторі
+• Оголошення назв вулиць у пішохідному навігаторі
+• Підтримка самообслуговування та місць для сидіння на відкритому повітрі
+• Виправлені напрямки поворотів у Android Auto
+• Імпортовані треки тепер можна видаляти
+• Виправлено збереження в Google Drive, імпорт KMB та експорт назв міток у GPX
 
-…більше подробиць на omaps.org/news
+…і багато іншого на omaps.org/uk/news

android/app/src/fdroid/play/listings/ur/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/vi/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-CN/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-HK/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/listings/zh-TW/release-notes.txt

@@ -1,8 +1,11 @@
-• New OpenStreetMap data as of January 21
-• Dispay a speed limit sign in the navigation mode
-• Added Serbian (Cyrillic) and Latvian languages
-• Android Auto: sort bookmarks, improved location permission request experience
-• Added tower POIs
-• Added a setting for Kayak.com Hotel Links and a first-use opt-out option
+• New OSM data as of August 10
+• Display the speed limit
+• Announce street names in pedestrian navigation
+• Self-service and outdoor seating support
+• Fixed turn directions in Android Auto
+• Imported tracks can now be deleted
+• Fixed saving to Google Drive, KMB import, and modified bookmark names export in GPX
+• Highlight top left Layers button when Subway, Elevation or Outdoors are activated
+• Updated translations and FAQ in the app
 
 …more details at omaps.org/news

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.01.26-9-FDroid+25012609
+version: 2024.08.16-5-FDroid+24081605

android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java

@@ -52,7 +52,9 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
     @Override
     public void onLocationAvailability(@NonNull LocationAvailability availability)
     {
-      Logger.w(TAG, "isLocationAvailable = " + availability.isLocationAvailable());
+      if (!availability.isLocationAvailable()) {
+        Logger.w(TAG, "isLocationAvailable returned false");
+      }
     }
   }
 

android/app/src/main/AndroidManifest.xml

@@ -37,8 +37,6 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
   <!--
     Android 13 (API level 33) and higher supports a runtime permission for sending non-exempt (including Foreground
     Services (FGS)) notifications from an app.
@@ -52,14 +50,6 @@
     <intent>
       <action android:name="android.intent.action.TTS_SERVICE"/>
     </intent>
-    <intent>
-      <action android:name="android.intent.action.OPEN_DOCUMENT_TREE"/>
-    </intent>
-    <intent>
-      <action android:name="android.intent.action.VIEW" />
-      <category android:name="android.intent.category.BROWSABLE" />
-      <data android:scheme="https" />
-    </intent>
   </queries>
 
   <supports-screens
@@ -80,14 +70,12 @@
       android:resizeableActivity="true"
       android:supportsRtl="true"
       android:networkSecurityConfig="@xml/network_security_config"
-      android:manageSpaceActivity="${applicationId}.ManageSpaceActivity"
       tools:targetApi="33">
 
     <!-- Allows for config and orientation change without killing/restarting main activity -->
     <activity
       android:name="app.organicmaps.SplashActivity"
       android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
-      android:screenOrientation="fullUser"
       android:exported="true">
 
       <intent-filter>
@@ -122,7 +110,7 @@
         <data android:scheme="https"/>
         <data android:host="omaps.app"/>
       </intent-filter>
-
+        
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
 
@@ -346,8 +334,7 @@
 
     <activity
         android:name="app.organicmaps.DownloadResourcesLegacyActivity"
-        android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"/>
+        android:configChanges="orientation|screenLayout|screenSize"/>
 
     <activity-alias
       android:name="app.organicmaps.DownloadResourcesActivity"
@@ -364,18 +351,11 @@
         android:name="app.organicmaps.MwmActivity"
         android:launchMode="singleTask"
         android:configChanges="uiMode"
-        android:screenOrientation="fullUser"
         android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
 
-    <activity-alias
-        android:name="${applicationId}.ManageSpaceActivity"
-        android:exported="true"
-        android:targetActivity=".SplashActivity" />
-
     <activity
         android:name="app.organicmaps.downloader.DownloaderActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/download_maps"
         android:parentActivityName="app.organicmaps.MwmActivity"
         android:windowSoftInputMode="adjustResize" />
@@ -383,7 +363,6 @@
     <activity
         android:name="app.organicmaps.search.SearchActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/search_map"
         android:parentActivityName="app.organicmaps.MwmActivity"
         android:windowSoftInputMode="stateVisible|adjustResize" />
@@ -391,7 +370,6 @@
     <activity
         android:name="app.organicmaps.settings.SettingsActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/settings"
         android:parentActivityName="app.organicmaps.MwmActivity" />
 
@@ -409,7 +387,6 @@
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/bookmarks_and_tracks"
         android:parentActivityName="app.organicmaps.MwmActivity"
         android:windowSoftInputMode="adjustResize" />
@@ -417,7 +394,6 @@
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkListActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/bookmarks"
         android:parentActivityName="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
         android:windowSoftInputMode="adjustResize" />
@@ -425,7 +401,6 @@
     <activity
         android:name="app.organicmaps.editor.EditorActivity"
         android:configChanges="orientation|screenLayout|screenSize"
-        android:screenOrientation="fullUser"
         android:label="@string/edit_place"
         android:parentActivityName="app.organicmaps.MwmActivity"
         android:windowSoftInputMode="adjustResize" />
@@ -459,21 +434,14 @@
       android:label="@string/driving_options_title"/>
     <activity
         android:name="app.organicmaps.MapPlaceholderActivity"/>
-    <activity
-        android:name="app.organicmaps.car.screens.permissions.RequestPermissionsActivity"/>
     <service
         android:name="app.organicmaps.car.CarAppService"
-        android:exported="true"
-        tools:ignore="ExportedService">
+        android:foregroundServiceType="location"
+        android:exported="true">
       <intent-filter>
         <action android:name="androidx.car.app.CarAppService" />
         <category android:name="androidx.car.app.category.NAVIGATION" />
       </intent-filter>
-      <intent-filter>
-        <action android:name="androidx.car.app.action.NAVIGATE" />
-        <category android:name="android.intent.category.DEFAULT"/>
-        <data android:scheme="geo" />
-      </intent-filter>
     </service>
 
     <service
@@ -483,20 +451,6 @@
         android:enabled="true"
         android:stopWithTask="false"/>
 
-    <service android:name=".location.TrackRecordingService"
-      android:foregroundServiceType="location"
-      android:exported="false"
-      android:enabled="true"
-      android:stopWithTask="false"
-      />
-
-    <service
-        android:name=".downloader.DownloaderService"
-        android:foregroundServiceType="dataSync"
-        android:exported="false"
-        android:enabled="true"
-        android:stopWithTask="false"/>
-
     <provider
       android:name="androidx.core.content.FileProvider"
       android:authorities="${FILE_PROVIDER_PLACEHOLDER}"
@@ -512,8 +466,8 @@
     <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing" android:value="false" />
     <!-- Disable Google's anonymous stats collection -->
     <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true" />
-
-    <!-- Version >= 3.0. Dex Dual Mode support for compatible Samsung devices.
+    
+    <!-- Version >= 3.0. Dex Dual Mode support for compatible Samsung devices. 
          See the documentation: https://developer.samsung.com/samsung-dex/modify-optimizing.html //-->
     <meta-data android:name="com.samsung.android.multidisplay.keep_process_alive" android:value="true" />