Commit 9a4b010f authored by Mohit Mali's avatar Mohit Mali

Fixed Merge Error

parent ba785ec8
Pipeline #38483 passed with stage
in 11 minutes and 51 seconds
......@@ -18,22 +18,14 @@
*/
package com.moez.QKSMS.feature.main
import androidx.recyclerview.widget.ItemTouchHelper
import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.extensions.mapNotNull
import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkAllSeen
import com.moez.QKSMS.interactor.MarkArchived
import com.moez.QKSMS.interactor.MarkPinned
import com.moez.QKSMS.interactor.MarkRead
import com.moez.QKSMS.interactor.MarkUnarchived
import com.moez.QKSMS.interactor.MarkUnpinned
import com.moez.QKSMS.interactor.MarkUnread
import com.moez.QKSMS.interactor.MigratePreferences
import com.moez.QKSMS.interactor.SyncMessages
import com.moez.QKSMS.interactor.*
import com.moez.QKSMS.listener.ContactAddedListener
import com.moez.QKSMS.manager.ChangelogManager
import com.moez.QKSMS.manager.PermissionManager
......@@ -53,11 +45,14 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Named
class MainViewModel @Inject constructor(
@Named("threadId") private val threadId: Long,
markAllSeen: MarkAllSeen,
migratePreferences: MigratePreferences,
syncRepository: SyncRepository,
private val contactAddedListener: ContactAddedListener,
private val changelogManager: ChangelogManager,
private val conversationRepo: ConversationRepository,
private val deleteConversations: DeleteConversations,
private val markArchived: MarkArchived,
......@@ -391,7 +386,7 @@ class MainViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.backPressedIntent
/* view.backPressedIntent
.withLatestFrom(state) { _, state ->
when {
state.drawerOpen -> newState { copy(drawerOpen = false) }
......@@ -408,7 +403,7 @@ class MainViewModel @Inject constructor(
}
}
.autoDisposable(view.scope())
.subscribe()
.subscribe()*/
if (threadId == 0L) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment