caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:database:impl cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 20:35:00 +02:00
parent 7c417e3519
commit 1681ee558d
261 changed files with 522 additions and 61616 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -30,6 +30,9 @@ import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils
import app.aaps.core.ui.locale.LocaleHelper
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry
import app.aaps.database.impl.AppRepository
import app.aaps.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import app.aaps.database.impl.transactions.VersionChangeTransaction
import app.aaps.di.DaggerAppComponent
import app.aaps.implementation.db.CompatDBHelper
import app.aaps.implementation.lifecycle.ProcessLifecycleListener
@ -46,9 +49,6 @@ import app.aaps.ui.activityMonitor.ActivityMonitor
import app.aaps.ui.widget.Widget
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.impl.transactions.VersionChangeTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.exceptions.UndeliverableException
import io.reactivex.rxjava3.kotlin.plusAssign

2
app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt
View file

@ -13,10 +13,10 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.main.graph.OverviewData
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.main.workflow.CalculationWorkflow
import app.aaps.database.impl.AppRepository
import app.aaps.implementation.overview.OverviewDataImpl
import app.aaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import javax.inject.Inject
import javax.inject.Singleton

4
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -3,6 +3,7 @@ package app.aaps.di
import app.aaps.MainApp
import app.aaps.core.main.di.CoreModule
import app.aaps.core.validators.di.ValidatorsModule
import app.aaps.database.impl.DatabaseModule
import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule
import app.aaps.plugins.automation.di.AutomationModule
@ -14,6 +15,7 @@ import app.aaps.plugins.source.di.SourceModule
import app.aaps.plugins.sync.di.OpenHumansModule
import app.aaps.plugins.sync.di.SyncModule
import app.aaps.shared.impl.di.SharedImplModule
import app.aaps.ui.di.UiModule
import dagger.BindsInstance
import dagger.Component
import dagger.android.AndroidInjectionModule
@ -26,7 +28,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule
import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.database.impl.DatabaseModule
import info.nightscout.pump.combo.di.ComboModule
import info.nightscout.pump.combov2.di.ComboV2Module
import info.nightscout.pump.common.di.PumpCommonModule
@ -36,7 +37,6 @@ import info.nightscout.pump.danars.di.DanaRSModule
import info.nightscout.pump.diaconn.di.DiaconnG8Module
import info.nightscout.pump.medtrum.di.MedtrumModule
import info.nightscout.pump.virtual.di.VirtualPumpModule
import app.aaps.ui.di.UiModule
import info.nightscout.workflow.di.WorkflowModule
import javax.inject.Singleton

2
app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt
View file

@ -27,9 +27,9 @@ import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.main.utils.worker.LoggingWorker
import app.aaps.database.impl.AppRepository
import app.aaps.plugins.configuration.maintenance.MaintenancePlugin
import com.google.common.util.concurrent.ListenableFuture
import info.nightscout.database.impl.AppRepository
import kotlinx.coroutines.Dispatchers
import java.util.concurrent.TimeUnit
import javax.inject.Inject

12
core/interfaces/src/main/kotlin/app/aaps/core/interfaces/pump/PumpSync.kt
View file

