Update ProfileFragmentViewModel and tests

app/src/main/java/awais/instagrabber/repositories/responses/FriendshipStatus.kt

@@ -3,14 +3,14 @@ package awais.instagrabber.repositories.responses
 import java.io.Serializable
 
 data class FriendshipStatus(
-    val following: Boolean,
+    val following: Boolean = false,
-    val followedBy: Boolean,
+    val followedBy: Boolean = false,
-    val blocking: Boolean,
+    val blocking: Boolean = false,
-    val muting: Boolean,
+    val muting: Boolean = false,
-    val isPrivate: Boolean,
+    val isPrivate: Boolean = false,
-    val incomingRequest: Boolean,
+    val incomingRequest: Boolean = false,
-    val outgoingRequest: Boolean,
+    val outgoingRequest: Boolean = false,
-    val isBestie: Boolean,
+    val isBestie: Boolean = false,
-    val isRestricted: Boolean,
+    val isRestricted: Boolean = false,
-    val isMutingReel: Boolean
+    val isMutingReel: Boolean = false,
 ) : Serializable

app/src/main/java/awais/instagrabber/utils/ConcurrencyHelpers.kt

@@ -0,0 +1,240 @@
+package awais.instagrabber.utils
+
+import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineStart.LAZY
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import java.util.concurrent.atomic.AtomicReference
+
+/**
+ *
+ * From https://gist.github.com/objcode/7ab4e7b1df8acd88696cb0ccecad16f7
+ *
+ * A helper class to execute tasks sequentially in coroutines.
+ *
+ * Calling [afterPrevious] will always ensure that all previously requested work completes prior to
+ * calling the block passed. Any future calls to [afterPrevious] while the current block is running
+ * will wait for the current block to complete before starting.
+ */
+class SingleRunner {
+    /**
+     * A coroutine mutex implements a lock that may only be taken by one coroutine at a time.
+     */
+    private val mutex = Mutex()
+
+    /**
+     * Ensure that the block will only be executed after all previous work has completed.
+     *
+     * When several coroutines call afterPrevious at the same time, they will queue up in the order
+     * that they call afterPrevious. Then, one coroutine will enter the block at a time.
+     *
+     * In the following example, only one save operation (user or song) will be executing at a time.
+     *
+     * ```
+     * class UserAndSongSaver {
+     *    val singleRunner = SingleRunner()
+     *
+     *    fun saveUser(user: User) {
+     *        singleRunner.afterPrevious { api.post(user) }
+     *    }
+     *
+     *    fun saveSong(song: Song) {
+     *        singleRunner.afterPrevious { api.post(song) }
+     *    }
+     * }
+     * ```
+     *
+     * @param block the code to run after previous work is complete.
+     */
+    suspend fun <T> afterPrevious(block: suspend () -> T): T {
+        // Before running the block, ensure that no other blocks are running by taking a lock on the
+        // mutex.
+
+        // The mutex will be released automatically when we return.
+
+        // If any other block were already running when we get here, it will wait for it to complete
+        // before entering the `withLock` block.
+        mutex.withLock {
+            return block()
+        }
+    }
+}
+
+/**
+ * A controlled runner decides what to do when new tasks are run.
+ *
+ * By calling [joinPreviousOrRun], the new task will be discarded and the result of the previous task
+ * will be returned. This is useful when you want to ensure that a network request to the same
+ * resource does not flood.
+ *
+ * By calling [cancelPreviousThenRun], the old task will *always* be cancelled and then the new task will
+ * be run. This is useful in situations where a new event implies that the previous work is no
+ * longer relevant such as sorting or filtering a list.
+ */
+class ControlledRunner<T> {
+    /**
+     * The currently active task.
+     *
+     * This uses an atomic reference to ensure that it's safe to update activeTask on both
+     * Dispatchers.Default and Dispatchers.Main which will execute coroutines on multiple threads at
+     * the same time.
+     */
+    private val activeTask = AtomicReference<Deferred<T>?>(null)
+
+    /**
+     * Cancel all previous tasks before calling block.
+     *
+     * When several coroutines call cancelPreviousThenRun at the same time, only one will run and
+     * the others will be cancelled.
+     *
+     * In the following example, only one sort operation will execute and any previous sorts will be
+     * cancelled.
+     *
+     * ```
+     * class Products {
+     *    val controlledRunner = ControlledRunner<Product>()
+     *
+     *    fun sortAscending(): List<Product> {
+     *        return controlledRunner.cancelPreviousThenRun { dao.loadSortedAscending() }
+     *    }
+     *
+     *    fun sortDescending(): List<Product> {
+     *        return controlledRunner.cancelPreviousThenRun { dao.loadSortedDescending() }
+     *    }
+     * }
+     * ```
+     *
+     * @param block the code to run after previous work is cancelled.
+     * @return the result of block, if this call was not cancelled prior to returning.
+     */
+    suspend fun cancelPreviousThenRun(block: suspend () -> T): T {
+        // fast path: if we already know about an active task, just cancel it right away.
+        activeTask.get()?.cancelAndJoin()
+
+        return coroutineScope {
+            // Create a new coroutine, but don't start it until it's decided that this block should
+            // execute. In the code below, calling await() on newTask will cause this coroutine to
+            // start.
+            val newTask = async(start = LAZY) {
+                block()
+            }
+
+            // When newTask completes, ensure that it resets activeTask to null (if it was the
+            // current activeTask).
+            newTask.invokeOnCompletion {
+                activeTask.compareAndSet(newTask, null)
+            }
+
+            // Kotlin ensures that we only set result once since it's a val, even though it's set
+            // inside the while(true) loop.
+            val result: T
+
+            // Loop until we are sure that newTask is ready to execute (all previous tasks are
+            // cancelled)
+            while (true) {
+                if (!activeTask.compareAndSet(null, newTask)) {
+                    // some other task started before newTask got set to activeTask, so see if it's
+                    // still running when we call get() here. If so, we can cancel it.
+
+                    // we will always start the loop again to see if we can set activeTask before
+                    // starting newTask.
+                    activeTask.get()?.cancelAndJoin()
+                    // yield here to avoid a possible tight loop on a single threaded dispatcher
+                    yield()
+                } else {
+                    // happy path - we set activeTask so we are ready to run newTask
+                    result = newTask.await()
+                    break
+                }
+            }
+
+            // Kotlin ensures that the above loop always sets result exactly once, so we can return
+            // it here!
+            result
+        }
+    }
+
+    /**
+     * Don't run the new block if a previous block is running, instead wait for the previous block
+     * and return it's result.
+     *
+     * When several coroutines call jonPreviousOrRun at the same time, only one will run and
+     * the others will return the result from the winner.
+     *
+     * In the following example, only one network operation will execute at a time and any other
+     * requests will return the result from the "in flight" request.
+     *
+     * ```
+     * class Products {
+     *    val controlledRunner = ControlledRunner<Product>()
+     *
+     *    fun fetchProducts(): List<Product> {
+     *        return controlledRunner.joinPreviousOrRun {
+     *            val results = api.fetchProducts()
+     *            dao.insert(results)
+     *            results
+     *        }
+     *    }
+     * }
+     * ```
+     *
+     * @param block the code to run if and only if no other task is currently running
+     * @return the result of block, or if another task was running the result of that task instead.
+     */
+    suspend fun joinPreviousOrRun(block: suspend () -> T): T {
+        // fast path: if there's already an active task, just wait for it and return the result
+        activeTask.get()?.let {
+            return it.await()
+        }
+        return coroutineScope {
+            // Create a new coroutine, but don't start it until it's decided that this block should
+            // execute. In the code below, calling await() on newTask will cause this coroutine to
+            // start.
+            val newTask = async(start = LAZY) {
+                block()
+            }
+
+            newTask.invokeOnCompletion {
+                activeTask.compareAndSet(newTask, null)
+            }
+
+            // Kotlin ensures that we only set result once since it's a val, even though it's set
+            // inside the while(true) loop.
+            val result: T
+
+            // Loop until we figure out if we need to run newTask, or if there is a task that's
+            // already running we can join.
+            while (true) {
+                if (!activeTask.compareAndSet(null, newTask)) {
+                    // some other task started before newTask got set to activeTask, so see if it's
+                    // still running when we call get() here. There is a chance that it's already
+                    // been completed before the call to get, in which case we need to start the
+                    // loop over and try again.
+                    val currentTask = activeTask.get()
+                    if (currentTask != null) {
+                        // happy path - we found the other task so use that one instead of newTask
+                        newTask.cancel()
+                        result = currentTask.await()
+                        break
+                    } else {
+                        // retry path - the other task completed before we could get it, loop to try
+                        // setting activeTask again.
+
+                        // call yield here in case we're executing on a single threaded dispatcher
+                        // like Dispatchers.Main to allow other work to happen.
+                        yield()
+                    }
+                } else {
+                    // happy path - we were able to set activeTask, so start newTask and return its
+                    // result
+                    result = newTask.await()
+                    break
+                }
+            }
+
+            // Kotlin ensures that the above loop always sets result exactly once, so we can return
+            // it here!
+            result
+        }
+    }
+}

