From f271a1fa2671a37074758d3dfbd00e3b822c2e58 Mon Sep 17 00:00:00 2001 From: Raymond Lai Date: Tue, 14 Sep 2021 21:40:01 +0800 Subject: [PATCH 1/2] Trap IOException on stat() failures Addresses #2779 as band-it solution to prevent crash. --- .../java/com/amaze/filemanager/filesystem/HybridFile.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java index fd064728f..859a54c6c 100644 --- a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java +++ b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java @@ -470,11 +470,10 @@ public class HybridFile { .stat(SshClientUtils.extractRemotePathFrom(path)) .getType() .equals(FileMode.Type.DIRECTORY); - } catch (SFTPException notFound) { + } catch (IOException executionFailure) { Log.e( - getClass().getSimpleName(), - "Fail to execute isDirectory for SFTP path :" + path); - notFound.printStackTrace(); + TAG, "Fail to execute isDirectory for SFTP path :" + path, executionFailure); + executionFailure.printStackTrace(); return false; } } From 11cfd1c7659d305b2a424d4786f76c8852541e82 Mon Sep 17 00:00:00 2001 From: Vishal Nehra Date: Sat, 25 Sep 2021 17:40:30 +0530 Subject: [PATCH 2/2] 2779 Apply spotless --- .../main/java/com/amaze/filemanager/filesystem/HybridFile.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java index e6d478ed2..1c7d9aede 100644 --- a/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java +++ b/app/src/main/java/com/amaze/filemanager/filesystem/HybridFile.java @@ -521,7 +521,8 @@ public class HybridFile { } catch (IOException notFound) { Log.e( getClass().getSimpleName(), - "Fail to execute isDirectory for SFTP path :" + path, notFound); + "Fail to execute isDirectory for SFTP path :" + path, + notFound); return false; } }