mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Fix code formatting for kotlin files
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
parent
079e527f21
commit
bb9925b12c
@ -22,7 +22,6 @@ package com.nextcloud.talk.arbitrarystorage
|
|||||||
|
|
||||||
import com.nextcloud.talk.data.storage.ArbitraryStoragesRepository
|
import com.nextcloud.talk.data.storage.ArbitraryStoragesRepository
|
||||||
import com.nextcloud.talk.data.storage.model.ArbitraryStorage
|
import com.nextcloud.talk.data.storage.model.ArbitraryStorage
|
||||||
import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
|
|
||||||
import io.reactivex.Maybe
|
import io.reactivex.Maybe
|
||||||
|
|
||||||
class ArbitraryStorageManager(private val arbitraryStoragesRepository: ArbitraryStoragesRepository) {
|
class ArbitraryStorageManager(private val arbitraryStoragesRepository: ArbitraryStoragesRepository) {
|
||||||
@ -37,8 +36,4 @@ class ArbitraryStorageManager(private val arbitraryStoragesRepository: Arbitrary
|
|||||||
fun deleteAllEntriesForAccountIdentifier(accountIdentifier: Long): Int {
|
fun deleteAllEntriesForAccountIdentifier(accountIdentifier: Long): Int {
|
||||||
return arbitraryStoragesRepository.deleteArbitraryStorage(accountIdentifier)
|
return arbitraryStoragesRepository.deleteArbitraryStorage(accountIdentifier)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getAll() : Maybe<List<ArbitraryStorageEntity>> {
|
|
||||||
return arbitraryStoragesRepository.getAll()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
|
|||||||
import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
|
import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
|
||||||
import com.nextcloud.talk.chat.ChatActivity
|
import com.nextcloud.talk.chat.ChatActivity
|
||||||
import com.nextcloud.talk.contacts.ContactsActivity
|
import com.nextcloud.talk.contacts.ContactsActivity
|
||||||
import com.nextcloud.talk.data.storage.model.ArbitraryStorage
|
|
||||||
import com.nextcloud.talk.data.user.model.User
|
import com.nextcloud.talk.data.user.model.User
|
||||||
import com.nextcloud.talk.databinding.ControllerConversationsRvBinding
|
import com.nextcloud.talk.databinding.ControllerConversationsRvBinding
|
||||||
import com.nextcloud.talk.events.ConversationsListFetchDataEvent
|
import com.nextcloud.talk.events.ConversationsListFetchDataEvent
|
||||||
@ -123,7 +122,6 @@ import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isServerEOL
|
|||||||
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUnifiedSearchAvailable
|
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUnifiedSearchAvailable
|
||||||
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUserStatusAvailable
|
import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUserStatusAvailable
|
||||||
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
|
import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
|
||||||
import com.nextcloud.talk.utils.preferences.AppPreferences
|
|
||||||
import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView
|
import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView
|
||||||
import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder
|
import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder
|
||||||
import eu.davidea.flexibleadapter.FlexibleAdapter
|
import eu.davidea.flexibleadapter.FlexibleAdapter
|
||||||
@ -281,21 +279,26 @@ class ConversationsListActivity :
|
|||||||
}
|
}
|
||||||
fun filterConversation() {
|
fun filterConversation() {
|
||||||
val accountId = UserIdUtils.getIdForUser(userManager.currentUser.blockingGet())
|
val accountId = UserIdUtils.getIdForUser(userManager.currentUser.blockingGet())
|
||||||
filterState[FilterConversationFragment.UNREAD] = (arbitraryStorageManager.getStorageSetting(
|
filterState[FilterConversationFragment.UNREAD] = (
|
||||||
accountId,
|
arbitraryStorageManager.getStorageSetting(
|
||||||
FilterConversationFragment.UNREAD,
|
accountId,
|
||||||
""
|
FilterConversationFragment.UNREAD,
|
||||||
).blockingGet()?.value ?: "") == "true"
|
""
|
||||||
|
).blockingGet()?.value ?: ""
|
||||||
|
) == "true"
|
||||||
|
|
||||||
filterState[FilterConversationFragment.MENTION] = (arbitraryStorageManager.getStorageSetting(
|
filterState[FilterConversationFragment.MENTION] = (
|
||||||
accountId,
|
arbitraryStorageManager.getStorageSetting(
|
||||||
FilterConversationFragment.MENTION,
|
accountId,
|
||||||
""
|
FilterConversationFragment.MENTION,
|
||||||
).blockingGet()?.value ?: "") == "true"
|
""
|
||||||
|
).blockingGet()?.value ?: ""
|
||||||
|
) == "true"
|
||||||
|
|
||||||
val newItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
|
val newItems: MutableList<AbstractFlexibleItem<*>> = ArrayList()
|
||||||
if (filterState[FilterConversationFragment.UNREAD] == false &&
|
if (filterState[FilterConversationFragment.UNREAD] == false &&
|
||||||
filterState[FilterConversationFragment.MENTION] == false) {
|
filterState[FilterConversationFragment.MENTION] == false
|
||||||
|
) {
|
||||||
adapter!!.updateDataSet(conversationItems, true)
|
adapter!!.updateDataSet(conversationItems, true)
|
||||||
} else {
|
} else {
|
||||||
val items = conversationItems
|
val items = conversationItems
|
||||||
|
@ -22,7 +22,6 @@ package com.nextcloud.talk.data.source.local
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.room.AutoMigration
|
|
||||||
import androidx.room.Database
|
import androidx.room.Database
|
||||||
import androidx.room.Room
|
import androidx.room.Room
|
||||||
import androidx.room.RoomDatabase
|
import androidx.room.RoomDatabase
|
||||||
|
@ -41,11 +41,10 @@ abstract class ArbitraryStoragesDao {
|
|||||||
objectString: String
|
objectString: String
|
||||||
): Maybe<ArbitraryStorageEntity>
|
): Maybe<ArbitraryStorageEntity>
|
||||||
|
|
||||||
|
|
||||||
@Query(
|
@Query(
|
||||||
"SELECT * FROM ArbitraryStorage"
|
"SELECT * FROM ArbitraryStorage"
|
||||||
)
|
)
|
||||||
abstract fun getAll() : Maybe<List<ArbitraryStorageEntity>>
|
abstract fun getAll(): Maybe<List<ArbitraryStorageEntity>>
|
||||||
|
|
||||||
@Query("DELETE FROM ArbitraryStorage WHERE accountIdentifier = :accountIdentifier")
|
@Query("DELETE FROM ArbitraryStorage WHERE accountIdentifier = :accountIdentifier")
|
||||||
abstract fun deleteArbitraryStorage(accountIdentifier: Long): Int
|
abstract fun deleteArbitraryStorage(accountIdentifier: Long): Int
|
||||||
|
@ -23,7 +23,6 @@ package com.nextcloud.talk.data.storage.model
|
|||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import androidx.room.ColumnInfo
|
import androidx.room.ColumnInfo
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.PrimaryKey
|
|
||||||
import kotlinx.parcelize.Parcelize
|
import kotlinx.parcelize.Parcelize
|
||||||
|
|
||||||
@Parcelize
|
@Parcelize
|
||||||
|
@ -35,7 +35,6 @@ import com.nextcloud.talk.databinding.DialogFilterConversationBinding
|
|||||||
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
||||||
import com.nextcloud.talk.users.UserManager
|
import com.nextcloud.talk.users.UserManager
|
||||||
import com.nextcloud.talk.utils.UserIdUtils
|
import com.nextcloud.talk.utils.UserIdUtils
|
||||||
import com.nextcloud.talk.utils.preferences.AppPreferences
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@AutoInjector(NextcloudTalkApplication::class)
|
@AutoInjector(NextcloudTalkApplication::class)
|
||||||
|
Loading…
Reference in New Issue
Block a user