blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up dangling transfer files. 

Fixes #9033
master
Greyson Parrelli 2020-03-01 11:41:46 -05:00
parent 44e845c875
commit f68d99d16d
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
View File

@ -519,16 +519,16 @@ public class AttachmentDatabase extends Database {
if (database.update(TABLE_NAME, values, PART_ID_WHERE, attachmentId.toStrings()) == 0) {
//noinspection ResultOfMethodCallIgnored
dataInfo.file.delete();
if (transferFile != null) {
//noinspection ResultOfMethodCallIgnored
transferFile.delete();
}
} else {
notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(mmsId));
notifyConversationListListeners();
}
if (transferFile != null) {
//noinspection ResultOfMethodCallIgnored
transferFile.delete();
}
thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId, STANDARD_THUMB_TIME));
}

26
app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View File

@ -57,6 +57,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import java.io.File;
import java.io.FilenameFilter;
import java.util.List;
public class SQLCipherOpenHelper extends SQLiteOpenHelper {
@ -114,8 +115,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
private static final int ATTACHMENT_FILE_INDEX = 49;
private static final int STORAGE_SERVICE_ACTIVE = 50;
private static final int GROUPS_V2_RECIPIENT_CAPABILITY = 51;
private static final int TRANSFER_FILE_CLEANUP = 52;
private static final int DATABASE_VERSION = 51;
private static final int DATABASE_VERSION = 52;
private static final String DATABASE_NAME = "signal.db";
private final Context context;
@ -766,6 +768,28 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE recipient ADD COLUMN gv2_capability INTEGER DEFAULT 0");
}
if (oldVersion < TRANSFER_FILE_CLEANUP) {
File partsDirectory = context.getDir("parts", Context.MODE_PRIVATE);
if (partsDirectory.exists()) {
File[] transferFiles = partsDirectory.listFiles((dir, name) -> name.startsWith("transfer"));
int deleteCount = 0;
Log.i(TAG, "Found " + transferFiles.length + " dangling transfer files.");
for (File file : transferFiles) {
if (file.delete()) {
Log.i(TAG, "Deleted " + file.getName());
deleteCount++;
}
}
Log.i(TAG, "Deleted " + deleteCount + " dangling transfer files.");
} else {
Log.w(TAG, "Part directory did not exist. Skipping.");
}
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();