gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-09 05:50:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixups due to wrong merge

Browse Source
This commit is contained in:
Mario Danic 2019-12-21 22:43:25 +01:00 committed by Mario Đanić
parent 70de6a7f5a
commit 87af803cc8
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -22,7 +22,6 @@ package com.nextcloud.talk.newarch.features.conversationsList
import android.app.SearchManager import android.app.SearchManager
import android.content.Context import android.content.Context
import android.content.pm.ShortcutManager
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
@ -59,7 +58,6 @@ import com.nextcloud.talk.newarch.utils.Images
import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.ConductorRemapping import com.nextcloud.talk.utils.ConductorRemapping
import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.newarch.utils.ShortcutService
import com.nextcloud.talk.utils.animations.SharedElementTransition import com.nextcloud.talk.utils.animations.SharedElementTransition
import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
@ -235,7 +233,6 @@ class ConversationsListView : BaseView(), OnQueryTextListener,
) )
} }
<<<<<<< HEAD
recyclerViewAdapter.updateDataSet( recyclerViewAdapter.updateDataSet(
newConversations as newConversations as
List<IFlexible<ViewHolder>>?, false List<IFlexible<ViewHolder>>?, false
@ -247,18 +244,6 @@ class ConversationsListView : BaseView(), OnQueryTextListener,
recyclerViewAdapter.filterItems(500) recyclerViewAdapter.filterItems(500)
}) })
} }
=======
val shortcutService = ShortcutService(
context.getSystemService<ShortcutManager>(ShortcutManager::class.java),
context,
this
//this.offlineRepository
);
shortcutService.registerShortcuts()
return super.onCreateView(inflater, container)
}
>>>>>>> feature/app-shortcuts
viewState.observe(this@ConversationsListView, Observer { value -> viewState.observe(this@ConversationsListView, Observer { value ->
when (value) { when (value) {