Merge pull request #12502 from wordpress-mobile/issue/12039-reader-ta…

…ble-events Issue/12039 reader table events
wordpress-mobile · Jul 28, 2020 · 6c410a2 · 6c410a2
2 parents a43549e + 0d2512e
commit 6c410a2
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 7 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
@@ -4,9 +4,11 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.ReaderPostList;
 import org.wordpress.android.models.ReaderTagList;
+import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.ReaderPostTableActionEnded;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 
@@ -270,6 +272,9 @@ private static void purge() {
                 }
             }
             db.setTransactionSuccessful();
+            if (numPostsDeleted > 0) {
+                EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+            }
         } finally {
             db.endTransaction();
         }

diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java
@@ -8,6 +8,7 @@
 
 import androidx.annotation.NonNull;
 
+import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.ReaderCardType;
@@ -20,6 +21,7 @@
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostIdList;
+import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.ReaderPostTableActionEnded;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.SqlUtils;
 
@@ -233,6 +235,9 @@ public static int purgeUnbookmarkedPostsWithBookmarkTag() {
                                             .delete("tbl_posts", "tag_name=? AND tag_type=? AND is_bookmarked=0", args);
             }
         }
+        if (numDeleted > 0) {
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+        }
         return numDeleted;
     }
 
@@ -507,6 +512,7 @@ private static void update(long blogId, long postId, ContentValues values) {
                 values,
                 "blog_id=? AND post_id=?",
                 args);
+        EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
     }
 
 
@@ -526,10 +532,15 @@ public static int deletePostsWithTag(final ReaderTag tag) {
         }
 
         String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt())};
