Fix data source bug

Author: hitherejoe

Data/src/main/java/co/joebirch/data/ProjectsDataRepository.kt

@@ -24,6 +24,7 @@ class ProjectsDataRepository @Inject constructor(
                 })
                 .flatMap {
                     factory.getDataStore(it.first, it.second).getProjects().toObservable()
+                            .distinctUntilChanged()
                 }
                 .flatMap { projects ->
                     factory.getCacheDataStore()

Data/src/main/java/co/joebirch/data/model/ProjectEntity.kt

@@ -1,13 +1,6 @@
 package co.joebirch.data.model
 
-<<<<<<< HEAD
 data class ProjectEntity(val id: String, val name: String, val fullName: String,
                          val starCount: String, val dateCreated: String,
                          val ownerName: String, val ownerAvatar: String,
-                         val isBookmarked: Boolean)
-=======
-class ProjectEntity(val id: String, val name: String, val fullName: String,
-                    val starCount: String, val dateCreated: String,
-                    val ownerName: String, val ownerAvatar: String,
-                    val isBookmarked: Boolean)
->>>>>>> layer/data
+                         val isBookmarked: Boolean)

Presentation/src/main/java/co/joebirch/presentation/BrowseProjectsViewModel.kt

@@ -42,13 +42,11 @@ open class BrowseProjectsViewModel @Inject internal constructor(
     }
 
     fun bookmarkProject(projectId: String) {
-        liveData.postValue(Resource(ResourceState.LOADING, null, null))
         return bookmarkProject.execute(BookmarkProjectsSubscriber(),
                 BookmarkProject.Params.forProject(projectId))
     }
 
     fun unbookmarkProject(projectId: String) {
-        liveData.postValue(Resource(ResourceState.LOADING, null, null))
         return unBookmarkProject.execute(BookmarkProjectsSubscriber(),
                 UnbookmarkProject.Params.forProject(projectId))
     }