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

Fix some Nextcloud news folder insertion/deletion problems

This commit is contained in:
Shinokuni 2019-08-22 22:11:08 +02:00
parent 50de656f35
commit 21b261b0e1
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/readrops/app/database/dao/FeedDao.java
View File

@ -65,7 +65,7 @@ public abstract class FeedDao implements BaseDao<Feed> {
@Query("Select remoteId From Feed Where account_id = :accountId") @Query("Select remoteId From Feed Where account_id = :accountId")
public abstract List<String> getFeedRemoteIdsOfAccount(int accountId); public abstract List<String> getFeedRemoteIdsOfAccount(int accountId);
@Query("Delete from Feed Where id in (:ids)") @Query("Delete from Feed Where remoteId in (:ids)")
abstract void deleteByIds(List<String> ids); abstract void deleteByIds(List<String> ids);
@Query("Select id From Folder Where remoteId = :remoteId And account_id = :accountId") @Query("Select id From Folder Where remoteId = :remoteId And account_id = :accountId")

2
app/src/main/java/com/readrops/app/database/dao/FolderDao.java
View File

@ -32,7 +32,7 @@ public abstract class FolderDao implements BaseDao<Folder> {
@Query("Select remoteId From Folder Where account_id = :accountId") @Query("Select remoteId From Folder Where account_id = :accountId")
public abstract List<String> getFolderRemoteIdsOfAccount(int accountId); public abstract List<String> getFolderRemoteIdsOfAccount(int accountId);
@Query("Delete From Folder Where id in (:ids)") @Query("Delete From Folder Where remoteId in (:ids)")
abstract void deleteByIds(List<String> ids); abstract void deleteByIds(List<String> ids);
/** /**

12
app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
View File

@ -205,10 +205,16 @@ public class NextNewsRepository extends ARepository {
NextNewsAPI api = new NextNewsAPI(account.toCredentials()); NextNewsAPI api = new NextNewsAPI(account.toCredentials());
try { try {
NextNewsFolders folders = api.createFolder(new NextNewsFolder(Integer.parseInt(folder.getRemoteId()), folder.getName())); int folderRemoteId = folder.getRemoteId() == null ? 0 : Integer.parseInt(folder.getRemoteId());
NextNewsFolders folders = api.createFolder(new NextNewsFolder(folderRemoteId, folder.getName()));
if (folders != null) if (folders != null) {
insertFolders(folders.getFolders()); NextNewsFolder nextNewsFolder = folders.getFolders().get(0); // always only one item returned by the server, see doc
folder.setName(nextNewsFolder.getName());
folder.setRemoteId(String.valueOf(nextNewsFolder.getId()));
database.folderDao().insert(folder);
}
else else
emitter.onError(new Exception("Unknown error")); emitter.onError(new Exception("Unknown error"));
} catch (Exception e) { } catch (Exception e) {