Closes #668, reverts #664

Adamantcheese · Feb 18, 2020 · e1eaa8f · e1eaa8f
1 parent 4b4ac93
commit e1eaa8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/toolbar/ToolbarContainer.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/toolbar/ToolbarContainer.java
@@ -114,11 +114,10 @@ public void setArrowMenu(ArrowMenuDrawable arrowMenu) {
     }
 
     public void set(NavigationItem item, Theme theme, ToolbarPresenter.AnimationStyle animation) {
-        if (transitionView != null || (currentView != null && currentView.item == item)) {
+        if (transitionView != null) {
             // Happens when you are in Phone layout, moving the thread fragment and at the same time
             // thread update occurs. We probably should just skip it. But maybe there is a better
             // solution.
-            // Also prevent setting of an item that already exists in the current view
             return;
         }
 

diff --git a/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/toolbar/ToolbarPresenter.java b/Kuroba/app/src/main/java/com/github/adamantcheese/chan/ui/toolbar/ToolbarPresenter.java
@@ -119,6 +119,9 @@ private void cancelTransitionIfNeeded() {
         }
     }
 
+    /**
+     * Returns true if search was closed, false otherwise
+     */
     public boolean closeSearchIfNeeded() {
         // Cancel search, but don't unmark it as a search item so that onback will automatically pull up the search window
         if (item != null && item.search) {