mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

renamed containsFile function

Browse source 
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
This commit is contained in:
Jonas Mayer 2024-07-11 18:15:19 +02:00
parent 3db4443e9f
commit 55526cb5cc
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
View file

@ -276,7 +276,7 @@ public class SyncedFolder implements Serializable, Cloneable {
this.excludeHidden = excludeHidden; this.excludeHidden = excludeHidden;
} }
public boolean containsFile(String filePath){ public boolean containsTypedFile(String filePath){
boolean isCorrectMediaType = boolean isCorrectMediaType =
(getType() == MediaFolderType.IMAGE && MimeTypeUtil.isImage(new File(filePath))) || (getType() == MediaFolderType.IMAGE && MimeTypeUtil.isImage(new File(filePath))) ||
(getType() == MediaFolderType.VIDEO && MimeTypeUtil.isVideo(new File(filePath))) || (getType() == MediaFolderType.VIDEO && MimeTypeUtil.isVideo(new File(filePath))) ||

6
app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
View file

@ -8,7 +8,6 @@
*/ */
package com.owncloud.android.utils; package com.owncloud.android.utils;
import android.accounts.Account;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@ -16,7 +15,6 @@ import android.net.Uri;
import android.provider.MediaStore; import android.provider.MediaStore;
import com.nextcloud.client.account.UserAccountManager; import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.device.BatteryStatus;
import com.nextcloud.client.device.PowerManagementService; import com.nextcloud.client.device.PowerManagementService;
import com.nextcloud.client.jobs.BackgroundJobManager; import com.nextcloud.client.jobs.BackgroundJobManager;
import com.nextcloud.client.jobs.upload.FileUploadHelper; import com.nextcloud.client.jobs.upload.FileUploadHelper;
@ -27,8 +25,6 @@ import com.owncloud.android.datamodel.MediaFolderType;
import com.owncloud.android.datamodel.SyncedFolder; import com.owncloud.android.datamodel.SyncedFolder;
import com.owncloud.android.datamodel.SyncedFolderProvider; import com.owncloud.android.datamodel.SyncedFolderProvider;
import com.owncloud.android.datamodel.UploadsStorageManager; import com.owncloud.android.datamodel.UploadsStorageManager;
import com.owncloud.android.db.OCUpload;
import com.owncloud.android.db.UploadResult;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import org.lukhnos.nnio.file.FileVisitResult; import org.lukhnos.nnio.file.FileVisitResult;
@ -152,7 +148,7 @@ public final class FilesSyncHelper {
final FilesystemDataProvider filesystemDataProvider = new FilesystemDataProvider(contentResolver); final FilesystemDataProvider filesystemDataProvider = new FilesystemDataProvider(contentResolver);
for (String changedFileURI : changedFiles){ for (String changedFileURI : changedFiles){
String changedFile = getFileFromURI(changedFileURI); String changedFile = getFileFromURI(changedFileURI);
if (syncedFolder.isEnabled() && syncedFolder.containsFile(changedFile)){ if (syncedFolder.containsTypedFile(changedFile)){
File file = new File(changedFile); File file = new File(changedFile);
filesystemDataProvider.storeOrUpdateFileValue(changedFile, filesystemDataProvider.storeOrUpdateFileValue(changedFile,
file.lastModified(),file.isDirectory(), file.lastModified(),file.isDirectory(),