be smarter about what files can be deleted
This commit is contained in:
parent
b1ec3a0e29
commit
5c4eccec13
|
@ -33,6 +33,7 @@ import androidx.core.content.FileProvider;
|
||||||
import androidx.exifinterface.media.ExifInterface;
|
import androidx.exifinterface.media.ExifInterface;
|
||||||
|
|
||||||
import com.google.common.base.Strings;
|
import com.google.common.base.Strings;
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.io.ByteStreams;
|
import com.google.common.io.ByteStreams;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
|
@ -83,21 +84,38 @@ public class FileBackend {
|
||||||
private static final float IGNORE_PADDING = 0.15f;
|
private static final float IGNORE_PADDING = 0.15f;
|
||||||
private final XmppConnectionService mXmppConnectionService;
|
private final XmppConnectionService mXmppConnectionService;
|
||||||
|
|
||||||
|
private static final List<String> STORAGE_TYPES;
|
||||||
|
|
||||||
|
static {
|
||||||
|
final ImmutableList.Builder<String> builder =
|
||||||
|
new ImmutableList.Builder<String>()
|
||||||
|
.add(
|
||||||
|
Environment.DIRECTORY_DOWNLOADS,
|
||||||
|
Environment.DIRECTORY_PICTURES,
|
||||||
|
Environment.DIRECTORY_MOVIES,
|
||||||
|
Environment.DIRECTORY_DOCUMENTS);
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
builder.add(Environment.DIRECTORY_RECORDINGS);
|
||||||
|
}
|
||||||
|
STORAGE_TYPES = builder.build();
|
||||||
|
}
|
||||||
|
|
||||||
public FileBackend(XmppConnectionService service) {
|
public FileBackend(XmppConnectionService service) {
|
||||||
this.mXmppConnectionService = service;
|
this.mXmppConnectionService = service;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getFileSize(Context context, Uri uri) {
|
public static long getFileSize(Context context, Uri uri) {
|
||||||
try {
|
try (final Cursor cursor =
|
||||||
final Cursor cursor = context.getContentResolver().query(uri, null, null, null, null);
|
context.getContentResolver().query(uri, null, null, null, null)) {
|
||||||
if (cursor != null && cursor.moveToFirst()) {
|
if (cursor != null && cursor.moveToFirst()) {
|
||||||
long size = cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE));
|
final int index = cursor.getColumnIndex(OpenableColumns.SIZE);
|
||||||
cursor.close();
|
if (index == -1) {
|
||||||
return size;
|
|
||||||
} else {
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
return cursor.getLong(index);
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
} catch (final Exception ignored) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -861,6 +879,20 @@ public class FileBackend {
|
||||||
return new File(appDirectory, filename);
|
return new File(appDirectory, filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean inConversationsDirectory(final Context context, String path) {
|
||||||
|
final File fileDirectory = new File(path).getParentFile();
|
||||||
|
for (final String type : STORAGE_TYPES) {
|
||||||
|
final File typeDirectory =
|
||||||
|
new File(
|
||||||
|
Environment.getExternalStoragePublicDirectory(type),
|
||||||
|
context.getString(R.string.app_name));
|
||||||
|
if (typeDirectory.equals(fileDirectory)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public void setupRelativeFilePath(
|
public void setupRelativeFilePath(
|
||||||
final Message message, final String filename, final String mime) {
|
final Message message, final String filename, final String mime) {
|
||||||
final File file = getStorageLocation(filename, mime);
|
final File file = getStorageLocation(filename, mime);
|
||||||
|
|
|
@ -1184,9 +1184,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
|
||||||
cancelTransmission.setVisible(true);
|
cancelTransmission.setVisible(true);
|
||||||
}
|
}
|
||||||
if (m.isFileOrImage() && !deleted && !cancelable) {
|
if (m.isFileOrImage() && !deleted && !cancelable) {
|
||||||
|
final String path = m.getRelativeFilePath();
|
||||||
|
if (path == null || !path.startsWith("/") || FileBackend.inConversationsDirectory(requireActivity(), path)) {
|
||||||
deleteFile.setVisible(true);
|
deleteFile.setVisible(true);
|
||||||
deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
|
deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (showError) {
|
if (showError) {
|
||||||
showErrorMessage.setVisible(true);
|
showErrorMessage.setVisible(true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue