diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt index 9adae012..fe45212d 100644 --- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt +++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt @@ -13,7 +13,6 @@ import org.eu.exodus_privacy.exodusprivacy.BuildConfig import org.eu.exodus_privacy.exodusprivacy.R import org.eu.exodus_privacy.exodusprivacy.databinding.FragmentAboutBinding import org.eu.exodus_privacy.exodusprivacy.fragments.dialog.ThemeDialogFragment -import org.eu.exodus_privacy.exodusprivacy.utils.getLanguage import org.eu.exodus_privacy.exodusprivacy.utils.openURL import org.eu.exodus_privacy.exodusprivacy.utils.startIntent import javax.inject.Inject @@ -30,21 +29,13 @@ class AboutFragment : PreferenceFragmentCompat() { companion object { private const val analyzeURL = "https://reports.exodus-privacy.eu.org/analysis/submit/" private const val alternativesURL = "https://reports.exodus-privacy.eu.org/info/next/" - private const val privacyPolicyURL = "https://exodus-privacy.eu.org/en/page/privacy-policy/" + private const val privacyPolicyURL = "https://exodus-privacy.eu.org/page/privacy-policy/" private const val sourceCodeURL = "https://github.com/Exodus-Privacy/exodus-android-app" private const val websiteURL = "https://exodus-privacy.eu.org/" private const val mastodonURL = "https://framapiaf.org/@exodus" private const val emailID = "contact@exodus-privacy.eu.org" } - private fun getLocaleWebsiteURL(): String { - return if (getLanguage() != "fr") { - websiteURL + "en" - } else { - websiteURL + "fr" - } - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentAboutBinding.bind(view) @@ -93,7 +84,7 @@ class AboutFragment : PreferenceFragmentCompat() { } findPreference("website")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, getLocaleWebsiteURL()) + openURL(customTabsIntent, it.context, websiteURL) true } @@ -113,7 +104,7 @@ class AboutFragment : PreferenceFragmentCompat() { } findPreference("privPolicy")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, getLocaleWebsiteURL() + "/page/privacy-policy/") + openURL(customTabsIntent, it.context, privacyPolicyURL) true } diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/CommonExtensions.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/CommonExtensions.kt index 34df9958..4e864119 100644 --- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/CommonExtensions.kt +++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/CommonExtensions.kt @@ -12,7 +12,6 @@ import androidx.core.content.ContextCompat import androidx.core.text.isDigitsOnly import com.google.android.material.chip.Chip import org.eu.exodus_privacy.exodusprivacy.R -import java.util.Locale fun Chip.setExodusColor(size: String) { val textColorStateList: ColorStateList @@ -49,10 +48,6 @@ fun Chip.setExodusColor(size: String) { this.chipBackgroundColor = backgroundColorStateList } -fun getLanguage(): String { - return Locale.getDefault().language -} - fun PackageManager.getInstalledPackagesList(flags: Int): List { return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { this.getInstalledPackages(flags)