[Fix] Card list blank

rh-id · Aug 8, 2023 · 6e5c7a9 · 6e5c7a9
1 parent 7ccedb4
commit 6e5c7a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/src/main/java/m/co/rh/id/a_flash_deck/app/ui/component/card/CardListSV.java b/app/src/main/java/m/co/rh/id/a_flash_deck/app/ui/component/card/CardListSV.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import co.rh.id.lib.rx3_utils.subject.SerialBehaviorSubject;
+import co.rh.id.lib.rx3_utils.subject.SerialOptionalBehaviorSubject;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
@@ -59,10 +59,10 @@ public class CardListSV extends StatefulView<Activity> implements RequireCompone
     private transient CardRecyclerViewAdapter mCardRecyclerViewAdapter;
     private transient RecyclerView.OnScrollListener mOnScrollListener;
 
-    private final SerialBehaviorSubject<Long> mDeckId;
+    private final SerialOptionalBehaviorSubject<Long> mDeckId;
 
     public CardListSV() {
-        mDeckId = new SerialBehaviorSubject<>();
+        mDeckId = new SerialOptionalBehaviorSubject<>(null);
     }
 
     @Override
@@ -114,7 +114,7 @@ protected View createView(Activity activity, ViewGroup container) {
         mRxDisposer.add("createView_onDeckIdChanged",
                 mDeckId.getSubject().observeOn(AndroidSchedulers.mainThread())
                         .subscribe(aLong -> {
-                            mPagedCardItemsCmd.setDeckId(aLong);
+                            mPagedCardItemsCmd.setDeckId(aLong.orElse(null));
                             mPagedCardItemsCmd.refresh();
                         }));
         mRxDisposer
@@ -171,7 +171,7 @@ public void onRefresh() {
         mPagedCardItemsCmd.refresh();
     }
 
-    public void setDeckId(long deckId) {
+    public void setDeckId(Long deckId) {
         mDeckId.onNext(deckId);
     }
 }
diff --git a/app/src/main/java/m/co/rh/id/a_flash_deck/app/ui/page/CardListPage.java b/app/src/main/java/m/co/rh/id/a_flash_deck/app/ui/page/CardListPage.java
@@ -57,8 +57,6 @@ protected void initState(Activity activity) {
         Args args = Args.of(mNavRoute);
         if (args != null) {
             mCardListSV.setDeckId(args.getDeck().id);
-        } else {
-            mCardListSV.setDeckId(Long.MIN_VALUE);
         }
     }