Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where drafts might not be properly deleted.

Browse Source
This commit is contained in:
Alex Hart
2021-07-07 16:43:24 -03:00
committed by Cody Henthorne
parent 14484deabe
commit f79b445fdf
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -2660,6 +2660,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
threadDatabase.update(threadId, false);
}
if (drafts.isEmpty()) {
draftDatabase.clearDrafts(threadId);
}
return threadId;
}

9
app/src/main/java/org/thoughtcrime/securesms/database/DraftDatabase.java
View File

@@ -8,6 +8,7 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.util.CursorUtil;
@@ -19,6 +20,8 @@ import java.util.Set;
public class DraftDatabase extends Database {
private static final String TAG = Log.tag(DraftDatabase.class);
static final String TABLE_NAME = "drafts";
public static final String ID = "_id";
public static final String THREAD_ID = "thread_id";
@@ -42,7 +45,8 @@ public class DraftDatabase extends Database {
try {
db.beginTransaction();
db.delete(TABLE_NAME, THREAD_ID + " = ?", SqlUtil.buildArgs(threadId));
int deletedRowCount = db.delete(TABLE_NAME, THREAD_ID + " = ?", SqlUtil.buildArgs(threadId));
Log.d(TAG, "[replaceDrafts] Deleted " + deletedRowCount + " rows for thread " + threadId);
for (Draft draft : drafts) {
ContentValues values = new ContentValues(3);
@@ -61,7 +65,8 @@ public class DraftDatabase extends Database {
public void clearDrafts(long threadId) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
db.delete(TABLE_NAME, THREAD_ID + " = ?", new String[] {threadId+""});
int deletedRowCount = db.delete(TABLE_NAME, THREAD_ID + " = ?", SqlUtil.buildArgs(threadId));
Log.d(TAG, "[clearDrafts] Deleted " + deletedRowCount + " rows for thread " + threadId);
}
void clearDrafts(Set<Long> threadIds) {