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

Remove empty categories

Browse source
This commit is contained in:
Isaac_Chen 2020-05-07 22:53:26 +08:00
parent 46fa52a9a7
commit 9aba743b3c
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
View file

@ -385,9 +385,7 @@ public class NotesDatabase extends AbstractNotesDatabase {
String note_title = String.format("%s.%s", table_notes, key_category); String note_title = String.format("%s.%s", table_notes, key_category);
String category_id = String.format("%s.%s", table_category, key_id); String category_id = String.format("%s.%s", table_category, key_id);
String category_accountId = String.format("%s.%s", table_category, key_account_id); String category_accountId = String.format("%s.%s", table_category, key_account_id);
String rawQuery; String rawQuery = "SELECT " + category_title + ", COUNT(*) FROM " + table_category + " INNER JOIN " + table_notes +
rawQuery = "SELECT " + category_title + ", COUNT(*) FROM " + table_category + " INNER JOIN " + table_notes +
" ON " + note_title + " = " + category_id + " WHERE " + key_status + " != ? AND " + category_accountId + " ON " + note_title + " = " + category_id + " WHERE " + key_status + " != ? AND " + category_accountId +
" = ? AND " + category_title + " LIKE ? AND " + category_title + " != \"\" GROUP BY " + category_title; " = ? AND " + category_title + " LIKE ? AND " + category_title + " != \"\" GROUP BY " + category_title;
@ -446,6 +444,7 @@ public class NotesDatabase extends AbstractNotesDatabase {
int id = getCategoryIdByTitle(note.getAccountId(), note.getCategory(), true); int id = getCategoryIdByTitle(note.getAccountId(), note.getCategory(), true);
values.put(key_category, id); values.put(key_category, id);
db.update(table_notes, values, key_id + " = ?", new String[]{String.valueOf(note.getId())}); db.update(table_notes, values, key_id + " = ?", new String[]{String.valueOf(note.getId())});
removeEmptyCategory(note.getAccountId());
if (callback != null) { if (callback != null) {
serverSyncHelper.addCallbackPush(ssoAccount, callback); serverSyncHelper.addCallbackPush(ssoAccount, callback);
} }
@ -487,6 +486,7 @@ public class NotesDatabase extends AbstractNotesDatabase {
values.put(key_content, newNote.getContent()); values.put(key_content, newNote.getContent());
values.put(key_excerpt, newNote.getExcerpt()); values.put(key_excerpt, newNote.getExcerpt());
int rows = db.update(table_notes, values, key_id + " = ? AND (" + key_content + " != ? OR " + key_category + " != ?)", new String[]{String.valueOf(newNote.getId()), newNote.getContent(), newNote.getCategory()}); int rows = db.update(table_notes, values, key_id + " = ? AND (" + key_content + " != ? OR " + key_category + " != ?)", new String[]{String.valueOf(newNote.getId()), newNote.getContent(), newNote.getCategory()});
removeEmptyCategory(accountId);
// if data was changed, set new status and schedule sync (with callback); otherwise invoke callback directly. // if data was changed, set new status and schedule sync (with callback); otherwise invoke callback directly.
if (rows > 0) { if (rows > 0) {
notifyNotesChanged(); notifyNotesChanged();
@ -548,6 +548,7 @@ public class NotesDatabase extends AbstractNotesDatabase {
whereArgs = new String[]{String.valueOf(id), DBStatus.VOID.getTitle(), Long.toString(remoteNote.getModified().getTimeInMillis() / 1000), remoteNote.getTitle(), remoteNote.isFavorite() ? "1" : "0", remoteNote.getCategory(), remoteNote.getEtag(), remoteNote.getContent()}; whereArgs = new String[]{String.valueOf(id), DBStatus.VOID.getTitle(), Long.toString(remoteNote.getModified().getTimeInMillis() / 1000), remoteNote.getTitle(), remoteNote.isFavorite() ? "1" : "0", remoteNote.getCategory(), remoteNote.getEtag(), remoteNote.getContent()};
} }
int i = db.update(table_notes, values, whereClause, whereArgs); int i = db.update(table_notes, values, whereClause, whereArgs);
removeEmptyCategory(id);
Log.d(TAG, "updateNote: " + remoteNote + " || forceUnchangedDBNoteState: " + forceUnchangedDBNoteState + " => " + i + " rows updated"); Log.d(TAG, "updateNote: " + remoteNote + " || forceUnchangedDBNoteState: " + forceUnchangedDBNoteState + " => " + i + " rows updated");
} }
@ -592,6 +593,7 @@ public class NotesDatabase extends AbstractNotesDatabase {
db.delete(table_notes, db.delete(table_notes,
key_id + " = ? AND " + key_status + " = ?", key_id + " = ? AND " + key_status + " = ?",
new String[]{String.valueOf(id), forceDBStatus.getTitle()}); new String[]{String.valueOf(id), forceDBStatus.getTitle()});
removeEmptyCategory(id);
} }
/** /**
@ -856,4 +858,12 @@ public class NotesDatabase extends AbstractNotesDatabase {
cursor.close(); cursor.close();
return title; return title;
} }
private void removeEmptyCategory(long accountId) {
validateAccountId(accountId);
getReadableDatabase().delete(table_category,
key_id + " NOT IN (SELECT " + key_category + " FROM " + table_notes + ")",
null);
}
} }