mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-06-11 09:44:46 -04:00
00a5d2e48b
I did some extensive testing and research, this should help to remove further reduce the complexity of our patches Signed-off-by: celenity <celenity@celenity.dev>
47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
|
|
index 325e5d2141..90833e35cd 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
|
|
@@ -751,7 +751,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
|
|
@VisibleForTesting
|
|
internal fun setLinkSharingPreference() {
|
|
with(requirePreference<Preference>(R.string.pref_key_link_sharing)) {
|
|
- isVisible = FxNimbus.features.sentFromFirefox.value().enabled
|
|
+ isVisible = false
|
|
}
|
|
}
|
|
|
|
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
index 9197b274db..58ff7665d8 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
@@ -681,13 +681,13 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
|
|
var whatsappLinkSharingEnabled by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_link_sharing),
|
|
- featureFlag = true,
|
|
+ featureFlag = false,
|
|
default = { FxNimbus.features.sentFromFirefox.value().enabled },
|
|
)
|
|
|
|
var linkSharingSettingsSnackbarShown by booleanPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_link_sharing_settings_snackbar),
|
|
- default = false,
|
|
+ default = true,
|
|
)
|
|
|
|
/**
|
|
diff --git a/mobile/android/fenix/app/src/main/res/xml/link_sharing_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/link_sharing_preferences.xml
|
|
index faafebc7f2..cf8650c1ee 100644
|
|
--- a/mobile/android/fenix/app/src/main/res/xml/link_sharing_preferences.xml
|
|
+++ b/mobile/android/fenix/app/src/main/res/xml/link_sharing_preferences.xml
|
|
@@ -5,7 +5,7 @@
|
|
<androidx.preference.PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
<SwitchPreference
|
|
- android:defaultValue="true"
|
|
+ android:defaultValue="false"
|
|
android:key="@string/pref_key_link_sharing"
|
|
android:summary="@string/link_sharing_toggle_title"
|
|
android:title="@string/link_sharing_toggle_body" />
|