|
@@ -122,6 +122,7 @@ import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.StringRes;
|
|
import androidx.annotation.StringRes;
|
|
import androidx.appcompat.app.ActionBar;
|
|
import androidx.appcompat.app.ActionBar;
|
|
|
|
+import androidx.core.util.ObjectsCompat;
|
|
import androidx.drawerlayout.widget.DrawerLayout;
|
|
import androidx.drawerlayout.widget.DrawerLayout;
|
|
import androidx.fragment.app.FragmentActivity;
|
|
import androidx.fragment.app.FragmentActivity;
|
|
import androidx.recyclerview.widget.GridLayoutManager;
|
|
import androidx.recyclerview.widget.GridLayoutManager;
|
|
@@ -1190,6 +1191,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|
onlyOnDevice,
|
|
onlyOnDevice,
|
|
mLimitToMimeType
|
|
mLimitToMimeType
|
|
);
|
|
);
|
|
|
|
+
|
|
|
|
+ boolean changedDirectory = !ObjectsCompat.equals(mFile, directory);
|
|
mFile = directory;
|
|
mFile = directory;
|
|
|
|
|
|
updateLayout();
|
|
updateLayout();
|
|
@@ -1197,7 +1200,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
|
mAdapter.setHighlightedItem(file);
|
|
mAdapter.setHighlightedItem(file);
|
|
int position = mAdapter.getItemPosition(file);
|
|
int position = mAdapter.getItemPosition(file);
|
|
if (position == -1) {
|
|
if (position == -1) {
|
|
- getRecyclerView().scrollToPosition(0);
|
|
|
|
|
|
+ if (changedDirectory) {
|
|
|
|
+ getRecyclerView().scrollToPosition(0);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
getRecyclerView().scrollToPosition(position);
|
|
getRecyclerView().scrollToPosition(position);
|
|
}
|
|
}
|