kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make remaining public methods synchronized.

Browse Source
This commit is contained in:
leopoldsedev
2020-02-18 00:16:15 +01:00
committed by Jannis Mattheis
parent 48c2806d12
commit 10b6741cd5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/github/gotify/messages/provider/MessageFacade.java
View File

@@ -18,17 +18,17 @@ public class MessageFacade {
this.state = new MessageStateHolder(); this.state = new MessageStateHolder();
} }
public List<MessageWithImage> get(Integer appId) { public synchronized List<MessageWithImage> get(Integer appId) {
return combiner.combine(state.state(appId).messages, applicationHolder.get()); return combiner.combine(state.state(appId).messages, applicationHolder.get());
} }
public void addMessages(List<Message> messages) { public synchronized void addMessages(List<Message> messages) {
for (Message message : messages) { for (Message message : messages) {
state.newMessage(message); state.newMessage(message);
} }
} }
public List<MessageWithImage> loadMore(Integer appId) { public synchronized List<MessageWithImage> loadMore(Integer appId) {
MessageState state = this.state.state(appId); MessageState state = this.state.state(appId);
if (state.hasNext || !state.loaded) { if (state.hasNext || !state.loaded) {
PagedMessages pagedMessages = requester.loadMore(state); PagedMessages pagedMessages = requester.loadMore(state);
@@ -37,14 +37,14 @@ public class MessageFacade {
return get(appId); return get(appId);
} }
public void loadMoreIfNotPresent(Integer appId) { public synchronized void loadMoreIfNotPresent(Integer appId) {
MessageState state = this.state.state(appId); MessageState state = this.state.state(appId);
if (!state.loaded) { if (!state.loaded) {
loadMore(appId); loadMore(appId);
} }
} }
public void clear() { public synchronized void clear() {
this.state.clear(); this.state.clear();
} }
@@ -70,13 +70,13 @@ public class MessageFacade {
return this.state.undoPendingDeletion(); return this.state.undoPendingDeletion();
} }
public boolean deleteAll(Integer appId) { public synchronized boolean deleteAll(Integer appId) {
boolean success = this.requester.deleteAll(appId); boolean success = this.requester.deleteAll(appId);
this.state.deleteAll(appId); this.state.deleteAll(appId);
return success; return success;
} }
public boolean canLoadMore(Integer appId) { public synchronized boolean canLoadMore(Integer appId) {
return state.state(appId).hasNext; return state.state(appId).hasNext;
} }
} }

4
app/src/main/java/com/github/gotify/messages/provider/MessageStateHolder.java
View File

@@ -57,7 +57,7 @@ class MessageStateHolder {
return state; return state;
} }
void deleteAll(Integer appId) { synchronized void deleteAll(Integer appId) {
clear(); clear();
MessageState state = state(appId); MessageState state = state(appId);
state.loaded = true; state.loaded = true;
@@ -115,7 +115,7 @@ class MessageStateHolder {
return result; return result;
} }
boolean deletionPending() { synchronized boolean deletionPending() {
return pendingDeletion != null; return pendingDeletion != null;
} }