Skip to content

Commit e8f81ac

Browse files
committed
Filtering only folders and showing them as per NMC-2893 Task
1 parent bcda8c1 commit e8f81ac

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

app/src/main/java/com/nextcloud/client/media/NextcloudExoPlayer.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ object NextcloudExoPlayer {
4242
.setMediaSourceFactory(mediaSourceFactory)
4343
.setAudioAttributes(AudioAttributes.DEFAULT, true)
4444
.setHandleAudioBecomingNoisy(true)
45-
.setSeekForwardIncrementMs(FIVE_SECONDS_IN_MILLIS)
45+
// NMC-3192 Fix
46+
.setSeekBackIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)
47+
.setSeekForwardIncrementMs(2 * FIVE_SECONDS_IN_MILLIS)
4648
.build()
4749
}
4850
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
import java.util.Calendar;
9898
import java.util.List;
9999
import java.util.Stack;
100+
import java.util.stream.Collectors;
100101

101102
import javax.inject.Inject;
102103

@@ -742,6 +743,10 @@ private void populateDirectoryList() {
742743
if (mFile != null) {
743744
List<OCFile> files = getStorageManager().getFolderContent(mFile, false);
744745

746+
// NMC-2893 Task
747+
// Filtering and showing only files which are folder
748+
files = files.stream().filter(OCFile::isFolder).collect(Collectors.toList());
749+
745750
if (files.isEmpty()) {
746751
setMessageForEmptyList(R.string.file_list_empty_headline, R.string.empty,
747752
R.drawable.uploads);

0 commit comments

Comments
 (0)