@ -319,7 +319,7 @@ interface PumpSync {
* if db record already has endPumpId assigned by [syncStopTemporaryBasalWithPumpId] other updates
* are ignored
*
* see [info.nightscout.database.impl.transactions.SyncPumpTemporaryBasalTransaction]
* see [app.aaps.database.impl.transactions.SyncPumpTemporaryBasalTransaction]
*
* @param timestamp timestamp of event from pump history
* @param rate TBR rate in U/h or % (value of 100% is equal to no TBR)
@ -349,7 +349,7 @@ interface PumpSync {
* endPumpId is stored to running record
* If db record doesn't exist data is ignored and false returned
*
* see [info.nightscout.database.impl.transactions.SyncPumpCancelTemporaryBasalIfAnyTransaction]
* see [app.aaps.database.impl.transactions.SyncPumpCancelTemporaryBasalIfAnyTransaction]
*
* @param timestamp timestamp of event from pump history
* @param endPumpId pump id of ending event from history
@ -383,7 +383,7 @@ interface PumpSync {
* @param pumpSerial pump serial number
* @return true if new record is created
*
* see [info.nightscout.database.impl.transactions.InsertTemporaryBasalWithTempIdTransaction]
* see [app.aaps.database.impl.transactions.InsertTemporaryBasalWithTempIdTransaction]
**/
fun addTemporaryBasalWithTempId(timestamp: Long, rate: Double, duration: Long, isAbsolute: Boolean, tempId: Long, type: TemporaryBasalType, pumpType: PumpType, pumpSerial: String): Boolean
@ -475,7 +475,7 @@ interface PumpSync {
* If db record doesn't exist, new record is created.
* isValid field is preserved
*
* see [info.nightscout.database.impl.transactions.SyncPumpExtendedBolusTransaction]
* see [app.aaps.database.impl.transactions.SyncPumpExtendedBolusTransaction]
*
* @param timestamp timestamp of event from pump history
* @param amount EB total amount in U
@ -503,7 +503,7 @@ interface PumpSync {
* endPumpId is stored to running record
* If db record doesn't exist data is ignored and false returned
*
* see [info.nightscout.database.impl.transactions.SyncPumpCancelExtendedBolusIfAnyTransaction]
* see [app.aaps.database.impl.transactions.SyncPumpCancelExtendedBolusIfAnyTransaction]
*
* @param timestamp timestamp of event from pump history
* @param endPumpId pump id of ending event from history
@ -528,7 +528,7 @@ interface PumpSync {
* isValid field is preserved
* If db record doesn't exist, new record is created.
*
* see [info.nightscout.database.impl.transactions.SyncPumpTotalDailyDoseTransaction]
* see [app.aaps.database.impl.transactions.SyncPumpTotalDailyDoseTransaction]
*
* @param timestamp timestamp of event from pump history
* @param bolusAmount bolus part

2
database/entities/build.gradle
View file

@ -33,5 +33,5 @@ dependencies {
allOpen {
// allows mocking for classes w/o directly opening them for release builds
annotation 'info.nightscout.database.annotations.DbOpenForTesting'
annotation 'app.aaps.database.annotations.DbOpenForTesting'
}

2
database/impl/build.gradle
View file

@ -11,8 +11,8 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'app.aaps.database.impl'
namespace 'info.nightscout.database.impl'
defaultConfig {
kapt {
arguments {

0
database/impl/schemas/info.nightscout.database.impl.AppDatabase/24.json → database/impl/schemas/app.aaps.database.impl.AppDatabase/24.json
View file

2689
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/1.json
View file

File diff suppressed because it is too large Load diff

2931
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/10.json
View file

File diff suppressed because it is too large Load diff

2943
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/11.json
View file

File diff suppressed because it is too large Load diff

2931
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/12.json
View file

File diff suppressed because it is too large Load diff

2937
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/14.json
View file

File diff suppressed because it is too large Load diff

2943
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/15.json
View file

File diff suppressed because it is too large Load diff

2979
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/16.json
View file

File diff suppressed because it is too large Load diff

3015
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/18.json
View file

File diff suppressed because it is too large Load diff

2757
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/2.json
View file

File diff suppressed because it is too large Load diff

3424
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/20.json
View file

File diff suppressed because it is too large Load diff

3593
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/21.json
View file

File diff suppressed because it is too large Load diff

3605
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/22.json
View file

File diff suppressed because it is too large Load diff

2757
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/4.json
View file

File diff suppressed because it is too large Load diff

2775
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/5.json
View file

File diff suppressed because it is too large Load diff

2757
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/6.json
View file

File diff suppressed because it is too large Load diff

2924
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/7.json
View file

File diff suppressed because it is too large Load diff

2800
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/8.json
View file

File diff suppressed because it is too large Load diff

2800
database/impl/schemas/info.nightscout.androidaps.database.AppDatabase/9.json
View file

File diff suppressed because it is too large Load diff

3694
database/impl/schemas/info.nightscout.database.impl.AppDatabase/22.json
View file

File diff suppressed because it is too large Load diff

3841
database/impl/schemas/info.nightscout.database.impl.AppDatabase/23.json
View file

File diff suppressed because it is too large Load diff

2
database/impl/src/androidTest/java/info/nightscout/database/impl/HeartRateDaoTest.kt → database/impl/src/androidTest/kotlin/app/aaps/database/impl/HeartRateDaoTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl
package app.aaps.database.impl
import android.content.Context
import androidx.room.Room

8
database/impl/src/androidTest/java/info/nightscout/database/impl/transactions/InsertOrUpdateHeartRateTransactionTest.kt → database/impl/src/androidTest/kotlin/app/aaps/database/impl/transactions/InsertOrUpdateHeartRateTransactionTest.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import android.content.Context
import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import info.nightscout.database.impl.AppDatabase
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.HeartRateDaoTest
import app.aaps.database.impl.AppDatabase
import app.aaps.database.impl.AppRepository
import app.aaps.database.impl.HeartRateDaoTest
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals

2
database/impl/src/debug/java/info/nightscout/database/annotations/DbOpenForTesting.kt → database/impl/src/debug/kotlin/app/aaps/database/annotations/DbOpenForTesting.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.annotations
package app.aaps.database.annotations
/**
* This is the actual annotation that makes the class open. Don't use it directly, only through [DbOpenForTesting]

44
database/impl/src/main/java/info/nightscout/database/impl/AppDatabase.kt → database/impl/src/main/java/app/aaps/database/impl/AppDatabase.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl
package app.aaps.database.impl
import androidx.room.Database
import androidx.room.RoomDatabase
@ -22,27 +22,27 @@ import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.TotalDailyDose
import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.VersionChange
import info.nightscout.database.impl.daos.APSResultDao
import info.nightscout.database.impl.daos.APSResultLinkDao
import info.nightscout.database.impl.daos.BolusCalculatorResultDao
import info.nightscout.database.impl.daos.BolusDao
import info.nightscout.database.impl.daos.CarbsDao
import info.nightscout.database.impl.daos.DeviceStatusDao
import info.nightscout.database.impl.daos.EffectiveProfileSwitchDao
import info.nightscout.database.impl.daos.ExtendedBolusDao
import info.nightscout.database.impl.daos.FoodDao
import info.nightscout.database.impl.daos.GlucoseValueDao
import info.nightscout.database.impl.daos.HeartRateDao
import info.nightscout.database.impl.daos.MultiwaveBolusLinkDao
import info.nightscout.database.impl.daos.OfflineEventDao
import info.nightscout.database.impl.daos.PreferenceChangeDao
import info.nightscout.database.impl.daos.ProfileSwitchDao
import info.nightscout.database.impl.daos.TemporaryBasalDao
import info.nightscout.database.impl.daos.TemporaryTargetDao
import info.nightscout.database.impl.daos.TherapyEventDao
import info.nightscout.database.impl.daos.TotalDailyDoseDao
import info.nightscout.database.impl.daos.UserEntryDao
import info.nightscout.database.impl.daos.VersionChangeDao
import app.aaps.database.impl.daos.APSResultDao
import app.aaps.database.impl.daos.APSResultLinkDao
import app.aaps.database.impl.daos.BolusCalculatorResultDao
import app.aaps.database.impl.daos.BolusDao
import app.aaps.database.impl.daos.CarbsDao
import app.aaps.database.impl.daos.DeviceStatusDao
import app.aaps.database.impl.daos.EffectiveProfileSwitchDao
import app.aaps.database.impl.daos.ExtendedBolusDao
import app.aaps.database.impl.daos.FoodDao
import app.aaps.database.impl.daos.GlucoseValueDao
import app.aaps.database.impl.daos.HeartRateDao
import app.aaps.database.impl.daos.MultiwaveBolusLinkDao
import app.aaps.database.impl.daos.OfflineEventDao
import app.aaps.database.impl.daos.PreferenceChangeDao
import app.aaps.database.impl.daos.ProfileSwitchDao
import app.aaps.database.impl.daos.TemporaryBasalDao
import app.aaps.database.impl.daos.TemporaryTargetDao
import app.aaps.database.impl.daos.TherapyEventDao
import app.aaps.database.impl.daos.TotalDailyDoseDao
import app.aaps.database.impl.daos.UserEntryDao
import app.aaps.database.impl.daos.VersionChangeDao
import java.io.Closeable
const val DATABASE_VERSION = 24

6
database/impl/src/main/java/info/nightscout/database/impl/AppRepository.kt → database/impl/src/main/java/app/aaps/database/impl/AppRepository.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.database.impl
package app.aaps.database.impl
import app.aaps.database.ValueWrapper
import app.aaps.database.annotations.DbOpenForTesting
import app.aaps.database.entities.Bolus
import app.aaps.database.entities.BolusCalculatorResult
import app.aaps.database.entities.Carbs
@ -20,8 +21,7 @@ import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.data.NewEntries
import app.aaps.database.entities.embedments.InterfaceIDs
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.annotations.DbOpenForTesting
import info.nightscout.database.impl.transactions.Transaction
import app.aaps.database.impl.transactions.Transaction
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Observable

6
database/impl/src/main/java/info/nightscout/database/impl/Converters.kt → database/impl/src/main/java/app/aaps/database/impl/Converters.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl
package app.aaps.database.impl
import androidx.room.TypeConverter
import app.aaps.database.entities.APSResult
@ -16,8 +16,8 @@ import app.aaps.database.entities.ValueWithUnit
import app.aaps.database.entities.data.Block
import app.aaps.database.entities.data.TargetBlock
import app.aaps.database.entities.embedments.InterfaceIDs
import info.nightscout.database.impl.serialisation.SealedClassHelper
import info.nightscout.database.impl.serialisation.fromJson
import app.aaps.database.impl.serialisation.SealedClassHelper
import app.aaps.database.impl.serialisation.fromJson
import org.json.JSONArray
import org.json.JSONObject

2
database/impl/src/main/java/info/nightscout/database/impl/DatabaseModule.kt → database/impl/src/main/java/app/aaps/database/impl/DatabaseModule.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl
package app.aaps.database.impl
import android.content.Context
import androidx.annotation.VisibleForTesting

71
database/impl/src/main/java/app/aaps/database/impl/DelegatedAppDatabase.kt Normal file
View file

@ -0,0 +1,71 @@
package app.aaps.database.impl
import app.aaps.database.entities.interfaces.DBEntry
import app.aaps.database.impl.daos.APSResultDao
import app.aaps.database.impl.daos.APSResultLinkDao
import app.aaps.database.impl.daos.BolusCalculatorResultDao
import app.aaps.database.impl.daos.BolusDao
import app.aaps.database.impl.daos.CarbsDao
import app.aaps.database.impl.daos.DeviceStatusDao
import app.aaps.database.impl.daos.EffectiveProfileSwitchDao
import app.aaps.database.impl.daos.ExtendedBolusDao
import app.aaps.database.impl.daos.FoodDao
import app.aaps.database.impl.daos.GlucoseValueDao
import app.aaps.database.impl.daos.HeartRateDao
import app.aaps.database.impl.daos.MultiwaveBolusLinkDao
import app.aaps.database.impl.daos.OfflineEventDao
import app.aaps.database.impl.daos.PreferenceChangeDao
import app.aaps.database.impl.daos.ProfileSwitchDao
import app.aaps.database.impl.daos.TemporaryBasalDao
import app.aaps.database.impl.daos.TemporaryTargetDao
import app.aaps.database.impl.daos.TherapyEventDao
import app.aaps.database.impl.daos.TotalDailyDoseDao
import app.aaps.database.impl.daos.UserEntryDao
import app.aaps.database.impl.daos.VersionChangeDao
import app.aaps.database.impl.daos.delegated.DelegatedAPSResultDao
import app.aaps.database.impl.daos.delegated.DelegatedAPSResultLinkDao
import app.aaps.database.impl.daos.delegated.DelegatedBolusCalculatorResultDao
import app.aaps.database.impl.daos.delegated.DelegatedBolusDao
import app.aaps.database.impl.daos.delegated.DelegatedCarbsDao
import app.aaps.database.impl.daos.delegated.DelegatedDeviceStatusDao
import app.aaps.database.impl.daos.delegated.DelegatedEffectiveProfileSwitchDao
import app.aaps.database.impl.daos.delegated.DelegatedExtendedBolusDao
import app.aaps.database.impl.daos.delegated.DelegatedFoodDao
import app.aaps.database.impl.daos.delegated.DelegatedGlucoseValueDao
import app.aaps.database.impl.daos.delegated.DelegatedHeartRateDao
import app.aaps.database.impl.daos.delegated.DelegatedMultiwaveBolusLinkDao
import app.aaps.database.impl.daos.delegated.DelegatedOfflineEventDao
import app.aaps.database.impl.daos.delegated.DelegatedPreferenceChangeDao
import app.aaps.database.impl.daos.delegated.DelegatedProfileSwitchDao
import app.aaps.database.impl.daos.delegated.DelegatedTemporaryBasalDao
import app.aaps.database.impl.daos.delegated.DelegatedTemporaryTargetDao
import app.aaps.database.impl.daos.delegated.DelegatedTherapyEventDao
import app.aaps.database.impl.daos.delegated.DelegatedTotalDailyDoseDao
import app.aaps.database.impl.daos.delegated.DelegatedUserEntryDao
import app.aaps.database.impl.daos.delegated.DelegatedVersionChangeDao
internal class DelegatedAppDatabase(val changes: MutableList<DBEntry>, val database: AppDatabase) {
val glucoseValueDao: GlucoseValueDao = DelegatedGlucoseValueDao(changes, database.glucoseValueDao)
val therapyEventDao: TherapyEventDao = DelegatedTherapyEventDao(changes, database.therapyEventDao)
val temporaryBasalDao: TemporaryBasalDao = DelegatedTemporaryBasalDao(changes, database.temporaryBasalDao)
val bolusDao: BolusDao = DelegatedBolusDao(changes, database.bolusDao)
val extendedBolusDao: ExtendedBolusDao = DelegatedExtendedBolusDao(changes, database.extendedBolusDao)
val multiwaveBolusLinkDao: MultiwaveBolusLinkDao = DelegatedMultiwaveBolusLinkDao(changes, database.multiwaveBolusLinkDao)
val totalDailyDoseDao: TotalDailyDoseDao = DelegatedTotalDailyDoseDao(changes, database.totalDailyDoseDao)
val carbsDao: CarbsDao = DelegatedCarbsDao(changes, database.carbsDao)
val temporaryTargetDao: TemporaryTargetDao = DelegatedTemporaryTargetDao(changes, database.temporaryTargetDao)
val apsResultLinkDao: APSResultLinkDao = DelegatedAPSResultLinkDao(changes, database.apsResultLinkDao)
val bolusCalculatorResultDao: BolusCalculatorResultDao = DelegatedBolusCalculatorResultDao(changes, database.bolusCalculatorResultDao)
val effectiveProfileSwitchDao: EffectiveProfileSwitchDao = DelegatedEffectiveProfileSwitchDao(changes, database.effectiveProfileSwitchDao)
val profileSwitchDao: ProfileSwitchDao = DelegatedProfileSwitchDao(changes, database.profileSwitchDao)
val apsResultDao: APSResultDao = DelegatedAPSResultDao(changes, database.apsResultDao)
val versionChangeDao: VersionChangeDao = DelegatedVersionChangeDao(changes, database.versionChangeDao)
val userEntryDao: UserEntryDao = DelegatedUserEntryDao(changes, database.userEntryDao)
val preferenceChangeDao: PreferenceChangeDao = DelegatedPreferenceChangeDao(changes, database.preferenceChangeDao)
val foodDao: FoodDao = DelegatedFoodDao(changes, database.foodDao)
val deviceStatusDao: DeviceStatusDao = DelegatedDeviceStatusDao(changes, database.deviceStatusDao)
val offlineEventDao: OfflineEventDao = DelegatedOfflineEventDao(changes, database.offlineEventDao)
val heartRateDao: HeartRateDao = DelegatedHeartRateDao(changes, database.heartRateDao)
fun clearAllTables() = database.clearAllTables()
}

2
database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/APSResultDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/APSResultLinkDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/APSResultLinkDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/BolusCalculatorResultDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/BolusCalculatorResultDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/BolusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/BolusDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/CarbsDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/CarbsDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/DeviceStatusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/DeviceStatusDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Insert

2
database/impl/src/main/java/info/nightscout/database/impl/daos/EffectiveProfileSwitchDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/EffectiveProfileSwitchDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/ExtendedBolusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/ExtendedBolusDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/FoodDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/FoodDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/GlucoseValueDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/GlucoseValueDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/HeartRateDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/HeartRateDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/MultiwaveBolusLinkDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/MultiwaveBolusLinkDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/OfflineEventDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/OfflineEventDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/PreferenceChangeDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/PreferenceChangeDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Insert

5
database/impl/src/main/java/info/nightscout/database/impl/daos/ProfileSwitchDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/ProfileSwitchDao.kt
View file

@ -1,15 +1,16 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query
import app.aaps.database.entities.ProfileSwitch
import app.aaps.database.entities.TABLE_PROFILE_SWITCHES
import app.aaps.database.entities.data.checkSanity
import app.aaps.database.impl.daos.workaround.ProfileSwitchDaoWorkaround
import io.reactivex.rxjava3.core.Maybe
import io.reactivex.rxjava3.core.Single
@Dao
internal interface ProfileSwitchDao : info.nightscout.database.impl.daos.workaround.ProfileSwitchDaoWorkaround {
internal interface ProfileSwitchDao : ProfileSwitchDaoWorkaround {
@Query("SELECT * FROM $TABLE_PROFILE_SWITCHES WHERE id = :id")
override fun findById(id: Long): ProfileSwitch?

2
database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryBasalDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/TemporaryBasalDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/TemporaryTargetDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/TemporaryTargetDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/TherapyEventDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/TherapyEventDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

2
database/impl/src/main/java/info/nightscout/database/impl/daos/TotalDailyDoseDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/TotalDailyDoseDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Query

4
database/impl/src/main/java/info/nightscout/database/impl/daos/TraceableDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/TraceableDao.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Insert
import androidx.room.Update
import app.aaps.database.entities.interfaces.TraceableDBEntry
import info.nightscout.database.impl.daos.workaround.TraceableDaoWorkaround
import app.aaps.database.impl.daos.workaround.TraceableDaoWorkaround
internal interface TraceableDao<T : TraceableDBEntry> : TraceableDaoWorkaround<T> {

2
database/impl/src/main/java/info/nightscout/database/impl/daos/UserEntryDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/UserEntryDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Insert

2
database/impl/src/main/java/info/nightscout/database/impl/daos/VersionChangeDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/VersionChangeDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos
package app.aaps.database.impl.daos
import androidx.room.Dao
import androidx.room.Insert

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedAPSResultDao.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.APSResultDao
import app.aaps.database.impl.daos.APSResultDao
internal class DelegatedAPSResultDao(changes: MutableList<DBEntry>, private val dao: APSResultDao) : DelegatedDao(changes), APSResultDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedAPSResultLinkDao.kt
View file

@ -1,7 +1,7 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.APSResultLinkDao
import app.aaps.database.impl.daos.APSResultLinkDao
internal class DelegatedAPSResultLinkDao(changes: MutableList<DBEntry>, private val dao: APSResultLinkDao) : DelegatedDao(changes), APSResultLinkDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedBolusCalculatorResultDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedBolusCalculatorResultDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.BolusCalculatorResult
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.BolusCalculatorResultDao
import app.aaps.database.impl.daos.BolusCalculatorResultDao
internal class DelegatedBolusCalculatorResultDao(changes: MutableList<DBEntry>, private val dao: BolusCalculatorResultDao) : DelegatedDao(changes), BolusCalculatorResultDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedBolusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedBolusDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.Bolus
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.BolusDao
import app.aaps.database.impl.daos.BolusDao
internal class DelegatedBolusDao(changes: MutableList<DBEntry>, private val dao: BolusDao) : DelegatedDao(changes), BolusDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedCarbsDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedCarbsDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.Carbs
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.CarbsDao
import app.aaps.database.impl.daos.CarbsDao
internal class DelegatedCarbsDao(changes: MutableList<DBEntry>, private val dao: CarbsDao) : DelegatedDao(changes), CarbsDao by dao {

2
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedDao.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.interfaces.DBEntry

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedDeviceStatusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedDeviceStatusDao.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.DeviceStatusDao
import app.aaps.database.impl.daos.DeviceStatusDao
internal class DelegatedDeviceStatusDao(changes: MutableList<DBEntry>, private val dao: DeviceStatusDao) : DelegatedDao(changes), DeviceStatusDao by dao

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedEffectiveProfileSwitchDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedEffectiveProfileSwitchDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.EffectiveProfileSwitch
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.EffectiveProfileSwitchDao
import app.aaps.database.impl.daos.EffectiveProfileSwitchDao
internal class DelegatedEffectiveProfileSwitchDao(changes: MutableList<DBEntry>, private val dao: EffectiveProfileSwitchDao) : DelegatedDao(changes), EffectiveProfileSwitchDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedExtendedBolusDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.ExtendedBolus
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.ExtendedBolusDao
import app.aaps.database.impl.daos.ExtendedBolusDao
internal class DelegatedExtendedBolusDao(changes: MutableList<DBEntry>, private val dao: ExtendedBolusDao) : DelegatedDao(changes), ExtendedBolusDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedFoodDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedFoodDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.Food
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.FoodDao
import app.aaps.database.impl.daos.FoodDao
internal class DelegatedFoodDao(changes: MutableList<DBEntry>, private val dao: FoodDao) : DelegatedDao(changes), FoodDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedGlucoseValueDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedGlucoseValueDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.GlucoseValueDao
import app.aaps.database.impl.daos.GlucoseValueDao
internal class DelegatedGlucoseValueDao(changes: MutableList<DBEntry>, private val dao: GlucoseValueDao) : DelegatedDao(changes), GlucoseValueDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedHeartRateDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedHeartRateDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.HeartRate
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.HeartRateDao
import app.aaps.database.impl.daos.HeartRateDao
internal class DelegatedHeartRateDao(
changes: MutableList<DBEntry>,

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedMultiwaveBolusLinkDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedMultiwaveBolusLinkDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.MultiwaveBolusLink
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.MultiwaveBolusLinkDao
import app.aaps.database.impl.daos.MultiwaveBolusLinkDao
internal class DelegatedMultiwaveBolusLinkDao(changes: MutableList<DBEntry>, private val dao: MultiwaveBolusLinkDao) : DelegatedDao(changes), MultiwaveBolusLinkDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedOfflineEventDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedOfflineEventDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.OfflineEvent
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.OfflineEventDao
import app.aaps.database.impl.daos.OfflineEventDao
internal class DelegatedOfflineEventDao(changes: MutableList<DBEntry>, private val dao: OfflineEventDao) : DelegatedDao(changes), OfflineEventDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedPreferenceChangeDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedPreferenceChangeDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.PreferenceChange
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.PreferenceChangeDao
import app.aaps.database.impl.daos.PreferenceChangeDao
internal class DelegatedPreferenceChangeDao(changes: MutableList<DBEntry>, private val dao: PreferenceChangeDao) : DelegatedDao(changes), PreferenceChangeDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedProfileSwitchDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedProfileSwitchDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.ProfileSwitch
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.ProfileSwitchDao
import app.aaps.database.impl.daos.ProfileSwitchDao
internal class DelegatedProfileSwitchDao(changes: MutableList<DBEntry>, private val dao: ProfileSwitchDao) : DelegatedDao(changes), ProfileSwitchDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedTemporaryBasalDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedTemporaryBasalDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.TemporaryBasal
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.TemporaryBasalDao
import app.aaps.database.impl.daos.TemporaryBasalDao
internal class DelegatedTemporaryBasalDao(changes: MutableList<DBEntry>, private val dao: TemporaryBasalDao) : DelegatedDao(changes), TemporaryBasalDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedTemporaryTargetDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedTemporaryTargetDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.TemporaryTarget
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.TemporaryTargetDao
import app.aaps.database.impl.daos.TemporaryTargetDao
internal class DelegatedTemporaryTargetDao(changes: MutableList<DBEntry>, private val dao: TemporaryTargetDao) : DelegatedDao(changes), TemporaryTargetDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedTherapyEventDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedTherapyEventDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.TherapyEventDao
import app.aaps.database.impl.daos.TherapyEventDao
internal class DelegatedTherapyEventDao(changes: MutableList<DBEntry>, private val dao: TherapyEventDao) : DelegatedDao(changes), TherapyEventDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedTotalDailyDoseDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedTotalDailyDoseDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.TotalDailyDose
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.TotalDailyDoseDao
import app.aaps.database.impl.daos.TotalDailyDoseDao
internal class DelegatedTotalDailyDoseDao(changes: MutableList<DBEntry>, private val dao: TotalDailyDoseDao) : DelegatedDao(changes), TotalDailyDoseDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedUserEntryDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedUserEntryDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.UserEntryDao
import app.aaps.database.impl.daos.UserEntryDao
internal class DelegatedUserEntryDao(changes: MutableList<DBEntry>, private val dao: UserEntryDao) : DelegatedDao(changes), UserEntryDao by dao {

4
database/impl/src/main/java/info/nightscout/database/impl/daos/delegated/DelegatedVersionChangeDao.kt → database/impl/src/main/java/app/aaps/database/impl/daos/delegated/DelegatedVersionChangeDao.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.database.impl.daos.delegated
package app.aaps.database.impl.daos.delegated
import app.aaps.database.entities.VersionChange
import app.aaps.database.entities.interfaces.DBEntry
import info.nightscout.database.impl.daos.VersionChangeDao
import app.aaps.database.impl.daos.VersionChangeDao
internal class DelegatedVersionChangeDao(changes: MutableList<DBEntry>, private val dao: VersionChangeDao) : DelegatedDao(changes), VersionChangeDao by dao {

8
database/impl/src/main/java/info/nightscout/database/impl/daos/workaround/ProfileSwitchDaoWorkaround.java → database/impl/src/main/java/app/aaps/database/impl/daos/workaround/ProfileSwitchDaoWorkaround.java
View file

@ -1,11 +1,11 @@
package info.nightscout.database.impl.daos.workaround;
package app.aaps.database.impl.daos.workaround;
import androidx.room.Transaction;
import app.aaps.database.entities.ProfileSwitch;
import info.nightscout.database.impl.daos.ProfileSwitchDao;
import info.nightscout.database.impl.daos.ProfileSwitchDaoKt;
import info.nightscout.database.impl.daos.TraceableDao;
import app.aaps.database.impl.daos.ProfileSwitchDao;
import app.aaps.database.impl.daos.ProfileSwitchDaoKt;
import app.aaps.database.impl.daos.TraceableDao;
public interface ProfileSwitchDaoWorkaround extends TraceableDao<ProfileSwitch> {

6
database/impl/src/main/java/info/nightscout/database/impl/daos/workaround/TraceableDaoWorkaround.java → database/impl/src/main/java/app/aaps/database/impl/daos/workaround/TraceableDaoWorkaround.java
View file

@ -1,10 +1,10 @@
package info.nightscout.database.impl.daos.workaround;
package app.aaps.database.impl.daos.workaround;
import androidx.room.Transaction;
import app.aaps.database.entities.interfaces.TraceableDBEntry;
import info.nightscout.database.impl.daos.TraceableDao;
import info.nightscout.database.impl.daos.TraceableDaoKt;
import app.aaps.database.impl.daos.TraceableDao;
import app.aaps.database.impl.daos.TraceableDaoKt;
// keep in java, it's easier
public interface TraceableDaoWorkaround<T extends TraceableDBEntry> {

2
database/impl/src/main/java/info/nightscout/database/impl/daos/workaround/package-info.java → database/impl/src/main/java/app/aaps/database/impl/daos/workaround/package-info.java
View file

@ -2,4 +2,4 @@
* Workarounds until Kotlin is able to properly translate interface default methods while annotation processing.
* See https://youtrack.jetbrains.com/issue/KT-25960
*/
package info.nightscout.database.impl.daos.workaround;
package app.aaps.database.impl.daos.workaround;

2
database/impl/src/main/java/info/nightscout/database/impl/serialisation/SealedClassHelper.kt → database/impl/src/main/java/app/aaps/database/impl/serialisation/SealedClassHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.serialisation
package app.aaps.database.impl.serialisation
import com.google.gson.Gson
import com.google.gson.GsonBuilder

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/CancelCurrentOfflineEventIfAnyTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/CancelCurrentOfflineEventIfAnyTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.OfflineEvent
import app.aaps.database.entities.interfaces.end

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/CancelCurrentTemporaryTargetIfAnyTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/CancelCurrentTemporaryTargetIfAnyTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.TemporaryTarget
import app.aaps.database.entities.interfaces.end

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/CgmSourceTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/CgmSourceTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.TherapyEvent

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/CutCarbsTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/CutCarbsTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Carbs
import app.aaps.database.entities.interfaces.end

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertAndCancelCurrentOfflineEventTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertAndCancelCurrentOfflineEventTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.OfflineEvent
import app.aaps.database.entities.interfaces.end

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertAndCancelCurrentTemporaryTargetTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertAndCancelCurrentTemporaryTargetTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.TemporaryTarget
import app.aaps.database.entities.interfaces.end

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertBolusWithTempIdTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertBolusWithTempIdTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Bolus

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertIfNewByTimestampCarbsTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertIfNewByTimestampCarbsTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Carbs
import app.aaps.database.entities.embedments.InterfaceIDs

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertIfNewByTimestampTherapyEventTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertIfNewByTimestampTherapyEventTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.TherapyEvent

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateBolusCalculatorResultTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateBolusCalculatorResultTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.BolusCalculatorResult

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateBolusTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateBolusTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Bolus
import app.aaps.database.entities.embedments.InsulinConfiguration

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateCarbsTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateCarbsTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Carbs
import app.aaps.database.entities.embedments.InterfaceIDs

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateFoodTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateFoodTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.Food

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateHeartRateTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateHeartRateTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.HeartRate

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertOrUpdateProfileSwitch.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertOrUpdateProfileSwitch.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.ProfileSwitch

2
database/impl/src/main/java/info/nightscout/database/impl/transactions/InsertTemporaryBasalWithTempIdTransaction.kt → database/impl/src/main/java/app/aaps/database/impl/transactions/InsertTemporaryBasalWithTempIdTransaction.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.database.impl.transactions
package app.aaps.database.impl.transactions
import app.aaps.database.entities.TemporaryBasal

Some files were not shown because too many files have changed in this diff Show more