From d7a9ec8f4611e80a0b212336d4c7fc5b14d212d3 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 29 Feb 2024 12:20:18 +0100
Subject: replace hard coded Bitmask with %s in string resources in context of
 circumvention setup

---
 .../providersetup/fragments/ConfigureProviderFragment.java           | 5 +++--
 app/src/main/res/values/strings.xml                                  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
index 8477c302..cdb255fc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
@@ -4,6 +4,7 @@ import static android.app.Activity.RESULT_CANCELED;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static se.leap.bitmaskclient.R.string.app_name;
 import static se.leap.bitmaskclient.R.string.description_configure_provider;
 import static se.leap.bitmaskclient.R.string.description_configure_provider_circumvention;
 import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE;
@@ -86,7 +87,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Prop
                              @Nullable Bundle savedInstanceState) {
         binding = FConfigureProviderBinding.inflate(inflater, container, false);
         binding.detailContainer.setVisibility(getUseSnowflake() ? VISIBLE : GONE);
-        binding.tvCircumventionDescription.setText(getUseSnowflake() ? description_configure_provider_circumvention : description_configure_provider);
+        binding.tvCircumventionDescription.setText(getUseSnowflake() ? getString(description_configure_provider_circumvention, getString(app_name)) : getString(description_configure_provider, getString(app_name)));
         binding.detailHeaderContainer.setOnClickListener(v -> {
             binding.ivExpand.animate().setDuration(250).rotation(isExpanded ? -90 : 0);
             showConnectionDetails();
@@ -123,7 +124,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Prop
         super.onFragmentSelected();
         ignoreProviderAPIUpdates = false;
         binding.detailContainer.setVisibility(getUseSnowflake() ? VISIBLE : GONE);
-        binding.tvCircumventionDescription.setText(getUseSnowflake() ? description_configure_provider_circumvention : description_configure_provider);
+        binding.tvCircumventionDescription.setText(getUseSnowflake() ? getString(description_configure_provider_circumvention, getString(app_name)) : getString(description_configure_provider, getString(app_name)));
         if (!isDefaultBitmask()) {
             Drawable drawable = ResourcesCompat.getDrawable(getResources(), R.drawable.setup_progress_spinner, null);
             binding.progressSpinner.setAnimatedSpinnerDrawable(drawable);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bddd094..edbe56bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -218,8 +218,8 @@
     <string name="circumvention_setup_hint">%s will automatically try to connect you to the internet using a variety of circumvention technologies. You can fine tune this in the advanced settings.</string>
     <string name="use_standard_vpn">Use standard %s</string>
     <string name="use_circumvention_tech">Use circumvention tech (slower)</string>
-    <string name="description_configure_provider">To connect to your provider Bitmask is fetching all the required configuration information. This only happens during first setup.</string>
-    <string name="description_configure_provider_circumvention">Bitmask is attempting to collect all required configuration data from the provider. This only happens during first setup. You selected to use circumvention technology, so this might take some time.</string>
+    <string name="description_configure_provider">To connect to your provider %1$s is fetching all the required configuration information. This only happens during first setup.</string>
+    <string name="description_configure_provider_circumvention">%1$s is attempting to collect all required configuration data from the provider. This only happens during first setup. You selected to use circumvention technology, so this might take some time.</string>
     <string name="percentage" translatable="false">%d%</string>
     <string name="details">Details</string>
     <string name="tor_status">Tor Status</string>
-- 
cgit v1.2.3