From 5f138ba91ac87b87ddece628fea19a707d0d8544 Mon Sep 17 00:00:00 2001
From: Thibaud Giovannetti <tspoke@hotmail.fr>
Date: Wed, 15 Mar 2017 12:04:16 +0100
Subject: [PATCH] Fix return order and filter of getAll query

---
 .../playmoweb/store2store/service/api/AbstractService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/store2store/src/main/java/com/playmoweb/store2store/service/api/AbstractService.java b/store2store/src/main/java/com/playmoweb/store2store/service/api/AbstractService.java
index 59c17ca..4f9af49 100644
--- a/store2store/src/main/java/com/playmoweb/store2store/service/api/AbstractService.java
+++ b/store2store/src/main/java/com/playmoweb/store2store/service/api/AbstractService.java
@@ -55,7 +55,7 @@ public IDao<T> getStorage() {
      *************************************************************************/
 
     @Override
-    public Observable<List<T>> getAll(Filter filter, SortingMode sortingMode, CustomObserver<List<T>> otherSubscriber) {
+    public Observable<List<T>> getAll(final Filter filter, final SortingMode sortingMode, CustomObserver<List<T>> otherSubscriber) {
         final Subscription s = getAll(filter, sortingMode)
                 .flatMap(new Func1<List<T>, Observable<List<T>>>() {
                     @Override
@@ -71,7 +71,8 @@ public List<T> call(Void aVoid) {
                 .flatMap(new Func1<List<T>, Observable<List<T>>>() {
                     @Override
                     public Observable<List<T>> call(List<T> ts) {
-                        return storage.insertOrUpdate(ts);
+                        storage.insertOrUpdate(ts);
+                        return storage.getAll(filter, sortingMode);
                     }
                 })
                 .observeOn(AndroidSchedulers.mainThread())