FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

greader API add token fetch for all write actions

This commit is contained in:
Shinokuni 2019-08-22 09:43:13 +02:00
parent 6a1039f87e
commit dbd5fe060b
1 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
View File

@ -107,38 +107,88 @@ public class FreshRSSRepository extends ARepository {
Folder folder = feed.getFolderId() == null ? null : database.folderDao().select(feed.getFolderId()); Folder folder = feed.getFolderId() == null ? null : database.folderDao().select(feed.getFolderId());
emitter.onSuccess(folder); emitter.onSuccess(folder);
}).flatMapCompletable(folder -> api.updateFeed(account.getWriteToken(), }).flatMapCompletable(folder -> {
feed.getUrl(), feed.getName(), folder == null ? null : folder.getRemoteId())) if (account.getWriteToken() == null) {
.andThen(super.updateFeed(feed)); return api.getWriteToken()
.flatMapCompletable(token -> {
database.accountDao().updateWriteToken(account.getId(), token);
return api.updateFeed(token,
feed.getUrl(), feed.getName(), folder == null ? null : folder.getRemoteId())
.andThen(super.updateFeed(feed));
});
} else {
return api.updateFeed(account.getWriteToken(),
feed.getUrl(), feed.getName(), folder == null ? null : folder.getRemoteId())
.andThen(super.updateFeed(feed));
}
});
} }
@Override @Override
public Completable deleteFeed(Feed feed) { public Completable deleteFeed(Feed feed) {
FreshRSSAPI api = new FreshRSSAPI(account.toCredentials()); FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
return api.deleteFeed(account.getWriteToken(), feed.getUrl()) if (account.getWriteToken() == null) {
.andThen(super.deleteFeed(feed)); return api.getWriteToken()
.flatMapCompletable(token -> {
database.accountDao().updateWriteToken(account.getId(), token);
return api.deleteFeed(token, feed.getUrl())
.andThen(super.deleteFeed(feed));
});
} else {
return api.deleteFeed(account.getWriteToken(), feed.getUrl())
.andThen(super.deleteFeed(feed));
}
} }
@Override @Override
public Completable addFolder(Folder folder) { public Completable addFolder(Folder folder) {
FreshRSSAPI api = new FreshRSSAPI(account.toCredentials()); FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
return api.createFolder(account.getWriteToken(), folder.getName()); if (account.getWriteToken() == null) {
return api.getWriteToken()
.flatMapCompletable(token -> {
database.accountDao().updateWriteToken(account.getId(), token);
return api.createFolder(token, folder.getName());
});
} else
return api.createFolder(account.getWriteToken(), folder.getName());
} }
@Override @Override
public Completable updateFolder(Folder folder) { public Completable updateFolder(Folder folder) {
FreshRSSAPI api = new FreshRSSAPI(account.toCredentials()); FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
return api.updateFolder(account.getWriteToken(), folder.getRemoteId(), folder.getName()) if (account.getWriteToken() == null) {
.andThen(super.updateFolder(folder)); return api.getWriteToken()
.flatMapCompletable(token -> {
database.accountDao().updateWriteToken(account.getId(), token);
return api.updateFolder(token, folder.getRemoteId(), folder.getName())
.andThen(super.updateFolder(folder));
});
} else {
return api.updateFolder(account.getWriteToken(), folder.getRemoteId(), folder.getName())
.andThen(super.updateFolder(folder));
}
} }
@Override @Override
public Completable deleteFolder(Folder folder) { public Completable deleteFolder(Folder folder) {
FreshRSSAPI api = new FreshRSSAPI(account.toCredentials()); FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
if (account.getWriteToken() == null) {
return api.getWriteToken()
.flatMapCompletable(token -> {
database.accountDao().updateWriteToken(account.getId(), token);
return api.deleteFolder(token, folder.getRemoteId())
.andThen(super.deleteFolder(folder));
});
}
return api.deleteFolder(account.getWriteToken(), folder.getRemoteId()) return api.deleteFolder(account.getWriteToken(), folder.getRemoteId())
.andThen(super.deleteFolder(folder)); .andThen(super.deleteFolder(folder));
} }
@ -153,7 +203,7 @@ public class FreshRSSRepository extends ARepository {
database.accountDao().updateWriteToken(account.getId(), writeToken); database.accountDao().updateWriteToken(account.getId(), writeToken);
return api.markItemReadUnread(read, item.getRemoteId(), writeToken) return api.markItemReadUnread(read, item.getRemoteId(), writeToken)
.concatWith(super.setItemReadState(item, read)); .andThen(super.setItemReadState(item, read));
}); });
} else { } else {
return api.markItemReadUnread(read, item.getRemoteId(), account.getWriteToken()) return api.markItemReadUnread(read, item.getRemoteId(), account.getWriteToken())