From d0e01b3b9b79b5d2449c0cc4b34d16c176459372 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Fri, 2 Apr 2021 16:59:28 -0400
Subject: [PATCH] fix notification navigation in pursuant to #850

---
 .../NotificationsViewerFragment.java          |  3 +--
 .../settings/MorePreferencesFragment.java     |  2 --
 .../notification_viewer_nav_graph.xml         | 11 ++++++++++
 .../main/res/navigation/profile_nav_graph.xml | 20 ++++++++++++++++---
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
index d9b56ce7..77157ab6 100644
--- a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
@@ -31,7 +31,6 @@ import awais.instagrabber.R;
 import awais.instagrabber.adapters.NotificationsAdapter;
 import awais.instagrabber.adapters.NotificationsAdapter.OnNotificationClickListener;
 import awais.instagrabber.databinding.FragmentNotificationsViewerBinding;
-import awais.instagrabber.fragments.settings.MorePreferencesFragmentDirections;
 import awais.instagrabber.models.enums.NotificationType;
 import awais.instagrabber.repositories.requests.StoryViewerOptions;
 import awais.instagrabber.repositories.responses.FriendshipChangeResponse;
@@ -278,7 +277,7 @@ public final class NotificationsViewerFragment extends Fragment implements Swipe
     }
 
     private void openProfile(final String username) {
-        final NavDirections action = MorePreferencesFragmentDirections
+        final NavDirections action = NotificationsViewerFragmentDirections
                 .actionGlobalProfileFragment("@" + username);
         NavHostFragment.findNavController(this).navigate(action);
     }
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
index 6e9e13fd..a7d39fc8 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
@@ -223,8 +223,6 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
                                            -1,
                                            preference -> {
                                                if (BuildConfig.isPre) return true;
-                                               final AppCompatActivity activity = (AppCompatActivity) getActivity();
-                                               if (activity == null) return true;
                                                FlavorTown.updateCheck(activity, true);
                                                return true;
                                            }));
diff --git a/app/src/main/res/navigation/notification_viewer_nav_graph.xml b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
index 89df18be..8f80b18e 100644
--- a/app/src/main/res/navigation/notification_viewer_nav_graph.xml
+++ b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
@@ -24,6 +24,17 @@
             app:destination="@id/storyViewerFragment" />
     </fragment>
 
+    <include app:graph="@navigation/profile_nav_graph" />
+
+    <action
+        android:id="@+id/action_global_profileFragment"
+        app:destination="@id/profile_nav_graph">
+        <argument
+            android:name="username"
+            app:argType="string"
+            app:nullable="true" />
+    </action>
+
     <action
         android:id="@+id/action_global_notificationsViewerFragment"
         app:destination="@id/notificationsViewer">
diff --git a/app/src/main/res/navigation/profile_nav_graph.xml b/app/src/main/res/navigation/profile_nav_graph.xml
index 8ef07dca..8bff84b8 100644
--- a/app/src/main/res/navigation/profile_nav_graph.xml
+++ b/app/src/main/res/navigation/profile_nav_graph.xml
@@ -71,11 +71,9 @@
             app:argType="long" />
     </action>
 
-    <include app:graph="@navigation/notification_viewer_nav_graph" />
-
     <action
         android:id="@+id/action_global_notificationsViewerFragment"
-        app:destination="@id/notification_viewer_nav_graph">
+        app:destination="@id/notificationsViewer">
         <argument
             android:name="type"
             app:argType="string"
@@ -86,6 +84,22 @@
             app:argType="long" />
     </action>
 
+    <fragment
+        android:id="@+id/notificationsViewer"
+        android:name="awais.instagrabber.fragments.NotificationsViewerFragment"
+        android:label="@string/title_notifications"
+        tools:layout="@layout/fragment_notifications_viewer">
+        <argument
+            android:name="type"
+            app:argType="string"
+            app:nullable="false"
+            android:defaultValue="notif"/>
+        <argument
+            android:name="targetId"
+            android:defaultValue="0L"
+            app:argType="long" />
+    </fragment>
+
     <include app:graph="@navigation/saved_nav_graph" />
 
     <action