Fix sorting mode null

playmoweb · Mar 30, 2017 · de92308 · de92308
1 parent e575273
commit de92308
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java b/store2store/src/main/java/com/playmoweb/store2store/dao/impl/RealmDao.java
@@ -39,8 +39,15 @@ public final Observable<T> getOne(Filter filter, SortingMode sortingMode) {
 
         RealmQuery<T> query = realm.where(clazz);
         query = filterToQuery(filter, query);
-        RealmResults<T> items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort));
-        T item = items.first();
+
+        T item;
+
+        if(sortingMode != null) {
+            RealmResults<T> items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort));
+            item = items.first();
+        } else {
+            item = query.findFirst();
+        }
 
         T copy = null;
         if(item != null) {
@@ -70,7 +77,13 @@ public final Observable<List<T>> getAll(Filter filter, SortingMode sortingMode)
         Realm realm = Realm.getDefaultInstance();
         RealmQuery<T> query = realm.where(clazz);
         query = filterToQuery(filter, query);
-        RealmResults<T> items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort));
+
+        RealmResults<T> items;
+        if(sortingMode != null) {
+            items = query.findAllSorted(sortingMode.key, convertToSort(sortingMode.sort));
+        } else {
+            items = query.findAll();
+        }
         List<T> copies = realm.copyFromRealm(items);
         realm.close();