Merge branch '5629-update_trackers_list' into 'main' (bc09bf90) · Commits · e / os / Advanced Privacy

app/src/main/assets/e_trackers.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

+2 −6

Original line number	Diff line number	Diff line
		@@ -48,10 +48,6 @@ class AppTrackersViewModel(
		private val trackersStatisticsUseCase: TrackersStatisticsUseCase,
		private val getQuickPrivacyStateUseCase: GetQuickPrivacyStateUseCase
		) : ViewModel() {
		companion object {
		private const val exodusBaseUrl = "https://reports.exodus-privacy.eu.org/trackers/"
		}

		private val _state = MutableStateFlow(AppTrackersState())
		val state = _state.asStateFlow()

		@@ -108,8 +104,8 @@ class AppTrackersViewModel(

		fun onClickTracker(tracker: Tracker) {
		viewModelScope.launch(Dispatchers.IO) {
		tracker.exodusId?.let {
		runCatching { Uri.parse(exodusBaseUrl + it) }.getOrNull()
		tracker.link?.let {
		runCatching { Uri.parse(it) }.getOrNull()
		}?.let { _singleEvents.emit(SingleEvent.OpenUrl(it)) }
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ class ToggleTrackersAdapter(
		fun bind(item: Pair<Tracker, Boolean>) {
		val label = item.first.label
		with(binding.title) {
		if (item.first.exodusId != null) {
		if (item.first.link != null) {
		setTextColor(ContextCompat.getColor(context, R.color.accent))
		val spannable = SpannableString(label)
		spannable.setSpan(UnderlineSpan(), 0, spannable.length, 0)

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,6 @@ data class ETrackersResponse(val trackers: List<ETracker>) {
		val id: String?,
		val hostnames: List<String>?,
		val name: String?,
		val exodusId: String?
		val link: String?
		)
		}

+1 −1