diff options
| author | Álvaro Brey Vilas <alvaro.brey@nextcloud.com> | 2022-02-25 18:38:45 +0300 |
|---|---|---|
| committer | Álvaro Brey (Rebase PR Action) <AlvaroBrey@users.noreply.github.com> | 2022-02-28 17:11:09 +0300 |
| commit | eeee11e4278a7c88ee6e983b3e9a3271d67ed19c (patch) | |
| tree | f0a12fc1d9e6952e7e32ca4568ff6a73c31022e5 | |
| parent | 1954584741e8631e07db556d3cc1000c840a928d (diff) | |
PreviewImageActivity: don't try to use virtual folder is type is NONEfix/preview-shared
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
| -rw-r--r-- | src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java index 8debefb9e5..d11d63af99 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -60,6 +60,8 @@ import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.utils.MimeTypeUtil; import com.owncloud.android.utils.theme.ThemeToolbarUtils; +import java.io.Serializable; + import javax.inject.Inject; import androidx.annotation.NonNull; @@ -137,8 +139,9 @@ public class PreviewImageActivity extends FileActivity implements private void initViewPager(User user) { // virtual folder - if (getIntent().getSerializableExtra(EXTRA_VIRTUAL_TYPE) != null) { - VirtualFolderType type = (VirtualFolderType) getIntent().getSerializableExtra(EXTRA_VIRTUAL_TYPE); + final Serializable virtualFolderType = getIntent().getSerializableExtra(EXTRA_VIRTUAL_TYPE); + if (virtualFolderType != null && virtualFolderType != VirtualFolderType.NONE) { + VirtualFolderType type = (VirtualFolderType) virtualFolderType; mPreviewImagePagerAdapter = new PreviewImagePagerAdapter(getSupportFragmentManager(), type, diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java index 62e0609392..86f067a7f4 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java @@ -110,6 +110,9 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter { if (type == null) { throw new IllegalArgumentException("NULL parent folder"); } + if(type == VirtualFolderType.NONE){ + throw new IllegalArgumentException("NONE virtual folder type"); + } if (storageManager == null) { throw new IllegalArgumentException("NULL storage manager"); } |