Skip to content

bug-fix/tagsPersistence #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgraziano wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bug-fix/tagsPersistence #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d33b9
fix persistence issue
lgraziano Jun 7, 2021
8c67230
Merge branch 'master' of github.com:steroid-team/app into feature/dis…
lgraziano Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/steroidteam/todolist/database/FileStorageDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public CompletableFuture<UUID> putTagInList(UUID todoListID, UUID tagId) {
.thenApply(JSONSerializer::serializeTodoList)
.thenApply(
serializedTodoList -> serializedTodoList.getBytes(StandardCharsets.UTF_8))
.thenCompose(bytes -> this.storageService.upload(bytes, listPath))
.thenCompose(bytes -> storageService.upload(bytes, listPath))
.thenApply(str -> tagId);
}

Expand Down
10 changes: 3 additions & 7 deletions app/src/main/java/com/github/steroidteam/todolist/database/TodoListRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,6 @@ public LiveData<List<Tag>> getGlobalTags() {
return globalTags;
}

public LiveData<List<Tag>> getUnlinkedTags(UUID todoListID) {
setTagsLists(todoListID);
return unlinkedTags;
}

public void putTagInTodolist(UUID todoListID, UUID tagId) {
localDatabase
.putTagInList(todoListID, tagId)
Expand All @@ -262,9 +257,10 @@ public void putTagInTodolist(UUID todoListID, UUID tagId) {
.thenAccept(
str -> {
List<Tag> unlinked = globalTags.getValue();
unlinked.removeAll(globalTags.getValue());
unlinked.removeAll(localTags.getValue());
unlinkedTags.postValue(unlinked);
});
remoteDatabase.putTagInList(todoListID, tagId);
}

public void putTag(Tag tag) {
Expand Down Expand Up @@ -293,7 +289,7 @@ public void removeTagFromTodolist(UUID todoListID, UUID tagId) {
.thenAccept(
str -> {
List<Tag> unlinked = globalTags.getValue();
unlinked.removeAll(globalTags.getValue());
unlinked.removeAll(localTags.getValue());
unlinkedTags.postValue(unlinked);
});
}
Expand Down