SmbjFileEditor: check that DiskShare is still open when closing file

See nova-video-player/aos-AVP#925 See https://nova-video-player.sentry.io/issues/4269713867
nova-video-player · Feb 12, 2024 · 63d0f23 · 63d0f23
1 parent f02859c
commit 63d0f23
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/com/archos/filecorelibrary/smbj/SmbjFileEditor.java b/src/com/archos/filecorelibrary/smbj/SmbjFileEditor.java
@@ -59,7 +59,8 @@ public InputStream getInputStream() throws Exception {
         ObservableInputStream ois = new ObservableInputStream(is);
         ois.onClose(() -> {if (smbjFile != null) {
             log.trace("getInputStream: closing " + mUri);
-            smbjFile.closeSilently();
+            // check that DiskShare has not already been closed (seen on sentry)
+            if (smbjFile.getDiskShare().isConnected()) smbjFile.closeSilently();
         }});
         return ois;
     }
@@ -78,7 +79,8 @@ public InputStream getInputStream(long from) throws Exception {
         ObservableInputStream ois = new ObservableInputStream(is);
         ois.onClose(() -> {if (smbjFile != null) {
             log.trace("getInputStream: closing " + mUri);
-            smbjFile.closeSilently();
+            // check that DiskShare has not already been closed (seen on sentry)
+            if (smbjFile.getDiskShare().isConnected()) smbjFile.closeSilently();
         }});
         return ois;
     }
@@ -95,7 +97,8 @@ public OutputStream getOutputStream() throws Exception {
         ObservableOutputStream oos = new ObservableOutputStream(os);
         oos.onClose(() -> {if (smbjFile != null) {
             log.trace("getOutputStream: closing " + mUri);
-            smbjFile.closeSilently();
+            // check that DiskShare has not already been closed (seen on sentry)
+            if (smbjFile.getDiskShare().isConnected()) smbjFile.closeSilently();
         }});
         return oos;
     }