mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-11-16 14:54:57 +00:00
Code Issues Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
XiangRongLin 2020-12-19 16:54:42 +01:00
parent fcfdcd1025
commit 716d795970
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
View File

@ -19,19 +19,19 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
@Throws(Exception::class) @Throws(Exception::class)
fun exportDatabase(preferences: SharedPreferences, outputPath: String) { fun exportDatabase(preferences: SharedPreferences, outputPath: String) {
ZipOutputStream(BufferedOutputStream(FileOutputStream(outputPath))) ZipOutputStream(BufferedOutputStream(FileOutputStream(outputPath)))
.use { outZip -> .use { outZip ->
ZipHelper.addFileToZip(outZip, fileLocator.db.path, "newpipe.db") ZipHelper.addFileToZip(outZip, fileLocator.db.path, "newpipe.db")
try { try {
ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output -> ObjectOutputStream(FileOutputStream(fileLocator.settings)).use { output ->
output.writeObject(preferences.all) output.writeObject(preferences.all)
output.flush() output.flush()
}
} catch (e: IOException) {
e.printStackTrace()
} }
} catch (e: IOException) {
e.printStackTrace()
}
ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings") ZipHelper.addFileToZip(outZip, fileLocator.settings.path, "newpipe.settings")
} }
} }
@ -61,7 +61,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
fun extractSettings(filePath: String): Boolean { fun extractSettings(filePath: String): Boolean {
return ZipHelper return ZipHelper
.extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings") .extractFileFromZip(filePath, fileLocator.settings.path, "newpipe.settings")
} }
fun loadSharedPreferences(preferences: SharedPreferences) { fun loadSharedPreferences(preferences: SharedPreferences) {
@ -70,6 +70,7 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) {
ObjectInputStream(FileInputStream(fileLocator.settings)).use { input -> ObjectInputStream(FileInputStream(fileLocator.settings)).use { input ->
preferenceEditor.clear() preferenceEditor.clear()
@Suppress("UNCHECKED_CAST")
val entries = input.readObject() as Map<String, *> val entries = input.readObject() as Map<String, *>
for ((key, value) in entries) { for ((key, value) in entries) {
when (value) { when (value) {

1
app/src/main/java/org/schabi/newpipe/settings/NewPipeFileLocator.kt
View File

@ -18,5 +18,4 @@ class NewPipeFileLocator(private val homeDir: File) {
val dbWal by lazy { File(homeDir, "/databases/newpipe.db-wal") } val dbWal by lazy { File(homeDir, "/databases/newpipe.db-wal") }
val settings by lazy { File(homeDir, "/databases/newpipe.settings") } val settings by lazy { File(homeDir, "/databases/newpipe.settings") }
} }

2
app/src/test/java/org/schabi/newpipe/settings/ContentSettingsManagerTest.kt
View File

@ -10,9 +10,9 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mockito import org.mockito.Mockito
import org.mockito.Mockito.`when` import org.mockito.Mockito.`when`
import org.mockito.Mockito.anyString
import org.mockito.Mockito.anyBoolean import org.mockito.Mockito.anyBoolean
import org.mockito.Mockito.anyInt import org.mockito.Mockito.anyInt
import org.mockito.Mockito.anyString
import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.atLeastOnce
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.Mockito.withSettings import org.mockito.Mockito.withSettings