Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

[android] Use new IoUtils to close InputStreams

Browse Source
This commit is contained in:
Torsten Grote
2018-11-26 16:28:06 -02:00
parent 674b29af25
commit 3eb066a836
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java
View File

@@ -32,6 +32,7 @@ import static android.support.media.ExifInterface.TAG_IMAGE_WIDTH;
import static android.support.media.ExifInterface.TAG_ORIENTATION; import static android.support.media.ExifInterface.TAG_ORIENTATION;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.IoUtils.tryToClose;
import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logDuration;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.bramble.util.LogUtils.now;
@@ -122,11 +123,7 @@ class AttachmentController {
} catch (IOException e) { } catch (IOException e) {
logException(LOG, WARNING, e); logException(LOG, WARNING, e);
} finally { } finally {
try { tryToClose(is, LOG, WARNING);
is.close();
} catch (IOException e) {
logException(LOG, WARNING, e);
}
} }
// calculate thumbnail size // calculate thumbnail size

12
briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java
View File

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.android.conversation.AttachmentItem; import org.briarproject.briar.android.conversation.AttachmentItem;
import org.briarproject.briar.api.messaging.MessagingManager; import org.briarproject.briar.api.messaging.MessagingManager;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -23,7 +22,7 @@ import javax.inject.Inject;
import static com.bumptech.glide.load.DataSource.LOCAL; import static com.bumptech.glide.load.DataSource.LOCAL;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.IoUtils.tryToClose;
@NotNullByDefault @NotNullByDefault
class BriarDataFetcher implements DataFetcher<InputStream> { class BriarDataFetcher implements DataFetcher<InputStream> {
@@ -65,14 +64,7 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
@Override @Override
public void cleanup() { public void cleanup() {
final InputStream stream = inputStream; tryToClose(inputStream, LOG, WARNING);
if (stream != null) {
try {
stream.close();
} catch (IOException e) {
logException(LOG, WARNING, e);
}
}
} }
@Override @Override