From ffbb686bd571185217c0e9e0fef0f164be9a07f7 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Tue, 1 Jun 2021 23:49:41 +0530
Subject: Add dummy tracker feature to trigger blocker system service

---
 .../features/dashboard/DashboardFeature.kt         |  6 +++
 .../features/dashboard/DashboardFragment.kt        |  9 ++++
 .../features/trackers/TrackersFragment.kt          | 58 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
index 5a20489..dc02c91 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
@@ -76,6 +76,7 @@ class DashboardFeature(
         object ShowFakeMyLocationAction : Action()
         object ShowInternetActivityPrivacyAction : Action()
         object ShowAppsPermissions : Action()
+        object ShowTrackers : Action()
     }
 
     sealed class Effect {
@@ -98,6 +99,7 @@ class DashboardFeature(
         object OpenFakeMyLocationEffect : Effect()
         object OpenInternetActivityPrivacyEffect : Effect()
         object OpenAppsPermissionsEffect : Effect()
+        object OpenTrackersEffect : Effect()
     }
 
     companion object {
@@ -144,6 +146,7 @@ class DashboardFeature(
                         Effect.OpenFakeMyLocationEffect -> state
                         Effect.OpenAppsPermissionsEffect -> state
                         Effect.OpenInternetActivityPrivacyEffect -> state
+                        Effect.OpenTrackersEffect -> state
                     }
                 },
                 actor = { _: State, action: Action ->
@@ -185,6 +188,7 @@ class DashboardFeature(
                         Action.ShowInternetActivityPrivacyAction -> flowOf(
                             Effect.OpenInternetActivityPrivacyEffect
                         )
+                        Action.ShowTrackers -> flowOf(Effect.OpenTrackersEffect)
                     }
                 },
                 singleEventProducer = { state, _, effect ->
@@ -197,6 +201,8 @@ class DashboardFeature(
                         SingleEvent.NavigateToInternetActivityPrivacySingleEvent
                     else if (state is State.DashboardState && effect is Effect.OpenAppsPermissionsEffect)
                         SingleEvent.NavigateToPermissionsSingleEvent
+                    else if (state is State.DashboardState && effect is Effect.OpenTrackersEffect)
+                        SingleEvent.NavigateToTrackersSingleEvent
                     else null
                 }
             )
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
index c57e6cc..e7ce353 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
@@ -38,6 +38,7 @@ import foundation.e.privacycentralapp.dummy.mapToString
 import foundation.e.privacycentralapp.features.internetprivacy.InternetPrivacyFragment
 import foundation.e.privacycentralapp.features.location.FakeLocationFragment
 import foundation.e.privacycentralapp.features.permissions.PermissionsFragment
+import foundation.e.privacycentralapp.features.trackers.TrackersFragment
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 
@@ -84,6 +85,11 @@ class DashboardFragment :
                         }
                     }
                     DashboardFeature.SingleEvent.NavigateToTrackersSingleEvent -> {
+                        requireActivity().supportFragmentManager.commit {
+                            add<TrackersFragment>(R.id.container)
+                            setReorderingAllowed(true)
+                            addToBackStack("dashboard")
+                        }
                     }
                 }
             }
@@ -110,6 +116,9 @@ class DashboardFragment :
             it.findViewById<RelativeLayout>(R.id.apps_permissions).setOnClickListener {
                 viewModel.submitAction(DashboardFeature.Action.ShowAppsPermissions)
             }
+            it.findViewById<RelativeLayout>(R.id.am_i_tracked).setOnClickListener {
+                viewModel.submitAction(DashboardFeature.Action.ShowTrackers)
+            }
         }
     }
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
new file mode 100644
index 0000000..d4085b4
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.Toast
+import foundation.e.privacycentralapp.R
+import foundation.e.privacycentralapp.common.NavToolbarFragment
+import lineageos.blockers.BlockerInterface
+
+class TrackersFragment :
+    NavToolbarFragment(R.layout.fragment_trackers) {
+
+    private lateinit var blockerService: BlockerInterface
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        blockerService = BlockerInterface.getInstance(context)
+    }
+
+    private fun displayToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT)
+            .show()
+    }
+
+    override fun getTitle(): String {
+        return "Trackers"
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        bindClickListeners(view)
+    }
+
+    private fun bindClickListeners(view: View) {
+        view.findViewById<Button>(R.id.triggerBlockerService).setOnClickListener {
+            blockerService.runTest()
+        }
+    }
+}
-- 
cgit v1.2.1


From f4fe8a4d881deef7e43ffe296df804c8c2c7a657 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Wed, 16 Jun 2021 00:33:46 +0530
Subject: Add tracker UI and integrate lineage blocker service

---
 .../e/privacycentralapp/DependencyContainer.kt     |   3 +
 .../privacycentralapp/PrivacyCentralApplication.kt |   8 ++
 .../e/privacycentralapp/common/ToolbarFragment.kt  |   2 +
 .../e/privacycentralapp/dummy/DummyDataSource.kt   |   1 +
 .../privacycentralapp/dummy/TrackersDataSource.kt  |  93 ++++++++++++++++
 .../features/dashboard/DashboardFeature.kt         |  23 +++-
 .../features/location/FakeLocationFeature.kt       |   6 +-
 .../features/permissions/PermissionAppsAdapter.kt  |   6 +-
 .../features/trackers/TrackerAppsAdapter.kt        |  59 ++++++++++
 .../features/trackers/TrackerAppsFragment.kt       |  78 +++++++++++++
 .../features/trackers/TrackersAdapter.kt           |  56 ++++++++++
 .../features/trackers/TrackersFeature.kt           | 121 +++++++++++++++++++++
 .../features/trackers/TrackersFragment.kt          |  63 +++++++----
 .../features/trackers/TrackersViewModel.kt         |  40 +++++++
 14 files changed, 529 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersAdapter.kt
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
 create mode 100644 app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
