From 35a625234bbda8338635c8d7e3afddbb2d36329a Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 23 Aug 2019 11:18:16 +0200 Subject: [PATCH 1/2] parent file can be null Signed-off-by: tobiasKaminsky --- .../com/owncloud/android/ui/activity/FileDisplayActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 00566235cc..3daf1711de 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1892,7 +1892,8 @@ public class FileDisplayActivity extends FileActivity setFile(getStorageManager().getFileById(removedFile.getParentId())); cleanSecondFragment(); } - if (getStorageManager().getFileById(removedFile.getParentId()).equals(getCurrentDir())) { + OCFile parentFile = getStorageManager().getFileById(removedFile.getParentId()); + if (parentFile != null && parentFile.equals(getCurrentDir())) { refreshListOfFilesFragment(false); } supportInvalidateOptionsMenu(); From 4d5b166fc09c10fefa24295deca830ebf824b25e Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Fri, 23 Aug 2019 09:31:45 +0000 Subject: [PATCH 2/2] Drone: update FindBugs results to reflect reduced error/warning count [skip ci] Signed-off-by: nextcloud-android-bot --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 8d4011ad25..8e9088e93b 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -412 \ No newline at end of file +411 \ No newline at end of file