mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-28 11:29:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't overwrite DB Status LOCAL_CREATED with LOCAL_EDITED

Browse source 
To prevent errors on synchronization (create -> edit -> sync)
This commit is contained in:
Stefan Niedermann 2016-03-09 14:47:22 +01:00
parent 37df7dd93c
commit eb6e2b0d74
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSQLiteOpenHelper.java
View file

@ -226,9 +226,26 @@ public class NoteSQLiteOpenHelper extends SQLiteOpenHelper {
@SuppressWarnings("UnusedReturnValue") @SuppressWarnings("UnusedReturnValue")
public int updateNoteAndSync(Note note) { public int updateNoteAndSync(Note note) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
DBStatus newStatus = DBStatus.LOCAL_EDITED;
Cursor cursor =
db.query(table_notes,
columns,
key_id + " = ? AND " + key_status + " != ?",
new String[]{String.valueOf(note.getId()), DBStatus.LOCAL_DELETED.getTitle()},
null,
null,
null,
null);
if (cursor != null) {
cursor.moveToFirst();
if (DBStatus.valueOf(cursor.getString(1)) == DBStatus.LOCAL_CREATED) {
newStatus = DBStatus.LOCAL_CREATED;
}
cursor.close();
}
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(key_id, note.getId()); values.put(key_id, note.getId());
values.put(key_status, DBStatus.LOCAL_EDITED.getTitle()); values.put(key_status, newStatus.getTitle());
values.put(key_title, note.getTitle()); values.put(key_title, note.getTitle());
values.put(key_modified, note.getModified(DATE_FORMAT)); values.put(key_modified, note.getModified(DATE_FORMAT));
values.put(key_content, note.getContent()); values.put(key_content, note.getContent());