fix lints
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
parent
907fdc568c
commit
82f23ece2e
@ -517,14 +517,12 @@ public class RefreshFolderOperation extends RemoteOperation {
|
|||||||
// get current data about local contents of the folder to synchronize
|
// get current data about local contents of the folder to synchronize
|
||||||
Map<String, OCFile> localFilesMap;
|
Map<String, OCFile> localFilesMap;
|
||||||
E2EVersion e2EVersion;
|
E2EVersion e2EVersion;
|
||||||
if (object instanceof DecryptedFolderMetadataFileV1) {
|
if (object instanceof DecryptedFolderMetadataFileV1 metadataFileV1) {
|
||||||
e2EVersion = E2EVersion.V1_2;
|
e2EVersion = E2EVersion.V1_2;
|
||||||
localFilesMap = prefillLocalFilesMap((DecryptedFolderMetadataFileV1) object,
|
localFilesMap = prefillLocalFilesMap(metadataFileV1, fileDataStorageManager.getFolderContent(mLocalFolder, false));
|
||||||
fileDataStorageManager.getFolderContent(mLocalFolder, false));
|
|
||||||
} else {
|
} else {
|
||||||
e2EVersion = E2EVersion.V2_0;
|
e2EVersion = E2EVersion.V2_0;
|
||||||
localFilesMap = prefillLocalFilesMap((DecryptedFolderMetadataFile) object,
|
localFilesMap = prefillLocalFilesMap(object, fileDataStorageManager.getFolderContent(mLocalFolder, false));
|
||||||
fileDataStorageManager.getFolderContent(mLocalFolder, false));
|
|
||||||
|
|
||||||
// update counter
|
// update counter
|
||||||
if (object != null) {
|
if (object != null) {
|
||||||
@ -574,7 +572,7 @@ public class RefreshFolderOperation extends RemoteOperation {
|
|||||||
updateFileNameForEncryptedFileV1(fileDataStorageManager,
|
updateFileNameForEncryptedFileV1(fileDataStorageManager,
|
||||||
(DecryptedFolderMetadataFileV1) object,
|
(DecryptedFolderMetadataFileV1) object,
|
||||||
updatedFile);
|
updatedFile);
|
||||||
} else {
|
} else if (object != null) {
|
||||||
updateFileNameForEncryptedFile(fileDataStorageManager,
|
updateFileNameForEncryptedFile(fileDataStorageManager,
|
||||||
(DecryptedFolderMetadataFile) object,
|
(DecryptedFolderMetadataFile) object,
|
||||||
updatedFile);
|
updatedFile);
|
||||||
|
@ -436,7 +436,7 @@ public class UploadFileOperation extends SyncOperation {
|
|||||||
// parent file is not null anymore:
|
// parent file is not null anymore:
|
||||||
// - it was created on fresh upload or
|
// - it was created on fresh upload or
|
||||||
// - resume of encrypted upload, then parent file exists already as unlock is only for direct parent
|
// - resume of encrypted upload, then parent file exists already as unlock is only for direct parent
|
||||||
|
assert(parent != null);
|
||||||
mFile.setParentId(parent.getFileId());
|
mFile.setParentId(parent.getFileId());
|
||||||
|
|
||||||
// check if any parent is encrypted
|
// check if any parent is encrypted
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
DO NOT TOUCH; GENERATED BY DRONE
|
DO NOT TOUCH; GENERATED BY DRONE
|
||||||
<span class="mdl-layout-title">Lint Report: 11 errors and 54 warnings</span>
|
<span class="mdl-layout-title">Lint Report: 11 errors and 51 warnings</span>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user