Skip to content

Feature/david/journal mode #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 2, 2021
Merged

Feature/david/journal mode #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1543cb
changed journal mode when creating db
malmstein Mar 30, 2021
5d6a2c9
updated version for internal release
malmstein Apr 1, 2021
eee2732
rollback version update
malmstein Apr 1, 2021
0f81375
made app debuggable for testing
malmstein Apr 1, 2021
285afe7
spotless check
malmstein Apr 1, 2021
b89e157
rollback unnecessary changes
malmstein Apr 2, 2021
100156e
Merge branch 'develop' into feature/david/journal_mode
malmstein Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/com/duckduckgo/app/di/DatabaseModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package com.duckduckgo.app.di
import android.content.Context
import android.webkit.WebViewDatabase
import androidx.room.Room
import androidx.room.RoomDatabase
import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
import com.duckduckgo.app.browser.httpauth.RealWebViewHttpAuthStore
import com.duckduckgo.app.browser.httpauth.WebViewHttpAuthStore
Expand Down Expand Up @@ -53,6 +54,8 @@ class DatabaseModule {
return Room.databaseBuilder(context, AppDatabase::class.java, "app.db")
.addMigrations(*migrationsProvider.ALL_MIGRATIONS.toTypedArray())
.addCallback(migrationsProvider.BOOKMARKS_DB_ON_CREATE)
.addCallback(migrationsProvider.CHANGE_JOURNAL_ON_OPEN)
.setJournalMode(RoomDatabase.JournalMode.TRUNCATE)
.build()
}

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,12 @@ class MigrationsProvider(
}
}

val CHANGE_JOURNAL_ON_OPEN = object : RoomDatabase.Callback() {
override fun onOpen(db: SupportSQLiteDatabase) {
db.query("PRAGMA journal_mode=DELETE;").use { cursor -> cursor.moveToFirst() }
Copy link
Collaborator

@aitorvs aitorvs Apr 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pragma for the win

}
}

val ALL_MIGRATIONS: List<Migration>
get() = listOf(
MIGRATION_1_TO_2,
Expand Down