-        return ReaderDatabase.getWritableDb().delete(
+        int rowsDeleted = ReaderDatabase.getWritableDb().delete(
                 "tbl_posts",
                 "tag_name=? AND tag_type=?",
                 args);
+
+        if (rowsDeleted > 0) {
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+        }
+        return rowsDeleted;
     }
 
     public static int removeTagsFromPost(long blogId, long postId, final ReaderTagType tagType) {
@@ -538,20 +549,30 @@ public static int removeTagsFromPost(long blogId, long postId, final ReaderTagTy
         }
 
         String[] args = {Integer.toString(tagType.toInt()), Long.toString(blogId), Long.toString(postId)};
-        return ReaderDatabase.getWritableDb().delete(
+        int rowsDeleted = ReaderDatabase.getWritableDb().delete(
                 "tbl_posts",
                 "tag_type=? AND blog_id=? AND post_id=?",
                 args);
+
+        if (rowsDeleted > 0) {
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+        }
+        return rowsDeleted;
     }
 
     public static int deletePostsInBlog(long blogId) {
         String[] args = {Long.toString(blogId)};
-        return ReaderDatabase.getWritableDb().delete("tbl_posts", "blog_id = ?", args);
+        int rowsDeleted = ReaderDatabase.getWritableDb().delete("tbl_posts", "blog_id = ?", args);
+        if (rowsDeleted > 0) {
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+        }
+        return rowsDeleted;
     }
 
     public static void deletePost(long blogId, long postId) {
         String[] args = new String[]{Long.toString(blogId), Long.toString(postId)};
         ReaderDatabase.getWritableDb().delete("tbl_posts", "blog_id=? AND post_id=?", args);
+        EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
     }
 
     /*
@@ -568,6 +589,7 @@ public static void updateFollowedStatus() {
             if (count > 0) {
                 AppLog.d(AppLog.T.READER, String.format(Locale.ENGLISH,
                         "reader post table > marked %d posts unfollowed", count));
+                EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
             }
         } finally {
             statement.close();
@@ -616,6 +638,7 @@ public static void removeGapMarkerForTag(final ReaderTag tag) {
         String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt())};
         String sql = "UPDATE tbl_posts SET has_gap_marker=0 WHERE has_gap_marker!=0 AND tag_name=? AND tag_type=?";
         ReaderDatabase.getWritableDb().execSQL(sql, args);
+        EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
     }
 
     /*
@@ -656,6 +679,7 @@ public static void setGapMarkerForTag(long blogId, long postId, ReaderTag tag) {
         String sql =
                 "UPDATE tbl_posts SET has_gap_marker=1 WHERE blog_id=? AND post_id=? AND tag_name=? AND tag_type=?";
         ReaderDatabase.getWritableDb().execSQL(sql, args);
+        EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
     }
 
     public static String getGapMarkerDateForTag(ReaderTag tag) {
@@ -709,6 +733,7 @@ public static void deletePostsBeforeGapMarkerForTag(ReaderTag tag) {
         int numDeleted = ReaderDatabase.getWritableDb().delete("tbl_posts", where, args);
         if (numDeleted > 0) {
             AppLog.d(AppLog.T.READER, "removed " + numDeleted + " posts older than gap marker");
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
         }
     }
 
@@ -751,6 +776,7 @@ private static void setFollowStatusForPosts(long blogId, long feedId, boolean is
             }
 
             db.setTransactionSuccessful();
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
         } finally {
             db.endTransaction();
         }
@@ -860,6 +886,7 @@ public static void addOrUpdatePosts(final ReaderTag tag, ReaderPostList posts) {
             }
 
             db.setTransactionSuccessful();
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
         } finally {
             db.endTransaction();
             SqlUtils.closeStatement(stmtPosts);

diff --git a/...ress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverRepository.kt b/...ress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverRepository.kt
@@ -7,6 +7,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode.BACKGROUND
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderPostList
 import org.wordpress.android.models.ReaderTag
@@ -19,20 +21,24 @@ import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeFailure
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeSuccess
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeUnChanged
+import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.ReaderPostTableActionEnded
 import org.wordpress.android.ui.reader.repository.usecases.FetchPostsForTagUseCase
 import org.wordpress.android.ui.reader.repository.usecases.GetPostsForTagUseCase
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeActionUseCase
 import org.wordpress.android.ui.reader.repository.usecases.ShouldAutoUpdateTagUseCase
 import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter.UpdateAction
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.util.EventBusWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ReactiveMutableLiveData
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
 class ReaderDiscoverRepository constructor(
     private val bgDispatcher: CoroutineDispatcher,
+    private val eventBusWrapper: EventBusWrapper,
     private val readerTag: ReaderTag,
     private val getPostsForTagUseCase: GetPostsForTagUseCase,
     private val shouldAutoUpdateTagUseCase: ShouldAutoUpdateTagUseCase,
@@ -46,6 +52,7 @@ class ReaderDiscoverRepository constructor(
         get() = bgDispatcher + job
 
     private var isStarted = false
+    private val isDirty = AtomicBoolean()
 
     private val _discoverFeed = ReactiveMutableLiveData<ReaderPostList>(
             onActive = { onActiveDiscoverFeed() }, onInactive = { onInactiveDiscoverFeed() })
@@ -58,6 +65,7 @@ class ReaderDiscoverRepository constructor(
         if (isStarted) return
 
         isStarted = true
+        eventBusWrapper.register(this)
         readerUpdatePostsEndedHandler.start(readerTag,
                 ReaderUpdatePostsEndedHandler.setUpdatePostsEndedListeners(
                         this::onNewPosts,
@@ -66,6 +74,7 @@ class ReaderDiscoverRepository constructor(
     }
 
     fun stop() {
+        eventBusWrapper.unregister(this)
         job.cancel()
     }
 
@@ -100,7 +109,8 @@ class ReaderDiscoverRepository constructor(
             val existsInMemory = discoverFeed.value?.let {
                 !it.isEmpty()
             } ?: false
-            val refresh = shouldAutoUpdateTagUseCase.get(readerTag)
+            val refresh =
+                    shouldAutoUpdateTagUseCase.get(readerTag) || isDirty.getAndSet(false)
             if (!existsInMemory) {
                 val result = getPostsForTagUseCase.get(readerTag)
                 _discoverFeed.postValue(result)
@@ -150,9 +160,23 @@ class ReaderDiscoverRepository constructor(
     private fun onInactiveDiscoverFeed() {
     }
 
+    @Subscribe(threadMode = BACKGROUND)
+    @SuppressWarnings("unused")
+    fun onReaderPostTableAction(event: ReaderPostTableActionEnded) {
+        if (_discoverFeed.hasObservers()) {
+            isDirty.compareAndSet(true, false)
+            launch {
+                reloadPosts()
+            }
+        } else {
+            isDirty.compareAndSet(false, true)
+        }
+    }
+
     class Factory
     @Inject constructor(
         @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+        private val eventBusWrapper: EventBusWrapper,
         private val readerUtilsWrapper: ReaderUtilsWrapper,
         private val getPostsForTagUseCase: GetPostsForTagUseCase,
         private val shouldAutoUpdateTagUseCase: ShouldAutoUpdateTagUseCase,
@@ -166,6 +190,7 @@ class ReaderDiscoverRepository constructor(
 
             return ReaderDiscoverRepository(
                     bgDispatcher,
+                    eventBusWrapper,
                     tag,
                     getPostsForTagUseCase,
                     shouldAutoUpdateTagUseCase,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderPostRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderPostRepository.kt
@@ -7,6 +7,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode.BACKGROUND
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderPostList
 import org.wordpress.android.models.ReaderTag
@@ -17,19 +19,23 @@ import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeFailure
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeSuccess
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.PostLikeEnded.PostLikeUnChanged
+import org.wordpress.android.ui.reader.repository.ReaderRepositoryEvent.ReaderPostTableActionEnded
 import org.wordpress.android.ui.reader.repository.usecases.FetchPostsForTagUseCase
 import org.wordpress.android.ui.reader.repository.usecases.GetPostsForTagUseCase
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeActionUseCase
 import org.wordpress.android.ui.reader.repository.usecases.ShouldAutoUpdateTagUseCase
 import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter.UpdateAction
+import org.wordpress.android.util.EventBusWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ReactiveMutableLiveData
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
 class ReaderPostRepository(
     private val bgDispatcher: CoroutineDispatcher,
+    private val eventBusWrapper: EventBusWrapper,
     private val readerTag: ReaderTag,
     private val getPostsForTagUseCase: GetPostsForTagUseCase,
     private val shouldAutoUpdateTagUseCase: ShouldAutoUpdateTagUseCase,
@@ -43,6 +49,7 @@ class ReaderPostRepository(
         get() = bgDispatcher + job
 
     private var isStarted = false
+    private val isDirty = AtomicBoolean()
 
     private val _posts = ReactiveMutableLiveData<ReaderPostList>(
             onActive = { onActivePosts() }, onInactive = { onInactivePosts() })
@@ -55,6 +62,7 @@ class ReaderPostRepository(
         if (isStarted) return
 
         isStarted = true
+        eventBusWrapper.register(this)
         readerUpdatePostsEndedHandler.start(
                 readerTag,
                 ReaderUpdatePostsEndedHandler.setUpdatePostsEndedListeners(
@@ -65,6 +73,7 @@ class ReaderPostRepository(
     }
 
     fun stop() {
+        eventBusWrapper.unregister(this)
         job.cancel()
     }
 
@@ -101,16 +110,17 @@ class ReaderPostRepository(
             val existsInMemory = posts.value?.let {
                 !it.isEmpty()
             } ?: false
-            val refresh = shouldAutoUpdateTagUseCase.get(readerTag)
+            val refresh =
+                    shouldAutoUpdateTagUseCase.get(readerTag) || isDirty.getAndSet(false)
 
             if (!existsInMemory) {
-                val result = getPostsForTagUseCase.get(readerTag)
-                _posts.postValue(result)
+                reloadPosts()
             }
 
             if (refresh) {
                 val response = fetchPostsForTagUseCase.fetch(readerTag)
                 if (response != Success) _communicationChannel.postValue(Event(response))
+                reloadPosts()
             }
         }
     }
@@ -122,6 +132,19 @@ class ReaderPostRepository(
         }
     }
 
+    @Subscribe(threadMode = BACKGROUND)
+    @SuppressWarnings("unused")
+    fun onReaderPostTableAction(event: ReaderPostTableActionEnded) {
+        if (_posts.hasObservers()) {
+            isDirty.compareAndSet(true, false)
+            launch {
+                reloadPosts()
+            }
+        } else {
+            isDirty.compareAndSet(false, true)
+        }
+    }
+
     // Handlers for ReaderPostServices
     private fun onNewPosts(event: UpdatePostsEnded) {
         launch {
@@ -157,6 +180,7 @@ class ReaderPostRepository(
     class Factory
     @Inject constructor(
         @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+        private val eventBusWrapper: EventBusWrapper,
         private val getPostsForTagUseCase: GetPostsForTagUseCase,
         private val shouldAutoUpdateTagUseCase: ShouldAutoUpdateTagUseCase,
         private val fetchPostsForTagUseCase: FetchPostsForTagUseCase,
@@ -166,6 +190,7 @@ class ReaderPostRepository(
         fun create(readerTag: ReaderTag): ReaderPostRepository {
             return ReaderPostRepository(
                     bgDispatcher,
+                    eventBusWrapper,
                     readerTag,
                     getPostsForTagUseCase,
                     shouldAutoUpdateTagUseCase,

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderRepositoryEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderRepositoryEvents.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.reader.repository
 
 sealed class ReaderRepositoryEvent {
+    object ReaderPostTableActionEnded : ReaderRepositoryEvent()
     sealed class PostLikeEnded(
         val postId: Long,
         val blogId: Long,