app/src/main/java/awais/instagrabber/viewmodels/ProfileFragmentViewModel.kt

@@ -9,6 +9,7 @@ import awais.instagrabber.managers.DirectMessagesManager
 import awais.instagrabber.models.Resource
 import awais.instagrabber.repositories.responses.User
 import awais.instagrabber.repositories.responses.directmessages.RankedRecipient
+import awais.instagrabber.utils.ControlledRunner
 import awais.instagrabber.webservices.*
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -52,6 +53,7 @@ class ProfileFragmentViewModel(
             }
         }
 
+    private val profileFetchControlledRunner = ControlledRunner<User?>()
     val profile: LiveData<Resource<User?>> = currentUserAndStateUsernameLiveData.switchMap {
         val (userResource, stateUsernameResource) = it
         liveData<Resource<User?>>(context = viewModelScope.coroutineContext + ioDispatcher) {
@@ -66,11 +68,15 @@ class ProfileFragmentViewModel(
                 return@liveData
             }
             try {
-                val fetchedUser = if (user != null) {
+                val fetchedUser = profileFetchControlledRunner.cancelPreviousThenRun {
-                    userRepository.getUsernameInfo(stateUsername) // logged in
+                    return@cancelPreviousThenRun if (user != null) {
+                        val tempUser = userRepository.getUsernameInfo(stateUsername) // logged in
+                        tempUser.friendshipStatus = userRepository.getUserFriendship(tempUser.pk)
+                        return@cancelPreviousThenRun tempUser
                     } else {
                         graphQLRepository.fetchUser(stateUsername) // anonymous
                     }
+                }
                 emit(Resource.success(fetchedUser))
             } catch (e: Exception) {
                 emit(Resource.error(e.message, null))

app/src/main/java/awais/instagrabber/webservices/UserRepository.kt

@@ -19,7 +19,7 @@ open class UserRepository(private val service: UserService) {
         return response.user
     }
 
-    suspend fun getUserFriendship(uid: Long): FriendshipStatus = service.getUserFriendship(uid)
+    open suspend fun getUserFriendship(uid: Long): FriendshipStatus = service.getUserFriendship(uid)
 
     suspend fun search(query: String): UserSearchResponse {
         val timezoneOffset = TimeZone.getDefault().rawOffset.toFloat() / 1000

app/src/test/java/awais/instagrabber/viewmodels/ProfileFragmentViewModelTest.kt

@@ -11,6 +11,7 @@ import awais.instagrabber.db.repositories.AccountRepository
 import awais.instagrabber.db.repositories.FavoriteRepository
 import awais.instagrabber.getOrAwaitValue
 import awais.instagrabber.models.Resource
+import awais.instagrabber.repositories.responses.FriendshipStatus
 import awais.instagrabber.repositories.responses.User
 import awais.instagrabber.webservices.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -166,8 +167,10 @@ internal class ProfileFragmentViewModelTest {
 
     @ExperimentalCoroutinesApi
     private fun testPublicUsernameCurrentUserCommon(state: SavedStateHandle) {
-        val userRepository = object: UserRepository(UserServiceAdapter()) {
+        val friendshipStatus = FriendshipStatus(following = true)
+        val userRepository = object : UserRepository(UserServiceAdapter()) {
             override suspend fun getUsernameInfo(username: String): User = testPublicUser
+            override suspend fun getUserFriendship(uid: Long): FriendshipStatus = friendshipStatus
         }
         val viewModel = ProfileFragmentViewModel(
             state,
@@ -187,6 +190,7 @@ internal class ProfileFragmentViewModelTest {
             profile = viewModel.profile.getOrAwaitValue()
         }
         assertEquals(testPublicUser, profile.data)
+        assertEquals(friendshipStatus, profile.data?.friendshipStatus)
     }
 
     @ExperimentalCoroutinesApi
@@ -198,14 +202,12 @@ internal class ProfileFragmentViewModelTest {
             )
         )
         val graphQLRepository = object : GraphQLRepository(GraphQLServiceAdapter()) {
-            override suspend fun fetchUser(username: String): User {
+            override suspend fun fetchUser(username: String): User = when (username) {
-                return when(username) {
                 testPublicUser.username -> testPublicUser
                 testPublicUser1.username -> testPublicUser1
                 else -> throw JSONException("")
             }
         }
-        }
         val viewModel = ProfileFragmentViewModel(
             state,
             UserRepository(UserServiceAdapter()),