Merge pull request #16909 from nextcloud/fix/gallery-stay-where-it-is-after-picking-image

fix(gallery): scroll to position

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -93,6 +93,7 @@
 import com.owncloud.android.ui.events.ChangeMenuEvent;
 import com.owncloud.android.ui.events.SearchEvent;
 import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment;
+import com.owncloud.android.ui.fragment.GalleryFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.navigation.NavigatorActivity;
 import com.owncloud.android.ui.navigation.NavigatorScreen;
@@ -330,6 +331,7 @@ private void openFavoritesTab() {
     }
 
     private void openMediaTab(int menuItemId) {
+        GalleryFragment.Companion.setLastMediaItemPosition(null);
         resetOnlyPersonalAndOnDevice();
         setupToolbar();
         startPhotoSearch(menuItemId);

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt

@@ -131,8 +131,6 @@ class GalleryFragment :
 
         LocalBroadcastManager.getInstance(requireContext()).unregisterReceiver(refreshSearchEventReceiver)
 
-        setLastMediaItemPosition(null)
-
         adapter?.cleanup()
 
         super.onDestroyView()
@@ -188,13 +186,12 @@ class GalleryFragment :
             (recyclerView as EmptyRecyclerView).setHasFooter(false)
         }
 
-        if (recyclerView != null) {
-            val layoutManager = GridLayoutManager(context, 1)
-            adapter?.setLayoutManager(layoutManager)
-            recyclerView?.setLayoutManager(layoutManager)
-
-            if (lastMediaItemPosition != null) {
-                layoutManager.scrollToPosition(lastMediaItemPosition!!)
+        val layoutManager = GridLayoutManager(context, 1)
+        adapter?.setLayoutManager(layoutManager)
+        recyclerView?.setLayoutManager(layoutManager)
+        recyclerView?.post {
+            lastMediaItemPosition?.let { position ->
+                recyclerView?.layoutManager?.scrollToPosition(position)
             }
         }
     }