index 364ae4a..fcc2eaa 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt
@@ -26,6 +26,7 @@ import foundation.e.privacymodules.location.FakeLocation
 import foundation.e.privacymodules.location.IFakeLocation
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
+import lineageos.blockers.BlockerInterface
 
 /**
  * Simple container to hold application wide dependencies.
@@ -55,4 +56,6 @@ class DependencyContainer constructor(val app: Application) {
     val fakeLocationViewModelFactory by lazy {
         FakeLocationViewModelFactory(locationApi)
     }
+
+    val blockerService = BlockerInterface.getInstance(context)
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
index 9372a66..153e0c1 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
@@ -18,9 +18,17 @@
 package foundation.e.privacycentralapp
 
 import android.app.Application
+import foundation.e.privacycentralapp.dummy.TrackersDataSource
 
 class PrivacyCentralApplication : Application() {
 
     // Initialize the dependency container.
     val dependencyContainer: DependencyContainer by lazy { DependencyContainer(this) }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        // Inject blocker service in trackers source.
+        TrackersDataSource.injectBlockerService(dependencyContainer.blockerService)
+    }
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt
index f156e09..5c18548 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt
@@ -40,4 +40,6 @@ abstract class ToolbarFragment(@LayoutRes contentLayoutId: Int) : Fragment(conte
     open fun setupToolbar(toolbar: MaterialToolbar) {
         toolbar.title = getTitle()
     }
+
+    fun getToolbar(): MaterialToolbar? = view?.findViewById(R.id.toolbar)
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
index fe61354..dd6112d 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
@@ -227,4 +227,5 @@ object DummyDataSource {
             _appsUsingLocationPerm.value = _populatedPermissions.value[permissionId].packagesAllowed
         }
     }
+
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
new file mode 100644
index 0000000..9485a26
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.dummy
+
+import foundation.e.privacycentralapp.R
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import lineageos.blockers.BlockerInterface
+
+data class TrackedApp(val appName: String, val isEnabled: Boolean, val iconId: Int)
+
+data class Tracker(
+    val name: String,
+    val domain: String? = null,
+    val ipAddress: String? = null,
+    val trackedApps: List<TrackedApp>
+)
+
+object TrackersDataSource {
+
+    private lateinit var blockerService: BlockerInterface
+
+    val facebook = TrackedApp("Facebook", true, R.drawable.ic_facebook)
+    val firefox = TrackedApp("Firefox", true, R.drawable.ic_facebook)
+    val google = TrackedApp("Google", true, R.drawable.ic_facebook)
+    val whatsapp = TrackedApp("Whatsapp", true, R.drawable.ic_facebook)
+    val blisslauncher = TrackedApp("BlissLauncher", true, R.drawable.ic_facebook)
+    val youtube = TrackedApp("Youtube", true, R.drawable.ic_facebook)
+
+    val crashlytics = Tracker(
+        "Google Crashlytics (Demo)",
+        domain = "google.com",
+        trackedApps = listOf(facebook, firefox)
+    )
+
+    val facebookAds = Tracker(
+        "Facebook (Demo)",
+        domain = "google.com",
+        trackedApps = listOf(facebook, whatsapp)
+    )
+    val rubiconTracker = Tracker(
+        "Rubicon Projects",
+        domain = "google.com",
+        trackedApps = listOf(google, blisslauncher, youtube)
+    )
+    val googleAnalytics = Tracker(
+        "Google Analytics",
+        domain = "google.com",
+        trackedApps = listOf(facebook, firefox)
+    )
+
+    val _trackers =
+        MutableStateFlow(listOf(crashlytics, facebookAds, rubiconTracker, googleAnalytics))
+    val trackers = _trackers.asStateFlow()
+
+    fun injectBlockerService(blockerInterface: BlockerInterface) {
+        this.blockerService = blockerInterface
+    }
+
+    fun toggleTracker(tracker: Tracker, enable: Boolean): Boolean {
+        val result = if (!enable) {
+            blockerService.blockDomain(tracker.domain)
+        } else {
+            blockerService.unblockDomain(tracker.domain)
+        }
+
+        if (result) {
+            _trackers.value = _trackers.value.map {
+                if (it.name == tracker.name) {
+                    it.copy(trackedApps = it.trackedApps.map { app ->
+                        app.copy(isEnabled = enable)
+                    })
+                } else it
+            }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
index dc02c91..a273b88 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
@@ -25,6 +25,7 @@ import foundation.e.flowmvi.feature.BaseFeature
 import foundation.e.privacycentralapp.dummy.DummyDataSource
 import foundation.e.privacycentralapp.dummy.InternetPrivacyMode
 import foundation.e.privacycentralapp.dummy.LocationMode
+import foundation.e.privacycentralapp.dummy.TrackersDataSource
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
@@ -93,6 +94,7 @@ class DashboardFeature(
 
         object LoadingDashboardEffect : Effect()
         data class UpdateActiveTrackersCountEffect(val count: Int) : Effect()
+        data class UpdateTotalTrackersCountEffect(val count: Int) : Effect()
         data class UpdateLocationModeEffect(val mode: LocationMode) : Effect()
         data class UpdateInternetActivityModeEffect(val mode: InternetPrivacyMode) : Effect()
         data class UpdateAppsUsingLocationPermEffect(val apps: Int) : Effect()
@@ -129,6 +131,11 @@ class DashboardFeature(
                                 state.copy(activeTrackersCount = effect.count)
                             } else state
                         }
+                        is Effect.UpdateTotalTrackersCountEffect -> {
+                            if (state is State.DashboardState) {
+                                state.copy(trackersCount = effect.count)
+                            } else state
+                        }
                         is Effect.UpdateInternetActivityModeEffect -> {
                             if (state is State.DashboardState) {
                                 state.copy(internetPrivacyMode = effect.mode)
@@ -153,8 +160,20 @@ class DashboardFeature(
                     Log.d("Feature", "action: $action")
                     when (action) {
                         Action.ObserveDashboardAction -> merge(
-                            DummyDataSource.activeTrackersCount.map {
-                                Effect.UpdateActiveTrackersCountEffect(it)
+                            TrackersDataSource.trackers.map {
+                                var activeTrackersCount: Int = 0
+                                outer@ for (tracker in it) {
+                                    for (app in tracker.trackedApps) {
+                                        if(!app.isEnabled)  {
+                                            continue@outer
+                                        }
+                                    }
+                                    activeTrackersCount++
+                                }
+                                Effect.UpdateActiveTrackersCountEffect(activeTrackersCount)
+                            },
+                            TrackersDataSource.trackers.map {
+                                Effect.UpdateTotalTrackersCountEffect(it.size)
                             },
                             DummyDataSource.appsUsingLocationPerm.map {
                                 Effect.UpdateAppsUsingLocationPermEffect(it.size)
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFeature.kt
index 7e45049..9124f85 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFeature.kt
@@ -36,8 +36,7 @@ class FakeLocationFeature(
     coroutineScope: CoroutineScope,
     reducer: Reducer<State, Effect>,
     actor: Actor<State, Action, Effect>,
-    singleEventProducer: SingleEventProducer<State, Action, Effect, SingleEvent>,
-    private val locationApi: LocationApiDelegate
+    singleEventProducer: SingleEventProducer<State, Action, Effect, SingleEvent>
 ) : BaseFeature<FakeLocationFeature.State, FakeLocationFeature.Action, FakeLocationFeature.Effect, FakeLocationFeature.SingleEvent>(
     initialState,
     actor,
@@ -206,8 +205,7 @@ class FakeLocationFeature(
                     is Effect.ErrorEffect -> SingleEvent.ErrorEvent(effect.message)
                     else -> null
                 }
-            },
-            locationApi = locationApi
+            }
         )
     }
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsAdapter.kt
index 4f9b602..4905dca 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsAdapter.kt
@@ -36,17 +36,17 @@ class PermissionAppsAdapter(
         val appName: TextView = view.findViewById(R.id.app_title)
 
         @SuppressLint("UseSwitchCompatOrMaterialCode")
-        val togglePermission: Switch = view.findViewById(R.id.togglePermission)
+        val togglePermission: Switch = view.findViewById(R.id.toggle)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PermissionViewHolder {
         val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_permission_apps, parent, false)
+            .inflate(R.layout.item_app_toggle, parent, false)
         val holder = PermissionViewHolder(view)
         holder.togglePermission.setOnCheckedChangeListener { _, isChecked ->
             listener(dataSet[holder.adapterPosition].first, isChecked)
         }
-        view.findViewById<Switch>(R.id.togglePermission)
+        view.findViewById<Switch>(R.id.toggle)
         return holder
     }
 
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
new file mode 100644
index 0000000..04e3f04
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Switch
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import foundation.e.privacycentralapp.R
+import foundation.e.privacycentralapp.dummy.Tracker
+
+class TrackerAppsAdapter(
+    private var tracker: Tracker,
+    private val listener: (Tracker, Boolean) -> Unit
+) :
+    RecyclerView.Adapter<TrackerAppsAdapter.TrackerViewHolder>() {
+
+    class TrackerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val titleView: TextView = view.findViewById(R.id.app_title)
+        @SuppressLint("UseSwitchCompatOrMaterialCode")
+        val toggleBlocker: Switch = view.findViewById(R.id.toggle)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TrackerViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_app_toggle, parent, false)
+        val holder = TrackerViewHolder(view)
+        holder.toggleBlocker.setOnCheckedChangeListener { _, isChecked ->
+            listener(tracker, isChecked)
+        }
+        return holder
+    }
+
+    override fun onBindViewHolder(holder: TrackerViewHolder, position: Int) {
+        val app = tracker.trackedApps[position]
+        holder.titleView.text = app.appName
+        holder.toggleBlocker.isChecked = app.isEnabled
+    }
+
+    override fun getItemCount(): Int = tracker.trackedApps.size
+}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
new file mode 100644
index 0000000..67ae0cc
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import foundation.e.flowmvi.MVIView
+import foundation.e.privacycentralapp.R
+import foundation.e.privacycentralapp.common.NavToolbarFragment
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
+
+class TrackerAppsFragment :
+    NavToolbarFragment(R.layout.fragment_tracker_apps),
+    MVIView<TrackersFeature.State, TrackersFeature.Action> {
+
+    private val viewModel: TrackersViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleScope.launchWhenStarted {
+            viewModel.trackersFeature.takeView(this, this@TrackerAppsFragment)
+        }
+        lifecycleScope.launchWhenStarted {
+            viewModel.trackersFeature.singleEvents.collect { event ->
+                when (event) {
+                    is TrackersFeature.SingleEvent.ErrorEvent -> displayToast(event.error)
+                }
+            }
+        }
+    }
+
+    private fun displayToast(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT)
+            .show()
+    }
+
+    override fun getTitle(): String = getString(R.string.tracker)
+
+    override fun render(state: TrackersFeature.State) {
+        state.currentSelectedTracker?.let { tracker ->
+            view?.findViewById<RecyclerView>(R.id.recylcer_view_tracker_apps)?.apply {
+                layoutManager = LinearLayoutManager(requireContext())
+                setHasFixedSize(true)
+                adapter = TrackerAppsAdapter(tracker) { tracker, grant ->
+                    viewModel.submitAction(
+                       TrackersFeature.Action.ToggleTrackerAction(
+                            tracker,
+                            grant
+                        )
+                    )
+                }
+            }
+            getToolbar()?.title = tracker.name
+        }
+    }
+
+    override fun actions(): Flow<TrackersFeature.Action> = viewModel.actions
+}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersAdapter.kt
new file mode 100644
index 0000000..cef069e
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersAdapter.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import foundation.e.privacycentralapp.R
+import foundation.e.privacycentralapp.dummy.Tracker
+
+class TrackersAdapter(
+    private var dataSet: List<Tracker> = emptyList(),
+    private val listener: (Tracker) -> Unit
+) :
+    RecyclerView.Adapter<TrackersAdapter.TrackerViewHolder>() {
+
+    class TrackerViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val titleView: TextView = view as TextView
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TrackerViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_list_tracker, parent, false)
+        val holder = TrackerViewHolder(view)
+        holder.titleView.setOnClickListener { listener(dataSet[holder.adapterPosition]) }
+        return holder
+    }
+
+    override fun onBindViewHolder(holder: TrackerViewHolder, position: Int) {
+        val tracker = dataSet[position]
+        holder.titleView.text = tracker.name
+    }
+
+    override fun getItemCount(): Int = dataSet.size
+
+    fun setData(data: List<Tracker>) {
+        this.dataSet = data
+    }
+}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
new file mode 100644
index 0000000..f9fbf63
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import android.util.Log
+import foundation.e.flowmvi.Actor
+import foundation.e.flowmvi.Reducer
+import foundation.e.flowmvi.SingleEventProducer
+import foundation.e.flowmvi.feature.BaseFeature
+import foundation.e.privacycentralapp.dummy.Tracker
+import foundation.e.privacycentralapp.dummy.TrackersDataSource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+
+// Define a state machine for Tracker feature.
+class TrackersFeature(
+    initialState: State,
+    coroutineScope: CoroutineScope,
+    reducer: Reducer<State, Effect>,
+    actor: Actor<State, Action, Effect>,
+    singleEventProducer: SingleEventProducer<State, Action, Effect, SingleEvent>
+) : BaseFeature<TrackersFeature.State, TrackersFeature.Action, TrackersFeature.Effect, TrackersFeature.SingleEvent>(
+    initialState,
+    actor,
+    reducer,
+    coroutineScope,
+    { message -> Log.d("PermissionsFeature", message) },
+    singleEventProducer
+) {
+    data class State(
+        val trackers: List<Tracker> = emptyList(),
+        val currentSelectedTracker: Tracker? = null
+    )
+
+    sealed class SingleEvent {
+        data class ErrorEvent(val error: String) : SingleEvent()
+        object BlockerErrorEvent : SingleEvent()
+    }
+
+    sealed class Action {
+        object ObserveTrackers : Action()
+        data class SetSelectedTracker(val tracker: Tracker) : Action()
+        data class ToggleTrackerAction(
+            val tracker: Tracker,
+            val grant: Boolean
+        ) : Action()
+    }
+
+    sealed class Effect {
+        data class TrackersLoadedEffect(val trackers: List<Tracker>) : Effect()
+        data class TrackerSelectedEffect(val tracker: Tracker) : Effect()
+        data class TrackerToggleEffect(val result: Boolean) : Effect()
+        data class ErrorEffect(val message: String) : Effect()
+    }
+
+    companion object {
+        fun create(
+            initialState: State = State(),
+            coroutineScope: CoroutineScope
+        ) = TrackersFeature(
+            initialState, coroutineScope,
+            reducer = { state, effect ->
+                when (effect) {
+                    is Effect.TrackersLoadedEffect -> State(effect.trackers)
+                    is Effect.TrackerSelectedEffect -> state.copy(currentSelectedTracker = effect.tracker)
+                    is Effect.ErrorEffect -> state
+                    is Effect.TrackerToggleEffect -> state
+                }
+            },
+            actor = { state, action ->
+                when (action) {
+                    Action.ObserveTrackers -> TrackersDataSource.trackers.map {
+                        Effect.TrackersLoadedEffect(
+                            it
+                        )
+                    }
+                    is Action.SetSelectedTracker -> flowOf(
+                        Effect.TrackerSelectedEffect(
+                            action.tracker
+                        )
+                    )
+
+                    is Action.ToggleTrackerAction -> {
+                        if (state.currentSelectedTracker != null) {
+                            val result = TrackersDataSource.toggleTracker(
+                                state.currentSelectedTracker,
+                                action.grant
+                            )
+                            flowOf(Effect.TrackerToggleEffect(result))
+                        } else {
+                            flowOf(Effect.ErrorEffect("Can't toggle tracker"))
+                        }
+                    }
+                }
+            },
+            singleEventProducer = { _, _, effect ->
+                when (effect) {
+                    is Effect.ErrorEffect -> SingleEvent.ErrorEvent(effect.message)
+                    is Effect.TrackerToggleEffect -> SingleEvent.BlockerErrorEvent
+                    else -> null
+                }
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index d4085b4..d0242d3 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -17,42 +17,63 @@
 
 package foundation.e.privacycentralapp.features.trackers
 
-import android.content.Context
 import android.os.Bundle
 import android.view.View
-import android.widget.Button
-import android.widget.Toast
+import androidx.fragment.app.add
+import androidx.fragment.app.commit
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import foundation.e.flowmvi.MVIView
 import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.common.NavToolbarFragment
-import lineageos.blockers.BlockerInterface
+import kotlinx.coroutines.flow.Flow
 
 class TrackersFragment :
-    NavToolbarFragment(R.layout.fragment_trackers) {
+    NavToolbarFragment(R.layout.fragment_trackers),
+    MVIView<TrackersFeature.State, TrackersFeature.Action> {
 
-    private lateinit var blockerService: BlockerInterface
+    private val viewModel: TrackersViewModel by viewModels()
+    private lateinit var trackersAdapter: TrackersAdapter
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        blockerService = BlockerInterface.getInstance(context)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleScope.launchWhenStarted {
+            viewModel.trackersFeature.takeView(this, this@TrackersFragment)
+        }
+        lifecycleScope.launchWhenStarted {
+            viewModel.submitAction(TrackersFeature.Action.ObserveTrackers)
+        }
     }
 
-    private fun displayToast(message: String) {
-        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT)
-            .show()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        trackersAdapter = TrackersAdapter {
+            viewModel.submitAction(TrackersFeature.Action.SetSelectedTracker(it))
+        }
+        view.findViewById<RecyclerView>(R.id.recylcer_view_trackers)?.apply {
+            layoutManager = LinearLayoutManager(requireContext())
+            setHasFixedSize(true)
+            adapter = trackersAdapter
+        }
     }
 
     override fun getTitle(): String {
-        return "Trackers"
+        return getString(R.string.trackers)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        bindClickListeners(view)
-    }
-
-    private fun bindClickListeners(view: View) {
-        view.findViewById<Button>(R.id.triggerBlockerService).setOnClickListener {
-            blockerService.runTest()
+    override fun render(state: TrackersFeature.State) {
+        if (state.currentSelectedTracker != null) {
+            requireActivity().supportFragmentManager.commit {
+                add<TrackerAppsFragment>(R.id.container)
+                setReorderingAllowed(true)
+                addToBackStack("trackers")
+            }
+        } else {
+            trackersAdapter.setData(state.trackers)
         }
     }
+
+    override fun actions(): Flow<TrackersFeature.Action> = viewModel.actions
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
new file mode 100644
index 0000000..79ae146
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.features.trackers
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+
+class TrackersViewModel : ViewModel() {
+
+    private val _actions = MutableSharedFlow<TrackersFeature.Action>()
+    val actions = _actions.asSharedFlow()
+
+    val trackersFeature: TrackersFeature by lazy {
+        TrackersFeature.create(coroutineScope = viewModelScope)
+    }
+
+    fun submitAction(action: TrackersFeature.Action) {
+        viewModelScope.launch {
+            _actions.emit(action)
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.1


From e40866d03008ec6dafa0016a31ee4c9e820032df Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Wed, 16 Jun 2021 01:57:50 +0530
Subject: Fix UI bugs and reformat code

---
 .../e/privacycentralapp/dummy/DummyDataSource.kt   |  1 -
 .../privacycentralapp/dummy/TrackersDataSource.kt  | 10 +++---
 .../features/dashboard/DashboardFeature.kt         |  2 +-
 .../features/trackers/TrackerAppsAdapter.kt        |  6 ++--
 .../features/trackers/TrackerAppsFragment.kt       | 38 +++++++++++++++-------
 .../features/trackers/TrackersFeature.kt           |  6 ++--
 .../features/trackers/TrackersFragment.kt          |  8 ++---
 .../features/trackers/TrackersViewModel.kt         |  2 +-
 8 files changed, 45 insertions(+), 28 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
index dd6112d..fe61354 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/DummyDataSource.kt
@@ -227,5 +227,4 @@ object DummyDataSource {
             _appsUsingLocationPerm.value = _populatedPermissions.value[permissionId].packagesAllowed
         }
     }
-
 }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index 9485a26..07822bb 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -82,12 +82,14 @@ object TrackersDataSource {
         if (result) {
             _trackers.value = _trackers.value.map {
                 if (it.name == tracker.name) {
-                    it.copy(trackedApps = it.trackedApps.map { app ->
-                        app.copy(isEnabled = enable)
-                    })
+                    it.copy(
+                        trackedApps = it.trackedApps.map { app ->
+                            app.copy(isEnabled = enable)
+                        }
+                    )
                 } else it
             }
         }
         return result
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
index a273b88..c26fce1 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt
@@ -164,7 +164,7 @@ class DashboardFeature(
                                 var activeTrackersCount: Int = 0
                                 outer@ for (tracker in it) {
                                     for (app in tracker.trackedApps) {
-                                        if(!app.isEnabled)  {
+                                        if (!app.isEnabled) {
                                             continue@outer
                                         }
                                     }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
index 04e3f04..ae236b9 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsAdapter.kt
@@ -43,8 +43,10 @@ class TrackerAppsAdapter(
         val view = LayoutInflater.from(parent.context)
             .inflate(R.layout.item_app_toggle, parent, false)
         val holder = TrackerViewHolder(view)
-        holder.toggleBlocker.setOnCheckedChangeListener { _, isChecked ->
-            listener(tracker, isChecked)
+        holder.toggleBlocker.setOnClickListener {
+            if (it is Switch) {
+                listener(tracker, it.isChecked)
+            }
         }
         return holder
     }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
index 67ae0cc..53c26a9 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
@@ -18,8 +18,10 @@
 package foundation.e.privacycentralapp.features.trackers
 
 import android.os.Bundle
+import android.util.Log
+import android.view.View
 import android.widget.Toast
-import androidx.fragment.app.viewModels
+import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -33,7 +35,9 @@ class TrackerAppsFragment :
     NavToolbarFragment(R.layout.fragment_tracker_apps),
     MVIView<TrackersFeature.State, TrackersFeature.Action> {
 
-    private val viewModel: TrackersViewModel by viewModels()
+    private val viewModel: TrackersViewModel by activityViewModels()
+
+    private val TAG = "TrackerAppsFragment"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -44,6 +48,11 @@ class TrackerAppsFragment :
             viewModel.trackersFeature.singleEvents.collect { event ->
                 when (event) {
                     is TrackersFeature.SingleEvent.ErrorEvent -> displayToast(event.error)
+                    is TrackersFeature.SingleEvent.BlockerErrorEvent -> {
+                        displayToast("Couldn't toggle")
+                        // Re-render the current state to reset the switches.
+                        render(viewModel.trackersFeature.state.value)
+                    }
                 }
             }
         }
@@ -56,19 +65,24 @@ class TrackerAppsFragment :
 
     override fun getTitle(): String = getString(R.string.tracker)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.findViewById<RecyclerView>(R.id.recylcer_view_tracker_apps)?.apply {
+            layoutManager = LinearLayoutManager(requireContext())
+            setHasFixedSize(true)
+        }
+    }
+
     override fun render(state: TrackersFeature.State) {
+        Log.d(TAG, "render() called with: state = $state")
         state.currentSelectedTracker?.let { tracker ->
-            view?.findViewById<RecyclerView>(R.id.recylcer_view_tracker_apps)?.apply {
-                layoutManager = LinearLayoutManager(requireContext())
-                setHasFixedSize(true)
-                adapter = TrackerAppsAdapter(tracker) { tracker, grant ->
-                    viewModel.submitAction(
-                       TrackersFeature.Action.ToggleTrackerAction(
-                            tracker,
-                            grant
-                        )
+            view?.findViewById<RecyclerView>(R.id.recylcer_view_tracker_apps)?.adapter = TrackerAppsAdapter(tracker) { it, grant ->
+                viewModel.submitAction(
+                    TrackersFeature.Action.ToggleTrackerAction(
+                        it,
+                        grant
                     )
-                }
+                )
             }
             getToolbar()?.title = tracker.name
         }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
index f9fbf63..4a08328 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -40,7 +40,7 @@ class TrackersFeature(
     actor,
     reducer,
     coroutineScope,
-    { message -> Log.d("PermissionsFeature", message) },
+    { message -> Log.d("TrackersFeature", message) },
     singleEventProducer
 ) {
     data class State(
@@ -112,7 +112,9 @@ class TrackersFeature(
             singleEventProducer = { _, _, effect ->
                 when (effect) {
                     is Effect.ErrorEffect -> SingleEvent.ErrorEvent(effect.message)
-                    is Effect.TrackerToggleEffect -> SingleEvent.BlockerErrorEvent
+                    is Effect.TrackerToggleEffect -> {
+                        if (!effect.result) SingleEvent.BlockerErrorEvent else null
+                    }
                     else -> null
                 }
             }
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index d0242d3..00fefb6 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -19,9 +19,9 @@ package foundation.e.privacycentralapp.features.trackers
 
 import android.os.Bundle
 import android.view.View
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
-import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -34,7 +34,7 @@ class TrackersFragment :
     NavToolbarFragment(R.layout.fragment_trackers),
     MVIView<TrackersFeature.State, TrackersFeature.Action> {
 
-    private val viewModel: TrackersViewModel by viewModels()
+    private val viewModel: TrackersViewModel by activityViewModels()
     private lateinit var trackersAdapter: TrackersAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -59,9 +59,7 @@ class TrackersFragment :
         }
     }
 
-    override fun getTitle(): String {
-        return getString(R.string.trackers)
-    }
+    override fun getTitle() = getString(R.string.trackers)
 
     override fun render(state: TrackersFeature.State) {
         if (state.currentSelectedTracker != null) {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
index 79ae146..d75d6ec 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
@@ -37,4 +37,4 @@ class TrackersViewModel : ViewModel() {
             _actions.emit(action)
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1


From c5c030693c40c912881feb5ecca5913a83a4bb55 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Wed, 16 Jun 2021 21:36:37 +0530
Subject: Add descriptive name to dummy trackers

---
 .../foundation/e/privacycentralapp/dummy/TrackersDataSource.kt | 10 +++++-----
 .../e/privacycentralapp/features/trackers/TrackersFeature.kt   |  7 +++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index 07822bb..13def5a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -43,19 +43,19 @@ object TrackersDataSource {
     val youtube = TrackedApp("Youtube", true, R.drawable.ic_facebook)
 
     val crashlytics = Tracker(
-        "Google Crashlytics (Demo)",
+        "Google Crashlytics Demo (google.com) ",
         domain = "google.com",
         trackedApps = listOf(facebook, firefox)
     )
 
     val facebookAds = Tracker(
-        "Facebook (Demo)",
-        domain = "google.com",
+        "Facebook IP Demo",
+        domain = "157.240.16.35",
         trackedApps = listOf(facebook, whatsapp)
     )
     val rubiconTracker = Tracker(
-        "Rubicon Projects",
-        domain = "google.com",
+        "Rubicon Projects (block google)",
+        domain = "google",
         trackedApps = listOf(google, blisslauncher, youtube)
     )
     val googleAnalytics = Tracker(
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
index 4a08328..ec7b67a 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -80,7 +80,10 @@ class TrackersFeature(
                     is Effect.TrackersLoadedEffect -> State(effect.trackers)
                     is Effect.TrackerSelectedEffect -> state.copy(currentSelectedTracker = effect.tracker)
                     is Effect.ErrorEffect -> state
-                    is Effect.TrackerToggleEffect -> state
+                    is Effect.TrackerToggleEffect -> {
+                        Log.d("Tracker effect", "$state")
+                        state
+                    }
                 }
             },
             actor = { state, action ->
@@ -99,7 +102,7 @@ class TrackersFeature(
                     is Action.ToggleTrackerAction -> {
                         if (state.currentSelectedTracker != null) {
                             val result = TrackersDataSource.toggleTracker(
-                                state.currentSelectedTracker,
+                                action.tracker,
                                 action.grant
                             )
                             flowOf(Effect.TrackerToggleEffect(result))
-- 
cgit v1.2.1


From 7f57ef4177a1bef77e82cc6123aa9691edb56f89 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Fri, 18 Jun 2021 15:57:46 +0530
Subject: Fix bug with tracker state

---
 .../privacycentralapp/dummy/TrackersDataSource.kt  | 10 ++++++++++
 .../features/trackers/TrackerAppsFragment.kt       | 13 ++++++++++--
 .../features/trackers/TrackersFeature.kt           | 18 ++++++++++++++++-
 .../features/trackers/TrackersFragment.kt          | 23 +++++++++++-----------
 .../features/trackers/TrackersViewModel.kt         |  2 ++
 5 files changed, 51 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index 13def5a..7ba7c5b 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -72,6 +72,16 @@ object TrackersDataSource {
         this.blockerService = blockerInterface
     }
 
+    fun getTracker(name: String): Tracker? {
+        try {
+            return _trackers.value.first {
+                it.name == name
+            }
+        } catch (e: NoSuchElementException) {
+            return null
+        }
+    }
+
     fun toggleTracker(tracker: Tracker, enable: Boolean): Boolean {
         val result = if (!enable) {
             blockerService.blockDomain(tracker.domain)
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
index 53c26a9..fff24dc 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackerAppsFragment.kt
@@ -21,7 +21,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.widget.Toast
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -35,7 +35,7 @@ class TrackerAppsFragment :
     NavToolbarFragment(R.layout.fragment_tracker_apps),
     MVIView<TrackersFeature.State, TrackersFeature.Action> {
 
-    private val viewModel: TrackersViewModel by activityViewModels()
+    private val viewModel: TrackersViewModel by viewModels()
 
     private val TAG = "TrackerAppsFragment"
 
@@ -56,6 +56,15 @@ class TrackerAppsFragment :
                 }
             }
         }
+        lifecycleScope.launchWhenStarted {
+            viewModel.submitAction(
+                TrackersFeature.Action.ObserveTracker(
+                    requireArguments().getString(
+                        "TRACKER"
+                    )
+                )
+            )
+        }
     }
 
     private fun displayToast(message: String) {
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
index ec7b67a..9400181 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFeature.kt
@@ -60,6 +60,7 @@ class TrackersFeature(
             val tracker: Tracker,
             val grant: Boolean
         ) : Action()
+        data class ObserveTracker(val tracker: String?) : Action()
     }
 
     sealed class Effect {
@@ -67,6 +68,7 @@ class TrackersFeature(
         data class TrackerSelectedEffect(val tracker: Tracker) : Effect()
         data class TrackerToggleEffect(val result: Boolean) : Effect()
         data class ErrorEffect(val message: String) : Effect()
+        data class TrackerLoadedEffect(val tracker: Tracker) : Effect()
     }
 
     companion object {
@@ -81,9 +83,11 @@ class TrackersFeature(
                     is Effect.TrackerSelectedEffect -> state.copy(currentSelectedTracker = effect.tracker)
                     is Effect.ErrorEffect -> state
                     is Effect.TrackerToggleEffect -> {
-                        Log.d("Tracker effect", "$state")
                         state
                     }
+                    is Effect.TrackerLoadedEffect -> {
+                        state.copy(currentSelectedTracker = effect.tracker)
+                    }
                 }
             },
             actor = { state, action ->
@@ -110,6 +114,18 @@ class TrackersFeature(
                             flowOf(Effect.ErrorEffect("Can't toggle tracker"))
                         }
                     }
+                    is Action.ObserveTracker -> {
+                        if (action.tracker == null) {
+                            flowOf(Effect.ErrorEffect("Null tracker id passed"))
+                        } else {
+                            val tracker = TrackersDataSource.getTracker(action.tracker)
+                            if (tracker != null) {
+                                flowOf(Effect.TrackerLoadedEffect(tracker))
+                            } else {
+                                flowOf(Effect.ErrorEffect("Can't find tracker with name ${action.tracker}"))
+                            }
+                        }
+                    }
                 }
             },
             singleEventProducer = { _, _, effect ->
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index 00fefb6..e3dc941 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -19,9 +19,10 @@ package foundation.e.privacycentralapp.features.trackers
 
 import android.os.Bundle
 import android.view.View
-import androidx.fragment.app.activityViewModels
+import androidx.core.os.bundleOf
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -34,7 +35,7 @@ class TrackersFragment :
     NavToolbarFragment(R.layout.fragment_trackers),
     MVIView<TrackersFeature.State, TrackersFeature.Action> {
 
-    private val viewModel: TrackersViewModel by activityViewModels()
+    private val viewModel: TrackersViewModel by viewModels()
     private lateinit var trackersAdapter: TrackersAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,7 +51,13 @@ class TrackersFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         trackersAdapter = TrackersAdapter {
-            viewModel.submitAction(TrackersFeature.Action.SetSelectedTracker(it))
+            requireActivity().supportFragmentManager.commit {
+                val bundle = bundleOf("TRACKER" to it.name)
+                add<TrackerAppsFragment>(R.id.container, args = bundle)
+                setReorderingAllowed(true)
+                addToBackStack("trackers")
+            }
+            // viewModel.submitAction(TrackersFeature.Action.SetSelectedTracker(it))
         }
         view.findViewById<RecyclerView>(R.id.recylcer_view_trackers)?.apply {
             layoutManager = LinearLayoutManager(requireContext())
@@ -62,15 +69,7 @@ class TrackersFragment :
     override fun getTitle() = getString(R.string.trackers)
 
     override fun render(state: TrackersFeature.State) {
-        if (state.currentSelectedTracker != null) {
-            requireActivity().supportFragmentManager.commit {
-                add<TrackerAppsFragment>(R.id.container)
-                setReorderingAllowed(true)
-                addToBackStack("trackers")
-            }
-        } else {
-            trackersAdapter.setData(state.trackers)
-        }
+        trackersAdapter.setData(state.trackers)
     }
 
     override fun actions(): Flow<TrackersFeature.Action> = viewModel.actions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
index d75d6ec..ee89887 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersViewModel.kt
@@ -17,6 +17,7 @@
 
 package foundation.e.privacycentralapp.features.trackers
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -33,6 +34,7 @@ class TrackersViewModel : ViewModel() {
     }
 
     fun submitAction(action: TrackersFeature.Action) {
+        Log.d("TrackersViewModel", "submitting action")
         viewModelScope.launch {
             _actions.emit(action)
         }
-- 
cgit v1.2.1


From 3553baaa0b85785b755d4466168a2c35019b2a83 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Mon, 21 Jun 2021 14:36:47 +0000
Subject: Use hexed domain instead of simple string

---
 .../foundation/e/privacycentralapp/dummy/TrackersDataSource.kt    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index 7ba7c5b..6224719 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -44,23 +44,23 @@ object TrackersDataSource {
 
     val crashlytics = Tracker(
         "Google Crashlytics Demo (google.com) ",
-        domain = "google.com",
+        domain = "|06|google|03|com",
         trackedApps = listOf(facebook, firefox)
     )
 
     val facebookAds = Tracker(
         "Facebook IP Demo",
-        domain = "157.240.16.35",
+        domain = "|08|facebook|03|com",
         trackedApps = listOf(facebook, whatsapp)
     )
     val rubiconTracker = Tracker(
         "Rubicon Projects (block google)",
-        domain = "google",
+        domain = "|03|www|06|google|03|com",
         trackedApps = listOf(google, blisslauncher, youtube)
     )
     val googleAnalytics = Tracker(
         "Google Analytics",
-        domain = "google.com",
+        domain = "google",
         trackedApps = listOf(facebook, firefox)
     )
 
-- 
cgit v1.2.1


From ddc57b6e1fb8017bb6360f5d10290f6d05f33113 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Tue, 22 Jun 2021 06:12:36 +0000
Subject: Update trackers' domain names

---
 .../e/privacycentralapp/dummy/TrackersDataSource.kt          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index 6224719..d3f168c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -43,24 +43,24 @@ object TrackersDataSource {
     val youtube = TrackedApp("Youtube", true, R.drawable.ic_facebook)
 
     val crashlytics = Tracker(
-        "Google Crashlytics Demo (google.com) ",
-        domain = "|06|google|03|com",
+        "Google Crashlytics",
+        domain = "|11|crashlytics|03|com",
         trackedApps = listOf(facebook, firefox)
     )
 
     val facebookAds = Tracker(
-        "Facebook IP Demo",
+        "Facebook Analytics",
         domain = "|08|facebook|03|com",
         trackedApps = listOf(facebook, whatsapp)
     )
     val rubiconTracker = Tracker(
-        "Rubicon Projects (block google)",
-        domain = "|03|www|06|google|03|com",
+        "Rubicon Projects",
+        domain = "|03|ads|14|rubiconproject|03|com",
         trackedApps = listOf(google, blisslauncher, youtube)
     )
     val googleAnalytics = Tracker(
         "Google Analytics",
-        domain = "google",
+        domain = "|16|google-analytics|03|com",
         trackedApps = listOf(facebook, firefox)
     )
 
-- 
cgit v1.2.1


From f522c4615503120b5e62e45405e8c6c3b18e5e4a Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Tue, 22 Jun 2021 07:11:41 +0000
Subject: Fix incorrect hex codes

---
 .../java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/src/main/java/foundation')

diff --git a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
index d3f168c..b6f319c 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/dummy/TrackersDataSource.kt
@@ -44,7 +44,7 @@ object TrackersDataSource {
 
     val crashlytics = Tracker(
         "Google Crashlytics",
-        domain = "|11|crashlytics|03|com",
+        domain = "|0b|crashlytics|03|com",
         trackedApps = listOf(facebook, firefox)
     )
 
@@ -55,12 +55,12 @@ object TrackersDataSource {
     )
     val rubiconTracker = Tracker(
         "Rubicon Projects",
-        domain = "|03|ads|14|rubiconproject|03|com",
+        domain = "|03|ads|0e|rubiconproject|03|com",
         trackedApps = listOf(google, blisslauncher, youtube)
     )
     val googleAnalytics = Tracker(
         "Google Analytics",
-        domain = "|16|google-analytics|03|com",
+        domain = "|10|google-analytics|03|com",
         trackedApps = listOf(facebook, firefox)
     )
 
-- 
cgit v1.2.1