diff --git a/app/metrics.yaml b/app/metrics.yaml index 3dadbe160..f563ade4f 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -371,18 +371,6 @@ metrics: notification_emails: - fenix-core@mozilla.com expires: "2019-09-01" - syncing_items: - type: string_list - description: > - The preference keys for the switch preferences the user has enabled to sync with FxA. We currently track: - Bookmarks and History. - bugs: - - 1190 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/2745#issuecomment-494918532 - notification_emails: - - fenix-core@mozilla.com - expires: "2020-03-01" search.default_engine: code: diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt index 9baa0a739..8e6da2617 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt @@ -30,9 +30,6 @@ import org.mozilla.fenix.GleanMetrics.Library import org.mozilla.fenix.GleanMetrics.ErrorPage import org.mozilla.fenix.GleanMetrics.SyncAccount import org.mozilla.fenix.GleanMetrics.SyncAuth -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.getPreferenceKey -import org.mozilla.fenix.utils.Settings private class EventWrapper>( private val recorder: ((Map?) -> Unit), @@ -251,11 +248,6 @@ class GleanMetricsService(private val context: Context) : MetricsService { defaultBrowser.set(Browsers.all(context).isDefaultBrowser) defaultMozBrowser.set(MozillaProductDetector.getMozillaBrowserDefault(context) ?: "") mozillaProducts.set(MozillaProductDetector.getInstalledMozillaProducts(context)) - - val syncItemsKey = context.getPreferenceKey(R.string.pref_key_sync_syncing_items) - Settings.getInstance(context).preferences.getStringSet(syncItemsKey, setOf())?.toList()?.let { - syncingItems.set(it) - } } SearchDefaultEngine.apply { diff --git a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt index 1463c535e..eff533561 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/AccountSettingsFragment.kt @@ -30,7 +30,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.getPreferenceKey import org.mozilla.fenix.ext.requireComponents -import org.mozilla.fenix.utils.Settings import java.lang.Exception import kotlin.coroutines.CoroutineContext @@ -205,9 +204,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), CoroutineScope { } } } - - Settings.getInstance(context!!).preferences.edit() - .putStringSet(context!!.getPreferenceKey(R.string.pref_key_sync_syncing_items), stringSet).apply() } fun updateLastSyncedTimePref(context: Context, pref: Preference, failed: Boolean = false) { diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index 64280ab84..536c35ef9 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -44,7 +44,6 @@ pref_key_sync_pair pref_key_sync_sign_in pref_key_sync_create_account - pref_key_sync_syncing_items pref_key_sync_problem