comaps/comaps

Fork 161

Code Issues 1.3k Pull requests 60 Projects 4 Releases 30 Wiki Activity Actions 13

[core][android] Add core function to get all android system languages for map #2684

Merged

x7z4w merged 1 commit from gekeleda/comaps:consider_all_android_system_langs_for_map into main

2025年11月25日 11:17:06 +01:00

Conversation 3 Commits 1 Files changed 3 +59 -12

gekeleda commented

2025年11月23日 22:06:56 +01:00

Member

Copy link

A brief test with both my real device and an emulator worked without issues, now showing also Wikipedia articles from non-primary system languages, and also preferring them for POI names when applicable (see #1076).

Signed-off-by: gekeleda git@davidgekeler.eu

Enables #1076 for Android as well. Note that the JNI part I generated with AI (the rest not). I did go over the code to verify it's logic to the best of my knowledge. But would be best for someone else to go over it as well :) A brief test with both my real device and an emulator worked without issues, now showing also Wikipedia articles from non-primary system languages, and also preferring them for POI names when applicable (see #1076). Signed-off-by: gekeleda <git@davidgekeler.eu>

❤️ 1

gekeleda force-pushed consider_all_android_system_langs_for_map from 88f092db35

All checks were successful

Android Check Store Metadata / Check app metadata (pull_request) Successful in 6s

Details

DCO / check (pull_request) Successful in 2s

Details

iOS Check metadata / Check app metadata (pull_request) Successful in 4s

Details

to c3ae163d5c

All checks were successful

DCO / check (pull_request) Successful in 3s

Details

2025年11月24日 01:12:41 +01:00

Compare

gekeleda changed title from ~~(削除) [core][android] Add core function to get all android system languages for map stuff (削除ここまで)~~ to [core][android] Add core function to get all android system languages for map

2025年11月24日 01:12:53 +01:00

jeanbaptisteC

2025年11月24日 06:46:54 +01:00

added the
Android
label
requested review from Android

x7z4w requested changes

2025年11月24日 09:07:26 +01:00

Dismissed

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -11,3 +11,3 @@

/// This function is called from native c++ code

std::string GetAndroidSystemLanguage()

std::string GetDefaultAndroidSystemLanguage()

x7z4w commented

2025年11月24日 08:56:02 +01:00

Owner

Copy link

Is it still needed? You return the default locale from Java.

gekeleda commented

2025年11月24日 23:15:44 +01:00

Author

Member

Copy link

Removed 👍

gekeleda marked this conversation as resolved

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -37,0 +40,4 @@

if (!env)

{

LOG(LWARNING, ("Can't get JNIEnv"));

return { GetDefaultAndroidSystemLanguage() };

x7z4w commented

2025年11月24日 08:57:06 +01:00

Owner

Copy link

"en" here if GetDefaultAndroidSystemLanguage is not needed

`"en"` here if `GetDefaultAndroidSystemLanguage` is not needed

gekeleda commented

2025年11月24日 23:15:59 +01:00

Author

Member

Copy link

Done 👍

gekeleda marked this conversation as resolved

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -37,0 +52,4 @@

jni::TScopedLocalRef resultArray(

env, env->CallStaticObjectMethod(languageClass, getSystemLocalesId));

if (!resultArray.get())

x7z4w commented

2025年11月24日 08:54:14 +01:00

Owner

Copy link

Unreachable, remove.

gekeleda commented

2025年11月24日 23:16:05 +01:00

Author

Member

Copy link

Removed 👍

gekeleda marked this conversation as resolved

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -37,0 +64,4 @@

std::vector<std::string> languages;

languages.reserve(len);

for (jsize i = 0; i < len; ++i)

x7z4w commented

2025年11月24日 09:03:30 +01:00

Owner

Copy link

jsize -> size_t

`jsize` -> `size_t`

gekeleda commented

2025年11月24日 23:16:16 +01:00

Author

Member

Copy link

Changed 👍

gekeleda marked this conversation as resolved

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -37,0 +69,4 @@

jni::TScopedLocalRef elem(env, env->GetObjectArrayElement(array, i));

std::string lang = jni::ToNativeString(env, (jstring)elem.get());

if (!lang.empty())

x7z4w commented

2025年11月24日 08:57:51 +01:00

Owner

Copy link

Always true? Remove the condition.

gekeleda commented

2025年11月24日 23:16:22 +01:00

Author

Member

Copy link

Removed 👍

gekeleda marked this conversation as resolved

android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp Outdated

@ -37,0 +73,4 @@

languages.push_back(lang);

}

if (languages.empty())

x7z4w commented

2025年11月24日 08:59:34 +01:00

Owner

Copy link

Unreachable, remove

gekeleda commented

2025年11月24日 23:16:27 +01:00

Author

Member

Copy link

Removed 👍

gekeleda marked this conversation as resolved

x7z4w force-pushed consider_all_android_system_langs_for_map from 8c6223be9b

All checks were successful

Android Check Store Metadata / Check app metadata (pull_request) Successful in 6s

Details

DCO / check (pull_request) Successful in 3s

Details

iOS Check metadata / Check app metadata (pull_request) Successful in 4s

Details

to df20fd1b4b

Some checks failed

Android Check Store Metadata / Check app metadata (pull_request) Successful in 6s

Details

DCO / check (pull_request) Successful in 2s

Details

iOS Check metadata / Check app metadata (pull_request) Successful in 4s

Details

Cleanup caches by a branch / cleanup (pull_request) Failing after 2s

Details

2025年11月25日 11:15:49 +01:00

Compare

x7z4w approved these changes

2025年11月25日 11:16:43 +01:00

x7z4w left a comment

Copy link

Thanks!

x7z4w merged commit 1d087ca854 into main

2025年11月25日 11:17:06 +01:00

gekeleda commented

2025年11月25日 18:07:50 +01:00

Author

Member

Copy link

Sure, thank you for the quick and detailed review!

Reviewers

No reviewers

x7z4w

comaps/Android

Labels

Clear labels

accessibility

Visual contrast, screen readers, etc.

addresses

AI-assisted

AI-assisted PRs or issues

Android

Android app

Android Auto

Android Auto integration

Android Automotive

Android Automotive app

api

Deeplinks and URLs handled by the API

app stores

Google Play, App Store, F-Droid, Obtanium, Huawei Gallery, Acressent, Flathub, IzzyOnDroid, etc.

battery & performance

Performance and battery consumption-related problems and optimisations

borders

bug

Something is not working

building of apps

CarPlay integration

Community relations

Contributions are very welcome, get started here

core

C++ core of the app

crash

Crash reporting

cycling

Specific to using a bicycle or similar vehicles

desktop

Qt desktop app incl. designer

devops

directions

Voice and visual turn-by-turn directions

docs

Documentation

downloader

Map downloader

drape

The C++ map rendering engine

driving

Specific to driving a car or similar vehicles

duplicate

This issue or pull request already exists

editor

Built-in OSM editor

elevation

Contour lines, elevation profiles, ...

enhancement

New feature

EPIC

A big idea or a piece of work that requires a lot of effort to implement

F-Droid

F-Droid platform

favorites

Places and GPS tracks

feature parity

A feature is implemented on one platform, but not on another

fonts

Fonts

good first issue

Interested in contributing? Get started here

Need some help

Map features icons

Something is wrong

iOS app

Legal aspects

LibreM, PinePhone and other mobile linuxes

location

Via GPS, network, etc.

macOS

Emulated iOS App or Qt Desktop App specifically related to macOS

map data

Related to OpenStreetMap data

mapgen needed

map generation is needed for PR to take full effect

maps compat

compatibility of newer maps with older apps; issues and PRs breaking or fixing compatibility

maps generator

Maps generator

navigation

The navigation turn-by-turn app mode

need feedback

Further information is requested

needs design

not planned

This is not planned at the moment

Related to or references Organic Maps

opening hours

outdoor

Hiking, backcountry cycling, 4WD, etc.

POI info

Various feature attributes usually displayed on the place page

priority

High

Seriously affects a lot of users or breaks the app severely

priority

Low

Not urgent or only happens in rare cases

priority

Medium

Happens enough to be a concern, but not app-breaking

privacy

Privacy aspects

public feedback needed

Experimental changes which requite explicit public feedback before continuing with them

public transport

Specific to public transport (busses, trams, subways, trains etc.)

question

Questions and Discussions

raw idea

Needs more discussion or to be further elaborated

refactoring

Improving the structure or simplifying the code, improving maintainability

regional

Different depending on the country or region

regression

Regression in the app

releases

Release management

route planning

Preview and plan your route

routing

Routing engine

Search inside of the app

security

Security improvements

source data

Related to OSM, SRTM, Tiger etc.

styles

Map styling, incl. mapping OSM tags

subway

The special subway layer

task

Internal things that have a clear way for implementation

tests

Unit tests

track recording

Track recording

traffic

Traffic information (still under development)

translations

Translations and all other kinds of localisation

TTS

Text-to-Speech

User interface

User experience

wait for upstream

Waiting for something to be done upstream

Specific to walking

Windows related

The world overview map

No labels

battery & performance

public feedback needed

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

comaps/comaps!2684

No description provided.

Delete branch "gekeleda/comaps:consider_all_android_system_langs_for_map"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?