gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename ArbitraryStorageNgEntity to ArbitraryStorageEntity

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-24 09:43:01 +02:00
parent 84c1874284
commit a207ad7b97
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt
View File

@ -33,7 +33,7 @@ import com.nextcloud.talk.data.source.local.converters.HashMapHashMapConverter
import com.nextcloud.talk.data.source.local.converters.PushConfigurationConverter import com.nextcloud.talk.data.source.local.converters.PushConfigurationConverter
import com.nextcloud.talk.data.source.local.converters.SignalingSettingsConverter import com.nextcloud.talk.data.source.local.converters.SignalingSettingsConverter
import com.nextcloud.talk.data.storage.ArbitraryStoragesDao import com.nextcloud.talk.data.storage.ArbitraryStoragesDao
import com.nextcloud.talk.data.storage.model.ArbitraryStorageNgEntity import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
import com.nextcloud.talk.data.user.UsersDao import com.nextcloud.talk.data.user.UsersDao
import com.nextcloud.talk.data.user.model.UserEntity import com.nextcloud.talk.data.user.model.UserEntity
import net.sqlcipher.database.SQLiteDatabase import net.sqlcipher.database.SQLiteDatabase
@ -41,7 +41,7 @@ import net.sqlcipher.database.SupportFactory
import java.util.Locale import java.util.Locale
@Database( @Database(
entities = [UserEntity::class, ArbitraryStorageNgEntity::class], entities = [UserEntity::class, ArbitraryStorageEntity::class],
version = 8, version = 8,
exportSchema = true exportSchema = true
) )

6
app/src/main/java/com/nextcloud/talk/data/storage/ArbitraryStoragesDao.kt
View File

@ -24,7 +24,7 @@ import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import com.nextcloud.talk.data.storage.model.ArbitraryStorageNgEntity import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
@Dao @Dao
abstract class ArbitraryStoragesDao { abstract class ArbitraryStoragesDao {
@ -34,11 +34,11 @@ abstract class ArbitraryStoragesDao {
"\"key\" = :key AND " + "\"key\" = :key AND " +
"object = :objectString" "object = :objectString"
) )
abstract fun getStorageSetting(accountIdentifier: Long, key: String, objectString: String): ArbitraryStorageNgEntity abstract fun getStorageSetting(accountIdentifier: Long, key: String, objectString: String): ArbitraryStorageEntity
@Query("DELETE FROM ArbitraryStorage WHERE accountIdentifier = :accountIdentifier") @Query("DELETE FROM ArbitraryStorage WHERE accountIdentifier = :accountIdentifier")
abstract suspend fun deleteArbitraryStorage(accountIdentifier: Long) abstract suspend fun deleteArbitraryStorage(accountIdentifier: Long)
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageNgEntity): Long abstract fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageEntity): Long
} }

6
app/src/main/java/com/nextcloud/talk/data/storage/ArbitraryStoragesRepository.kt
View File

@ -20,10 +20,10 @@
package com.nextcloud.talk.data.storage package com.nextcloud.talk.data.storage
import com.nextcloud.talk.data.storage.model.ArbitraryStorageNgEntity import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
interface ArbitraryStoragesRepository { interface ArbitraryStoragesRepository {
fun getStorageSetting(accountIdentifier: Long, key: String, objectString: String): ArbitraryStorageNgEntity fun getStorageSetting(accountIdentifier: Long, key: String, objectString: String): ArbitraryStorageEntity
suspend fun deleteArbitraryStorage(accountIdentifier: Long) suspend fun deleteArbitraryStorage(accountIdentifier: Long)
fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageNgEntity): Long fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageEntity): Long
} }

6
app/src/main/java/com/nextcloud/talk/data/storage/ArbitraryStoragesRepositoryImpl.kt
View File

@ -20,7 +20,7 @@
package com.nextcloud.talk.data.storage package com.nextcloud.talk.data.storage
import com.nextcloud.talk.data.storage.model.ArbitraryStorageNgEntity import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
class ArbitraryStoragesRepositoryImpl(private val arbitraryStoragesDao: ArbitraryStoragesDao) : class ArbitraryStoragesRepositoryImpl(private val arbitraryStoragesDao: ArbitraryStoragesDao) :
ArbitraryStoragesRepository { ArbitraryStoragesRepository {
@ -28,7 +28,7 @@ class ArbitraryStoragesRepositoryImpl(private val arbitraryStoragesDao: Arbitrar
accountIdentifier: Long, accountIdentifier: Long,
key: String, key: String,
objectString: String objectString: String
): ArbitraryStorageNgEntity { ): ArbitraryStorageEntity {
return arbitraryStoragesDao.getStorageSetting(accountIdentifier, key, objectString) return arbitraryStoragesDao.getStorageSetting(accountIdentifier, key, objectString)
} }
@ -36,7 +36,7 @@ class ArbitraryStoragesRepositoryImpl(private val arbitraryStoragesDao: Arbitrar
arbitraryStoragesDao.deleteArbitraryStorage(accountIdentifier) arbitraryStoragesDao.deleteArbitraryStorage(accountIdentifier)
} }
override fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageNgEntity): Long { override fun saveArbitraryStorage(arbitraryStorage: ArbitraryStorageEntity): Long {
return arbitraryStoragesDao.saveArbitraryStorage(arbitraryStorage) return arbitraryStoragesDao.saveArbitraryStorage(arbitraryStorage)
} }
} }

2
app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageNgEntity.kt → app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageEntity.kt
View File

@ -28,7 +28,7 @@ import kotlinx.android.parcel.Parcelize
@Parcelize @Parcelize
@Entity(tableName = "ArbitraryStorage") @Entity(tableName = "ArbitraryStorage")
data class ArbitraryStorageNgEntity( data class ArbitraryStorageEntity(
@PrimaryKey @ColumnInfo(name = "accountIdentifier") var accountIdentifier: Long = 0, @PrimaryKey @ColumnInfo(name = "accountIdentifier") var accountIdentifier: Long = 0,
@ColumnInfo(name = "key") var key: String? = null, @ColumnInfo(name = "key") var key: String? = null,
@ColumnInfo(name = "object") var storageObject: String? = null, @ColumnInfo(name = "object") var storageObject: String? = null,