From 0f19f0975197b51efe7946d3442344354a5b1fc3 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Nov 2023 20:20:35 +0100 Subject: [PATCH] Revert "ROOM temp dir" This reverts commit aaafe78bef37d4f159c3b13efd99c0be1fd03e91. --- app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java | 4 ++-- app/src/main/java/eu/faircode/email/Helper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java b/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java index 6c83eddd0a..f7b856873d 100644 --- a/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java +++ b/app/src/main/java/androidx/room/SQLiteCopyOpenHelper.java @@ -206,8 +206,8 @@ class SQLiteCopyOpenHelper implements SupportSQLiteOpenHelper, DelegatingOpenHel // An intermediate file is used so that we never end up with a half-copied database file // in the internal directory. - File dir = eu.faircode.email.Helper.ensureExists(new File(mContext.getFilesDir(), "shared")); - File intermediateFile = new File(dir,"room-copy-helper.tmp"); + File intermediateFile = File.createTempFile( + "room-copy-helper", ".tmp", mContext.getCacheDir()); intermediateFile.deleteOnExit(); FileChannel output = new FileOutputStream(intermediateFile).getChannel(); FileUtil.copy(input, output); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index dd56863df4..53300f1255 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -2633,7 +2633,7 @@ public class Helper { private static final Map exists = new HashMap<>(); - public static File ensureExists(File dir) { + static File ensureExists(File dir) { synchronized (exists) { if (exists.containsKey(dir)) return dir;