From 431e305a48f58deffc43cc1faaae193bd628dc06 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 17:25:39 +0200
Subject: [PATCH] [android][sdk] Move getDonateUrl outside sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../src/main/java/app/organicmaps/MwmActivity.java   |  2 +-
 .../main/java/app/organicmaps/help/HelpFragment.java |  2 +-
 .../organicmaps/maplayer/MapButtonsController.java   |  1 +
 .../src/main/java/app/organicmaps/util/Utils.java    | 12 ++++++++++++
 .../main/java/app/organicmaps/sdk/util/Config.java   |  9 ++-------
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index e6b651be9..27c07690f 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -2549,7 +2549,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(),
                                         this::onDownloadMapsOptionSelected));
 
-      mDonatesUrl = Config.getDonateUrl(getApplicationContext());
+      mDonatesUrl = Utils.getDonateUrl(getApplicationContext());
       if (!mDonatesUrl.isEmpty())
         items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected));
 
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index f5535e6d6..4b43c0155 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -45,7 +45,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    mDonateUrl = Config.getDonateUrl(requireContext());
+    mDonateUrl = Utils.getDonateUrl(requireContext());
     View root = inflater.inflate(R.layout.about, container, false);
 
     ((MaterialTextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 28e760076..02ed48520 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -38,6 +38,7 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java
index 8a13d4e73..ea3dd9ec1 100644
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -39,6 +39,7 @@ import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.Distance;
 import app.organicmaps.sdk.util.StringUtils;
@@ -482,4 +483,15 @@ public class Utils
     final LocalTime time = LocalTime.now().plusSeconds(seconds);
     return StringUtils.formatUsingUsLocale("%d:%02d", time.getHour(), time.getMinute());
   }
+
+  @NonNull
+  public static String getDonateUrl(@NonNull Context context)
+  {
+    final String url = Config.getDonateUrl();
+    // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
+    if ((url.isEmpty() && !BuildConfig.FLAVOR.equals("google") && !BuildConfig.FLAVOR.equals("huawei"))
+        || url.endsWith("comaps.app/donate/"))
+      return context.getString(R.string.app_site_url) + "donate/";
+    return url;
+  }
 }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index 73f6112c5..a954f169b 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -390,14 +390,9 @@ public final class Config
   }
 
   @NonNull
-  public static String getDonateUrl(@NonNull Context context)
+  public static String getDonateUrl()
   {
-    final String url = getString(KEY_DONATE_URL);
-    // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
-    if ((url.isEmpty() && !mFlavor.equals("google") && !mFlavor.equals("huawei"))
-        || url.endsWith("comaps.app/donate/"))
-      return context.getString(R.string.app_site_url) + "donate/";
-    return url;
+    return getString(KEY_DONATE_URL);
   }
 
   public static void init(@NonNull Context context, @NonNull SharedPreferences prefs, @NonNull String flavor,