Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bring back external attachment storage

Browse Source
This commit is contained in:
M66B
2023-12-20 13:00:29 +01:00
parent ee754dcace
commit 406486cc05
10 changed files with 146 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/EntityAttachment.java
View File

@@ -22,10 +22,12 @@ package eu.faircode.email;
import static androidx.room.ForeignKey.CASCADE;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import androidx.room.Entity;
import androidx.room.ForeignKey;
import androidx.room.Ignore;
@@ -170,7 +172,7 @@ public class EntityAttachment {
}
static File getFile(Context context, long id, String name) {
File dir = Helper.ensureExists(context, "attachments");
File dir = getRoot(context);
String filename = Long.toString(id);
if (!TextUtils.isEmpty(name))
filename += "." + Helper.sanitizeFilename(name);
@@ -179,6 +181,19 @@ public class EntityAttachment {
return new File(dir, filename);
}
static File getRoot(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean external_storage = prefs.getBoolean("external_storage", false);
if (external_storage) {
File dir = Helper.getExternalFilesDir(context);
dir.mkdirs();
return dir;
}
return Helper.ensureExists(context, "attachments");
}
static void copy(Context context, long oldid, long newid) {
DB db = DB.getInstance(context);