From 410144553dc5c1e7d66f6d4c6b1c3047746b14ef Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Wed, 7 Oct 2020 11:07:31 +0300
Subject: [PATCH] Fix inapp texts

---
 OsmAnd/res/values/strings.xml                                  | 2 ++
 .../net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java   | 3 +++
 .../src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b58b6d0a1f..619ee52e91 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,8 @@
 	Thx - Hardy
 
 -->
+    <string name="osm_live_payment_subscription_management_hw">Payment will be charged to your AppGallery account at the confirmation of purchase.\n\nSubscription automatically renews unless it is canceled before the renewal date. Your account will be charged for renewal period(month/three month/year) only on the renewal date.\n\nYou can manage and cancel your subscriptions by going to your AppGallery settings.</string>
+    <string name="osm_live_payment_desc_hw">Subscription charged per selected period. Cancel it on AppGallery at any time.</string>
     <string name="contour_lines_thanks">Thank you for purchasing \'Contour lines\'</string>
     <string name="start_finish_icons">Start/finish icons</string>
     <string name="sort_name_ascending">Name: A – Z</string>
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
index c909d50845..9a7215867f 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/ChoosePlanDialogFragment.java
@@ -215,6 +215,9 @@ public abstract class ChoosePlanDialogFragment extends BaseOsmAndDialogFragment
 		if (!TextUtils.isEmpty(getInfoDescription())) {
 			infoDescription.setText(getInfoDescription());
 		}
+		TextViewEx planInfoDescription = (TextViewEx) view.findViewById(R.id.plan_info_description);
+		planInfoDescription.setText(Version.isHuawei(app)
+				? R.string.osm_live_payment_subscription_management_hw : R.string.osm_live_payment_subscription_management);
 		ViewGroup osmLiveCard = buildOsmLiveCard(ctx, cardsContainer);
 		if (osmLiveCard != null) {
 			cardsContainer.addView(osmLiveCard);
diff --git a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
index 788b605eec..43d95c266c 100644
--- a/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
+++ b/OsmAnd/src/net/osmand/plus/chooseplan/OsmLiveCancelledDialog.java
@@ -23,6 +23,7 @@ import androidx.fragment.app.FragmentManager;
 
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.Version;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
@@ -110,6 +111,8 @@ public class OsmLiveCancelledDialog extends BaseOsmAndDialogFragment implements
 			descr.append("\n").append("— ").append(feature.toHumanString(ctx));
 		}
 		infoDescr.setText(descr);
+		TextViewEx inappDescr = (TextViewEx) view.findViewById(R.id.inapp_descr);
+		inappDescr.setText(Version.isHuawei(app) ? R.string.osm_live_payment_desc_hw : R.string.osm_live_payment_desc);
 
 		osmLiveButton = view.findViewById(R.id.card_button);