Skip to content

hardcode ignore ".thumbnail" #4347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Aug 20, 2019
Merged

hardcode ignore ".thumbnail" #4347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.owncloud.android.lib.common.utils.Log_OC;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -95,11 +96,15 @@ public Set<String> getFilesForUpload(String localPath, String syncedFolderId) {
if (value == null) {
Log_OC.e(TAG, "Cannot get local path");
} else {
localPathsToUpload.add(value);
if (".thumbnail".equals(new File(value).getName())) {
Copy link
Member

@AndyScherzinger AndyScherzinger Aug 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couldn't we simply do something like this (pseudo code)?

value.endsWith(".thumbnail")

Copy link
Member Author

@tobiasKaminsky tobiasKaminsky Aug 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to make sure that it is only matching file names and I think it is more intuitive to read, but I can change it.

Copy link
Member

@AndyScherzinger AndyScherzinger Aug 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am fine either way, so feel free to merge

Log_OC.d(TAG, "Ignoring file for upload: " + value);
} else {
localPathsToUpload.add(value);
}
}
} while (cursor.moveToNext());
}

cursor.close();
}

Expand Down