diff options
| author | cyBerta <cyberta@riseup.net> | 2024-02-29 12:20:18 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2024-03-01 01:59:49 +0100 |
| commit | d7a9ec8f4611e80a0b212336d4c7fc5b14d212d3 (patch) | |
| tree | e1a4fb9c7a8ec35ef65425f1afceb92c90426962 /app/src/main/java/se/leap/bitmaskclient | |
| parent | 90caeb75b4bd246865f7560ef57e924005bdcb7e (diff) | |
replace hard coded Bitmask with %s in string resources in context of circumvention setup
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java | 5 |
1 files changed, 3 insertions, 2 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); |