--wip--

Kaushik Gopal · Kaushik Gopal · commit 02e34617a23e · 2016-10-13T06:53:18.000-07:00
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java
@@ -74,6 +74,7 @@ void formValidation() {
 
     @OnClick(R.id.btn_demo_pseudo_cache)
     void pseudoCacheDemo() {
+        //clickedOn(new PseudoCacheConcatFragment());
         clickedOn(new PseudoCacheMergeFragment());
     }
 
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheMergeFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheMergeFragment.java
@@ -21,6 +21,7 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import java.util.concurrent.TimeUnit;
 import rx.Observable;
 import rx.Subscriber;
 import rx.android.schedulers.AndroidSchedulers;
@@ -59,7 +60,10 @@ public void onDemoPseudoCacheClicked() {
         _resultList.setAdapter(_adapter);
         _initializeCache();
 
-        Observable.merge(_getCachedData(), _getFreshData())
+
+        _getFreshData()//
+              .publish(fd -> Observable.merge(fd, _getCachedData().takeUntil(fd)))
+              //Observable.merge(_getCachedData(), _getFreshData())
               .subscribeOn(Schedulers.io())
               .observeOn(AndroidSchedulers.mainThread())
               .subscribe(new Subscriber<Pair<Contributor, Long>>() {
@@ -77,13 +81,13 @@ public void onError(Throwable e) {
                   public void onNext(Pair<Contributor, Long> contributorAgePair) {
                       Contributor contributor = contributorAgePair.first;
 
-                      if (_resultAgeMap.containsKey(contributor) &&
-                          _resultAgeMap.get(contributor) > contributorAgePair.second) {
-                          return;
-                      }
+                      //if (_resultAgeMap.containsKey(contributor) &&
+                      //    _resultAgeMap.get(contributor) > contributorAgePair.second) {
+                      //    return;
+                      //}
 
                       _contributionMap.put(contributor.login, contributor.contributions);
-                      _resultAgeMap.put(contributor, contributorAgePair.second);
+                      //_resultAgeMap.put(contributor, contributorAgePair.second);
 
                       _adapter.clear();
                       _adapter.addAll(getListStringFromMap());
@@ -117,7 +121,7 @@ private Observable<Pair<Contributor, Long>> _getCachedData() {
             list.add(dataWithAgePair);
         }
 
-        return Observable.from(list);
+        return Observable.from(list).delay(5, TimeUnit.SECONDS);
     }
 
     private Observable<Pair<Contributor, Long>> _getFreshData() {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ void formValidation() {`
`74`	`74`
`75`	`75`	`@OnClick(R.id.btn_demo_pseudo_cache)`
`76`	`76`	`void pseudoCacheDemo() {`
	`77`	`+ //clickedOn(new PseudoCacheConcatFragment());`
`77`	`78`	`clickedOn(new PseudoCacheMergeFragment());`
`78`	`79`	`}`
`79`	`80`