From a39b3a99211a575d582dc223e7c64ddcdb875a60 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 20 Jul 2025 23:42:45 -0300
Subject: [PATCH] [android] Fixed getting drawable icons.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../java/app/organicmaps/sdk/OrganicMaps.java |  3 +++
 .../organicmaps/sdk/bookmarks/data/Icon.java  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 627d0c746..db25ce0c5 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -9,6 +9,7 @@ import androidx.lifecycle.ProcessLifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
@@ -96,6 +97,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 
     Android7RootCertificateWorkaround.initializeIfNeeded(mContext);
 
+    Icon.loadDefaultIcons(mContext.getResources(), mContext.getPackageName());
+
     mSensorHelper = new SensorHelper(mContext);
     mLocationHelper = new LocationHelper(mContext, mSensorHelper);
     mIsolinesManager = new IsolinesManager(mContext);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index 695552669..a97fabaf6 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -1,5 +1,6 @@
 package app.organicmaps.sdk.bookmarks.data;
 
+import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.ColorInt;
@@ -18,7 +19,7 @@ public class Icon implements Parcelable
   static final int BOOKMARK_ICON_TYPE_NONE = 0;
 
   @DrawableRes
-  private static final int[] TYPE_ICONS = GetTypeIcons();
+  private static int[] sTypeIcons = null;
 
   @PredefinedColors.Color
   private final int mColor;
@@ -69,7 +70,9 @@ public class Icon implements Parcelable
   @DrawableRes
   public int getResId()
   {
-    return TYPE_ICONS[mType];
+    // loadDefaultIcons should be called
+    assert (sTypeIcons != null);
+    return sTypeIcons[mType];
   }
 
   @Override
@@ -100,30 +103,25 @@ public class Icon implements Parcelable
     }
   };
 
-  @NonNull
-  @DrawableRes
-  private static int[] GetTypeIcons()
+  static public void loadDefaultIcons(@NonNull Resources resources, @NonNull String packageName)
   {
     final String[] names = nativeGetBookmarkIconNames();
     int[] icons = new int[names.length];
     for (int i = 0; i < names.length; i++)
     {
       final String name = StringUtils.toSnakeCase(names[i]);
-      try
-      {
-        icons[i] = app.organicmaps.sdk.R.drawable.class.getField("ic_bookmark_" + name).getInt(null);
-      }
-      catch (NoSuchFieldException | IllegalAccessException e)
+      icons[i] = resources.getIdentifier("ic_bookmark_" + name, "drawable", packageName);
+      if (icons[i] == 0)
       {
         Logger.e(TAG, "Error getting icon for " + name);
         // Force devs to add an icon for each bookmark type.
         if (BuildConfig.DEBUG)
-          throw new RuntimeException("Error getting icon for " + name, e);
+          throw new RuntimeException("Error getting icon for " + name);
         icons[i] = app.organicmaps.sdk.R.drawable.ic_bookmark_none; // Fallback icon
       }
     }
 
-    return icons;
+    sTypeIcons = icons;
   }
 
   @FastNative