Fix

Gitteroid · Dec 17, 2015 · 092f012 · 092f012
1 parent 030a5b8
commit 092f012
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/src/main/java/com/ne1c/developerstalk/presenters/RoomsListPresenter.java b/app/src/main/java/com/ne1c/developerstalk/presenters/RoomsListPresenter.java
@@ -50,11 +50,11 @@ public void loadRooms() {
 
         @SuppressWarnings("unchecked")
         Subscription sub = mDataManger.getRooms().subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
                 .map(roomModels -> {
                     mAllRooms = (ArrayList<RoomModel>) roomModels.clone();
 
                     ArrayList<RoomModel> visibleList = new ArrayList<>();
+
                     for (RoomModel room : roomModels) {
                         if (!room.hide) {
                             visibleList.add(room);
@@ -63,6 +63,7 @@ public void loadRooms() {
 
                     return visibleList;
                 })
+                .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(mView::showRooms, throwable -> {
                     mView.showError(throwable.getMessage());
                 });
@@ -87,7 +88,6 @@ public ArrayList<RoomModel> getOnlyVisibleRooms(ArrayList<RoomModel> rooms) {
 
     public void loadCachedRooms() {
         mDataManger.getDbRooms().subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
                 .map(roomModels -> {
                     ArrayList<RoomModel> visibleList = new ArrayList<>();
                     for (RoomModel room : roomModels) {
@@ -98,6 +98,9 @@ public void loadCachedRooms() {
 
                     return visibleList;
                 })
-                .subscribe(mView::showRooms);
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(mView::showRooms, throwable -> {
+                    mView.showError(throwable.getMessage());
+                });
     }
 }
diff --git a/app/src/main/java/com/ne1c/developerstalk/services/DataManger.java b/app/src/main/java/com/ne1c/developerstalk/services/DataManger.java
@@ -39,8 +39,6 @@ public Observable<ArrayList<RoomModel>> getRooms() {
         Observable<ArrayList<RoomModel>> dbRooms = mClientDatabase.getRooms();
 
         return Observable.combineLatest(serverRooms, dbRooms, (server, db) -> {
-            ArrayList<RoomModel> result = new ArrayList<>();
-
             // Data exist in db ang get from server
             if (db.size() > 0 && server.size() > 0) {
                 for (RoomModel r1 : db) {
@@ -55,19 +53,19 @@ public Observable<ArrayList<RoomModel>> getRooms() {
                 Collections.sort(server, new RoomModel.SortedByPosition());
                 mClientDatabase.insertRooms(server);
 
-                result = server;
+                return server;
             } else if (db.size() > 0 && server.size() == 0) { // If data exist only in db
                 Collections.sort(db, new RoomModel.SortedByPosition());
 
-                result = db;
+                return db;
             } else if (db.size() == 0 && server.size() > 0) { // If data  not exist in db, only server
                 sortByName(server);
                 mClientDatabase.insertRooms(server);
 
-                result = db;
+                return server;
             }
 
-            return result;
+            return new ArrayList<>();
         });
     }
 

diff --git a/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java b/app/src/main/java/com/ne1c/developerstalk/ui/fragments/RoomsListFragment.java
@@ -73,6 +73,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         mPresenter.bindView(this);
         mPresenter.loadCachedRooms();
+        mPresenter.loadRooms();
 
         return v;
     }
@@ -85,7 +86,6 @@ public boolean isEdit() {
     public void onResume() {
         super.onResume();
 
-        mPresenter.loadRooms();
     }
 
     public void setEdit(boolean edit) {