diff --git a/app/src/main/java/com/example/cahier/data/NoteDatabase.kt b/app/src/main/java/com/example/cahier/data/NoteDatabase.kt index 99cb16f..c4f8616 100644 --- a/app/src/main/java/com/example/cahier/data/NoteDatabase.kt +++ b/app/src/main/java/com/example/cahier/data/NoteDatabase.kt @@ -18,9 +18,7 @@ package com.example.cahier.data -import android.content.Context import androidx.room.Database -import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters import com.example.cahier.ui.Converters @@ -35,22 +33,6 @@ abstract class NoteDatabase : RoomDatabase() { abstract fun noteDao(): NoteDao companion object { - @Volatile - private var Instance: NoteDatabase? = null - - fun getDatabase(context: Context): NoteDatabase { - return Instance ?: synchronized(this) { - Instance ?: Room.databaseBuilder( - context, - NoteDatabase::class.java, - "note_database" - ) - .addMigrations(MIGRATION_7_8) - .build() - .also { - Instance = it - } - } - } + const val DATABASE_NAME = "note_database" } } diff --git a/app/src/main/java/com/example/cahier/di/AppModule.kt b/app/src/main/java/com/example/cahier/di/AppModule.kt index 8930167..82b805e 100644 --- a/app/src/main/java/com/example/cahier/di/AppModule.kt +++ b/app/src/main/java/com/example/cahier/di/AppModule.kt @@ -19,7 +19,9 @@ package com.example.cahier.di import android.content.Context +import androidx.room.Room import coil3.ImageLoader +import com.example.cahier.data.MIGRATION_7_8 import com.example.cahier.data.NoteDatabase import com.example.cahier.data.NotesRepository import com.example.cahier.data.OfflineNotesRepository @@ -38,7 +40,13 @@ object AppModule { @Provides @Singleton fun provideNoteDatabase(@ApplicationContext context: Context): NoteDatabase { - return NoteDatabase.getDatabase(context) + return Room.databaseBuilder( + context, + NoteDatabase::class.java, + NoteDatabase.DATABASE_NAME + ) + .addMigrations(MIGRATION_7_8) + .build() } @Provides