From a585d7442a293e4d403802101f155fe53742880f Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Fri, 23 Aug 2019 21:46:40 +0200
Subject: [PATCH] As greader write token is fetched at login, no need to fetch
 it when doing a write request

---
 .../app/repositories/FreshRSSRepository.java  | 68 +++----------------
 1 file changed, 9 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
index 6570737f..65baaba5 100644
--- a/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
+++ b/app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
@@ -5,10 +5,10 @@ import android.app.Application;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.readrops.app.database.entities.account.Account;
 import com.readrops.app.database.entities.Feed;
 import com.readrops.app.database.entities.Folder;
 import com.readrops.app.database.entities.Item;
+import com.readrops.app.database.entities.account.Account;
 import com.readrops.app.utils.FeedInsertionResult;
 import com.readrops.app.utils.FeedMatcher;
 import com.readrops.app.utils.ItemMatcher;
@@ -119,88 +119,38 @@ public class FreshRSSRepository extends ARepository {
             Folder folder = feed.getFolderId() == null ? null : database.folderDao().select(feed.getFolderId());
             emitter.onSuccess(folder);
 
-        }).flatMapCompletable(folder -> {
-            if (account.getWriteToken() == null) {
-                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));
-            }
-        });
+        }).flatMapCompletable(folder -> api.updateFeed(account.getWriteToken(),
+                feed.getUrl(), feed.getName(), folder == null ? null : folder.getRemoteId())
+                .andThen(super.updateFeed(feed)));
     }
 
     @Override
     public Completable deleteFeed(Feed feed) {
         FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
 
-        if (account.getWriteToken() == null) {
-            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));
-        }
+        return api.deleteFeed(account.getWriteToken(), feed.getUrl())
+                .andThen(super.deleteFeed(feed));
     }
 
     @Override
     public Completable addFolder(Folder folder) {
         FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
 
-        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());
+        return api.createFolder(account.getWriteToken(), folder.getName());
     }
 
     @Override
     public Completable updateFolder(Folder folder) {
         FreshRSSAPI api = new FreshRSSAPI(account.toCredentials());
 
-        if (account.getWriteToken() == null) {
-            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));
-        }
+        return api.updateFolder(account.getWriteToken(), folder.getRemoteId(), folder.getName())
+                .andThen(super.updateFolder(folder));
     }
 
     @Override
     public Completable deleteFolder(Folder folder) {
         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())
                 .andThen(super.deleteFolder(folder));
     }