Add condition to do not navigate to 0 (#357)

Co-authored-by: Benjamin Falière <[email protected]>
Exodus-Privacy · Dec 9, 2023 · 1579260 · 1579260
1 parent 4cdbca5
commit 1579260
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/apps/model/AppsRVAdapter.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/apps/model/AppsRVAdapter.kt
@@ -12,6 +12,7 @@ import org.eu.exodus_privacy.exodusprivacy.databinding.RecyclerViewAppItemBindin
 import org.eu.exodus_privacy.exodusprivacy.fragments.apps.AppsFragmentDirections
 import org.eu.exodus_privacy.exodusprivacy.fragments.trackerdetail.TrackerDetailFragmentDirections
 import org.eu.exodus_privacy.exodusprivacy.manager.database.app.ExodusApplication
+import org.eu.exodus_privacy.exodusprivacy.utils.safeNavigate
 import org.eu.exodus_privacy.exodusprivacy.utils.setExodusColor
 
 class AppsRVAdapter(
@@ -37,14 +38,16 @@ class AppsRVAdapter(
 
         holder.binding.apply {
             root.setOnClickListener {
-                val action = if (currentDestinationId == R.id.appsFragment) {
-                    AppsFragmentDirections.actionAppsFragmentToAppDetailFragment(app.packageName)
-                } else {
-                    TrackerDetailFragmentDirections.actionTrackerDetailFragmentToAppDetailFragment(
-                        app.packageName
-                    )
+                if (currentDestinationId != 0) {
+                    val action = if (currentDestinationId == R.id.appsFragment) {
+                        AppsFragmentDirections.actionAppsFragmentToAppDetailFragment(app.packageName)
+                    } else {
+                        TrackerDetailFragmentDirections.actionTrackerDetailFragmentToAppDetailFragment(
+                            app.packageName
+                        )
+                    }
+                    it.findNavController().safeNavigate(action)
                 }
-                it.findNavController().navigate(action)
             }
             appIconIV.background = app.icon.toDrawable(context.resources)
             appNameTV.text = app.name

diff --git a/...in/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackers/model/TrackersRVAdapter.kt b/...in/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackers/model/TrackersRVAdapter.kt
@@ -20,6 +20,7 @@ import org.eu.exodus_privacy.exodusprivacy.databinding.RecyclerViewTrackerItemBi
 import org.eu.exodus_privacy.exodusprivacy.fragments.appdetail.AppDetailFragmentDirections
 import org.eu.exodus_privacy.exodusprivacy.fragments.trackers.TrackersFragmentDirections
 import org.eu.exodus_privacy.exodusprivacy.manager.database.tracker.TrackerData
+import org.eu.exodus_privacy.exodusprivacy.utils.safeNavigate
 
 class TrackersRVAdapter(
     private val showSuggestions: Boolean,
@@ -107,18 +108,21 @@ class TrackersRVAdapter(
                 }
             }
             root.setOnClickListener {
-                val action = if (currentDestinationId == R.id.appDetailFragment) {
-                    AppDetailFragmentDirections.actionAppDetailFragmentToTrackerDetailFragment(
-                        app.id,
-                        trackerPercentage.toInt()
-                    )
-                } else {
-                    TrackersFragmentDirections.actionTrackersFragmentToTrackerDetailFragment(
-                        app.id,
-                        trackerPercentage.toInt()
-                    )
+                if (currentDestinationId != 0) {
+                    val action =
+                        if (currentDestinationId == R.id.appDetailFragment) {
+                            AppDetailFragmentDirections.actionAppDetailFragmentToTrackerDetailFragment(
+                                app.id,
+                                trackerPercentage.toInt()
+                            )
+                        } else {
+                            TrackersFragmentDirections.actionTrackersFragmentToTrackerDetailFragment(
+                                app.id,
+                                trackerPercentage.toInt()
+                            )
+                        }
+                    holder.itemView.findNavController().safeNavigate(action)
                 }
-                holder.itemView.findNavController().navigate(action)
             }
         }
     }

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/Navigation.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/utils/Navigation.kt
@@ -0,0 +1,10 @@
+package org.eu.exodus_privacy.exodusprivacy.utils
+
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+
+fun NavController.safeNavigate(direction: NavDirections) {
+    currentDestination?.getAction(direction.actionId)?.run {
+        navigate(direction)
+    }
+}