From 7e42d9da5be1d45c8a4ed5fc9e178edf403a2c41 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 18 Apr 2020 23:49:46 +0200 Subject: [PATCH] =?utf8?q?=F0=9F=9A=A7=20Add=20strict=20filtering=20to=20p?= =?utf8?q?references=20loader?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/net/pterodactylus/sone/core/PreferencesLoader.kt | 5 +++++ src/test/kotlin/net/pterodactylus/sone/core/PreferencesLoaderTest.kt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/main/kotlin/net/pterodactylus/sone/core/PreferencesLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/PreferencesLoader.kt index 32c35cb..62b60ae 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/PreferencesLoader.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/PreferencesLoader.kt @@ -17,6 +17,7 @@ class PreferencesLoader(private val preferences: Preferences) { loadRequireFullAccess(configuration) loadFcpInterfaceActive(configuration) loadFcpFullAccessRequired(configuration) + loadStrictFiltering(configuration) } private fun loadInsertionDelay(configuration: Configuration) { @@ -55,4 +56,8 @@ class PreferencesLoader(private val preferences: Preferences) { preferences.newFcpFullAccessRequired = fullAccessRequiredInteger?.let { FullAccessRequired.values()[it] } } + private fun loadStrictFiltering(configuration: Configuration) { + preferences.newStrictFiltering = configuration.getBooleanValue("Option/StrictFiltering").getValue(null) + } + } diff --git a/src/test/kotlin/net/pterodactylus/sone/core/PreferencesLoaderTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/PreferencesLoaderTest.kt index 0cd7e6d..cb8df38 100644 --- a/src/test/kotlin/net/pterodactylus/sone/core/PreferencesLoaderTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/core/PreferencesLoaderTest.kt @@ -28,6 +28,7 @@ class PreferencesLoaderTest { setupBooleanValue("RequireFullAccess", true) setupBooleanValue("ActivateFcpInterface", true) setupIntValue("FcpFullAccessRequired", 1) + setupBooleanValue("StrictFiltering", true) } private fun setupIntValue(optionName: String, value: Int) { @@ -49,6 +50,7 @@ class PreferencesLoaderTest { assertThat(preferences.requireFullAccess, equalTo(true)) assertThat(preferences.fcpInterfaceActive, equalTo(true)) assertThat(preferences.fcpFullAccessRequired, equalTo(FullAccessRequired.WRITING)) + assertThat(preferences.strictFiltering, equalTo(true)) } @Test -- 2.7.4