Don't scroll to selected list item if it didn't change. (#989)

Fixes #976 Signed-off-by: Danny Baumann <[email protected]>
openhab · Sep 10, 2018 · 88c2d2f · 88c2d2f
1 parent bef96cc
commit 88c2d2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABWidgetAdapter.java b/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABWidgetAdapter.java
@@ -313,9 +313,9 @@ private int getItemViewType(OpenHABWidget widget) {
         }
     }
 
-    public void setSelectedPosition(int position) {
+    public boolean setSelectedPosition(int position) {
         if (mSelectedPosition == position) {
-            return;
+            return false;
         }
         if (mSelectedPosition >= 0) {
             notifyItemChanged(mSelectedPosition);
@@ -324,6 +324,7 @@ public void setSelectedPosition(int position) {
         if (position >= 0) {
             notifyItemChanged(position);
         }
+        return true;
     }
 
     @Override

diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABWidgetListFragment.java b/mobile/src/main/java/org/openhab/habdroid/ui/OpenHABWidgetListFragment.java
@@ -273,17 +273,19 @@ public void setHighlightedPageLink(String highlightedPageLink) {
         if (openHABWidgetAdapter == null) {
             return;
         }
-        openHABWidgetAdapter.setSelectedPosition(-1);
         if (highlightedPageLink != null) {
             for (int i = 0; i < openHABWidgetAdapter.getItemCount(); i++) {
                 OpenHABLinkedPage page = openHABWidgetAdapter.getItem(i).linkedPage();
                 if (page != null && highlightedPageLink.equals(page.link())) {
-                    openHABWidgetAdapter.setSelectedPosition(i);
-                    mLayoutManager.scrollToPosition(i);
-                    break;
+                    if (openHABWidgetAdapter.setSelectedPosition(i)) {
+                        mLayoutManager.scrollToPosition(i);
+                    }
+                    return;
                 }
             }
         }
+        // We didn't find a matching page link, so unselect everything
+        openHABWidgetAdapter.setSelectedPosition(-1);
     }
 
     public void update(String pageTitle, List<OpenHABWidget> widgets) {