pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android-auto] Fix device switch button

Browse source 
Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
This commit is contained in:
Andrew Shkrob 2024-01-24 20:08:39 +01:00 • committed by Roman Tsisyk
parent 555eabd0bb
commit e8106e61f0
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/app/src/main/cpp/app/organicmaps/MapManager.cpp
View file

@ -496,7 +496,6 @@ Java_app_organicmaps_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNI
{
g_framework->NativeFramework()->SetCurrentCountryChangedListener(nullptr);
ASSERT(g_countryChangedListener, ());
env->DeleteGlobalRef(g_countryChangedListener);
g_countryChangedListener = nullptr;
}

6
android/app/src/main/java/app/organicmaps/Map.java
View file

@ -71,7 +71,6 @@ public final class Map
@Nullable
private CallbackUnsupported mCallbackUnsupported;
// Anyway it is not working as expected and looks suspicious for me.
private static int sCurrentDpi = 0;
public Map(DisplayType mapType)
@ -147,9 +146,7 @@ public final class Map
{
if (sCurrentDpi != surfaceDpi)
{
// Do not invoke Framework::UdateDpi after initial surface creation.
if (sCurrentDpi != 0)
nativeUpdateEngineDpi(surfaceDpi);
nativeUpdateEngineDpi(surfaceDpi);
sCurrentDpi = surfaceDpi;
setupWidgets(context, surfaceFrame.width(), surfaceFrame.height());
@ -179,6 +176,7 @@ public final class Map
mCallbackUnsupported.report();
return;
}
sCurrentDpi = surfaceDpi;
if (firstStart)
UiThread.runLater(locationHelper::onExitFromFirstRun);

14
android/app/src/main/java/app/organicmaps/MapFragment.java
View file

@ -26,9 +26,6 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
private static final String TAG = MapFragment.class.getSimpleName();
private final Map mMap = new Map(DisplayType.Device);
@Nullable
private Runnable mNotifyOnSurfaceDestroyed;
public void updateCompassOffset(int offsetX, int offsetY)
{
mMap.updateCompassOffset(requireContext(), offsetX, offsetY, true);
@ -80,11 +77,6 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
{
Logger.d(TAG);
mMap.onSurfaceDestroyed(requireActivity().isChangingConfigurations(), true);
if (mNotifyOnSurfaceDestroyed != null)
{
mNotifyOnSurfaceDestroyed.run();
mNotifyOnSurfaceDestroyed = null;
}
}
@Override
@ -192,10 +184,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
public void notifyOnSurfaceDestroyed(@NonNull Runnable task)
{
if (mMap.isContextCreated())
mNotifyOnSurfaceDestroyed = task;
else
task.run();
mMap.onSurfaceDestroyed(false, true);
task.run();
}
private void reportUnsupported()