srctree

Robin Linden parent efef2c0b 5d938816
Fix ktlint violations in core/

inline split

core/src/androidTest/kotlin/db/DatabaseMigrationTest.kt added: 54, removed: 17, total 37

@@ -4,7 +4,12 @@ import androidx.room.testing.MigrationTestHelper

import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry

import ltd.evilcorp.core.vo.*

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.Message

import ltd.evilcorp.core.vo.MessageType

import ltd.evilcorp.core.vo.Sender

import ltd.evilcorp.core.vo.UserStatus

import org.junit.Assert.assertEquals

import org.junit.Rule

import org.junit.Test

core/src/main/kotlin/db/ContactDao.kt added: 54, removed: 17, total 37

@@ -1,7 +1,12 @@

package ltd.evilcorp.core.db

import androidx.lifecycle.LiveData

import androidx.room.*

import androidx.room.Dao

import androidx.room.Delete

import androidx.room.Insert

import androidx.room.OnConflictStrategy

import androidx.room.Query

import androidx.room.Update

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.UserStatus

core/src/main/kotlin/db/Database.kt added: 54, removed: 17, total 37

@@ -3,7 +3,11 @@ package ltd.evilcorp.core.db

import androidx.room.Database

import androidx.room.RoomDatabase

import androidx.room.TypeConverters

import ltd.evilcorp.core.vo.*

import ltd.evilcorp.core.vo.Contact

import ltd.evilcorp.core.vo.FileTransfer

import ltd.evilcorp.core.vo.FriendRequest

import ltd.evilcorp.core.vo.Message

import ltd.evilcorp.core.vo.User

@Database(

entities = [Contact::class, FileTransfer::class, FriendRequest::class, Message::class, User::class],

core/src/main/kotlin/db/FileTransferDao.kt added: 54, removed: 17, total 37

@@ -1,7 +1,11 @@

package ltd.evilcorp.core.db

import androidx.lifecycle.LiveData

import androidx.room.*

import androidx.room.Dao

import androidx.room.Delete

import androidx.room.Insert

import androidx.room.OnConflictStrategy

import androidx.room.Query

import ltd.evilcorp.core.vo.FileTransfer

@Dao

core/src/main/kotlin/db/FriendRequestDao.kt added: 54, removed: 17, total 37

@@ -1,7 +1,11 @@

package ltd.evilcorp.core.db

import androidx.lifecycle.LiveData

import androidx.room.*

import androidx.room.Dao

import androidx.room.Delete

import androidx.room.Insert

import androidx.room.OnConflictStrategy

import androidx.room.Query

import ltd.evilcorp.core.vo.FriendRequest

@Dao

core/src/main/kotlin/db/MessageDao.kt added: 54, removed: 17, total 37

@@ -1,7 +1,10 @@

package ltd.evilcorp.core.db

import androidx.lifecycle.LiveData

import androidx.room.*

import androidx.room.Dao

import androidx.room.Insert

import androidx.room.OnConflictStrategy

import androidx.room.Query

import ltd.evilcorp.core.vo.Message

@Dao

@@ -21,6 +24,6 @@ internal interface MessageDao {

@Query("DELETE FROM messages WHERE conversation == :conversation")

fun delete(conversation: String)

@Query("UPDATE messages SET timestamp = :timestamp WHERE conversation == :conversation AND correlation_id == :correlationId")

@Query("UPDATE messages SET timestamp = :timestamp WHERE conversation == :conversation AND correlation_id == :correlationId") // ktlint-disable

fun setReceipt(conversation: String, correlationId: Int, timestamp: Long)

}

core/src/main/kotlin/db/UserDao.kt added: 54, removed: 17, total 37

@@ -1,7 +1,12 @@

package ltd.evilcorp.core.db

import androidx.lifecycle.LiveData

import androidx.room.*

import androidx.room.Dao

import androidx.room.Delete

import androidx.room.Insert

import androidx.room.OnConflictStrategy

import androidx.room.Query

import androidx.room.Update

import ltd.evilcorp.core.vo.ConnectionStatus

import ltd.evilcorp.core.vo.User

import ltd.evilcorp.core.vo.UserStatus

core/src/main/kotlin/di/DatabaseModule.kt added: 54, removed: 17, total 37

@@ -5,7 +5,14 @@ import androidx.room.Room

import dagger.Module

import dagger.Provides

import javax.inject.Singleton

import ltd.evilcorp.core.db.*

import ltd.evilcorp.core.db.ContactDao

import ltd.evilcorp.core.db.Database

import ltd.evilcorp.core.db.FileTransferDao

import ltd.evilcorp.core.db.FriendRequestDao

import ltd.evilcorp.core.db.MIGRATION_1_2

import ltd.evilcorp.core.db.MIGRATION_2_3

import ltd.evilcorp.core.db.MessageDao

import ltd.evilcorp.core.db.UserDao

@Suppress("unused")

@Module