thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make exporting backup compatible with conversations

Browse source
This commit is contained in:
Christian Schneppe 2019-11-16 11:27:30 +01:00
parent 74251e61d4
commit da925991c1
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/pixart/messenger/services/ExportBackupService.java
View file

@ -280,11 +280,12 @@ public class ExportBackupService extends Service {
Cursor cursor;
if (runsTwentySix()) {
// not select and create column Message.FILE_DELETED to be compareable with conversations
// in C Message.DELETED = Message.FILE_DELETED in PAM so do not select this column, too.
cursor = db.rawQuery("select messages." + String.join(", messages.", new String[]{
Message.UUID, Message.CONVERSATION, Message.TIME_SENT, Message.COUNTERPART, Message.TRUE_COUNTERPART,
Message.BODY, Message.ENCRYPTION, Message.STATUS, Message.TYPE, Message.RELATIVE_FILE_PATH,
Message.SERVER_MSG_ID, Message.FINGERPRINT, Message.CARBON, Message.EDITED, Message.READ,
Message.DELETED, Message.OOB, Message.ERROR_MESSAGE, Message.READ_BY_MARKERS, Message.MARKABLE,
Message.OOB, Message.ERROR_MESSAGE, Message.READ_BY_MARKERS, Message.MARKABLE,
Message.REMOTE_MSG_ID, Message.CONVERSATION
}) + " from messages join conversations on conversations.uuid=messages.conversationUuid where conversations.accountUuid=?", new String[]{uuid});
} else {