Skip to content

Commit 82f23ec

Browse files
committed
fix lints
Signed-off-by: alperozturk <[email protected]>
1 parent 907fdc5 commit 82f23ec

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,14 +517,12 @@ private void synchronizeData(List<Object> folderAndFiles) {
517517
// get current data about local contents of the folder to synchronize
518518
Map<String, OCFile> localFilesMap;
519519
E2EVersion e2EVersion;
520-
if (object instanceof DecryptedFolderMetadataFileV1) {
520+
if (object instanceof DecryptedFolderMetadataFileV1 metadataFileV1) {
521521
e2EVersion = E2EVersion.V1_2;
522-
localFilesMap = prefillLocalFilesMap((DecryptedFolderMetadataFileV1) object,
523-
fileDataStorageManager.getFolderContent(mLocalFolder, false));
522+
localFilesMap = prefillLocalFilesMap(metadataFileV1, fileDataStorageManager.getFolderContent(mLocalFolder, false));
524523
} else {
525524
e2EVersion = E2EVersion.V2_0;
526-
localFilesMap = prefillLocalFilesMap((DecryptedFolderMetadataFile) object,
527-
fileDataStorageManager.getFolderContent(mLocalFolder, false));
525+
localFilesMap = prefillLocalFilesMap(object, fileDataStorageManager.getFolderContent(mLocalFolder, false));
528526

529527
// update counter
530528
if (object != null) {
@@ -574,7 +572,7 @@ private void synchronizeData(List<Object> folderAndFiles) {
574572
updateFileNameForEncryptedFileV1(fileDataStorageManager,
575573
(DecryptedFolderMetadataFileV1) object,
576574
updatedFile);
577-
} else {
575+
} else if (object != null) {
578576
updateFileNameForEncryptedFile(fileDataStorageManager,
579577
(DecryptedFolderMetadataFile) object,
580578
updatedFile);

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
436436
// parent file is not null anymore:
437437
// - it was created on fresh upload or
438438
// - resume of encrypted upload, then parent file exists already as unlock is only for direct parent
439-
439+
assert(parent != null);
440440
mFile.setParentId(parent.getFileId());
441441

442442
// check if any parent is encrypted

scripts/analysis/lint-results.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DO NOT TOUCH; GENERATED BY DRONE
2-
<span class="mdl-layout-title">Lint Report: 11 errors and 54 warnings</span>
2+
<span class="mdl-layout-title">Lint Report: 11 errors and 51 warnings</span>

0 commit comments

Comments
 (0)