sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2270 from moparisthebest/master 

Stop Conversations force closing over sqlite errors due to long messages
This commit is contained in:
Daniel Gultsch 2017-02-07 17:35:25 +01:00 committed by GitHub
parent 853862ec9c 2a34ece571
commit 6313c3c92e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -154,6 +154,8 @@ public class Message extends AbstractEntity {
} }
} catch (InvalidJidException e) { } catch (InvalidJidException e) {
jid = null; jid = null;
} catch (IllegalStateException e) {
return null; // message too long?
} }
Jid trueCounterpart; Jid trueCounterpart;
try { try {

6
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View File

@ -640,8 +640,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
cursor.moveToLast(); cursor.moveToLast();
do { do {
Message message = Message.fromCursor(cursor); Message message = Message.fromCursor(cursor);
message.setConversation(conversation); if (message != null) {
list.add(message); message.setConversation(conversation);
list.add(message);
}
} while (cursor.moveToPrevious()); } while (cursor.moveToPrevious());
} }
cursor.close(); cursor.close();

2
src/main/java/eu/siacs/conversations/services/ExportLogsService.java
View File

@ -84,6 +84,8 @@ public class ExportLogsService extends Service {
BufferedWriter bw = null; BufferedWriter bw = null;
try { try {
for (Message message : mDatabaseBackend.getMessagesIterable(conversation)) { for (Message message : mDatabaseBackend.getMessagesIterable(conversation)) {
if (message == null)
continue;
if (message.getType() == Message.TYPE_TEXT || message.hasFileOnRemoteHost()) { if (message.getType() == Message.TYPE_TEXT || message.hasFileOnRemoteHost()) {
String date = simpleDateFormat.format(new Date(message.getTimeSent())); String date = simpleDateFormat.format(new Date(message.getTimeSent()));
if (bw == null) { if (bw == null) {