|
109 | 109 |
|
110 | 110 | import java.lang.ref.WeakReference; |
111 | 111 | import java.util.ArrayList; |
112 | | -import java.util.Objects; |
113 | 112 |
|
114 | 113 | import javax.inject.Inject; |
115 | 114 |
|
@@ -841,18 +840,25 @@ private void onUpdateShareInformation(RemoteOperationResult result, @StringRes i |
841 | 840 | } |
842 | 841 |
|
843 | 842 | public void refreshList() { |
844 | | - // first check for album fragments |
845 | 843 | if (isAlbumsFragment()) { |
846 | | - ((AlbumsFragment) Objects.requireNonNull(getSupportFragmentManager().findFragmentByTag(AlbumsFragment.Companion.getTAG()))).refreshAlbums(); |
847 | | - } else if (isAlbumItemsFragment()) { |
848 | | - ((AlbumItemsFragment) Objects.requireNonNull(getSupportFragmentManager().findFragmentByTag(AlbumItemsFragment.Companion.getTAG()))).refreshData(); |
849 | | - } else { |
850 | | - final Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_LIST_OF_FILES); |
851 | | - if (fragment instanceof OCFileListFragment listFragment) { |
852 | | - listFragment.onRefresh(); |
853 | | - } else if (fragment instanceof FileDetailFragment detailFragment) { |
854 | | - detailFragment.goBackToOCFileListFragment(); |
855 | | - } |
| 844 | + getFragment(AlbumsFragment.Companion.getTAG(), AlbumsFragment.class) |
| 845 | + .ifPresent(AlbumsFragment::refreshAlbums); |
| 846 | + return; |
| 847 | + } |
| 848 | + |
| 849 | + if (isAlbumItemsFragment()) { |
| 850 | + getFragment(AlbumItemsFragment.Companion.getTAG(), AlbumItemsFragment.class) |
| 851 | + .ifPresent(AlbumItemsFragment::refreshData); |
| 852 | + return; |
| 853 | + } |
| 854 | + |
| 855 | + final var fragment = |
| 856 | + getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_LIST_OF_FILES); |
| 857 | + |
| 858 | + if (fragment instanceof OCFileListFragment listFragment) { |
| 859 | + listFragment.onRefresh(); |
| 860 | + } else if (fragment instanceof FileDetailFragment detailFragment) { |
| 861 | + detailFragment.goBackToOCFileListFragment(); |
856 | 862 | } |
857 | 863 | } |
858 | 864 |
|
|
0 commit comments