Use lighter deleteArticle API method

wallabag · Oct 29, 2019 · 18cbd69 · 18cbd69
1 parent d5876f2
commit 18cbd69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagServiceWrapper.java b/app/src/main/java/fr/gaulupeau/apps/Poche/network/WallabagServiceWrapper.java
@@ -100,15 +100,23 @@ public Article addArticle(String url) throws UnsuccessfulResponseException, IOEx
         return wallabagService.addArticle(url);
     }
 
-    public Article deleteArticle(int articleID)
+    public boolean deleteArticle(int articleID)
             throws UnsuccessfulResponseException, IOException {
+        boolean found = false;
+
         try {
-            return wallabagService.deleteArticle(articleID);
+            if (CompatibilityHelper.isDeleteArticleWithIdSupported(wallabagService)) {
+                wallabagService.deleteArticleWithId(articleID);
+                found = true;
+            } else {
+                LOG.debug("deleteArticle() using older API method");
+                found = wallabagService.deleteArticle(articleID) != null;
+            }
         } catch(NotFoundException e) {
-            LOG.info("Ignoring not found exception for article ID: " + articleID, e);
+            LOG.info("deleteArticle() Ignoring not found exception for article ID: " + articleID, e);
         }
 
-        return null;
+        return found;
     }
 
     public WallabagService getWallabagService() {

diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/service/MainService.java b/app/src/main/java/fr/gaulupeau/apps/Poche/service/MainService.java
@@ -238,7 +238,7 @@ private Pair<ActionResult, Long> syncOfflineQueue(ActionRequest actionRequest) {
                     case ARTICLE_DELETE: {
                         canTolerateNotFound = true;
 
-                        if(getWallabagServiceWrapper().deleteArticle(articleID) == null) {
+                        if(!getWallabagServiceWrapper().deleteArticle(articleID)) {
                             itemResult = new ActionResult(ActionResult.ErrorType.NOT_FOUND);
                         }
                         break;