fix compile error for google build

blokadaorg · Jan 20, 2020 · f721e60 · f721e60
1 parent b67f4ff
commit f721e60
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 30 deletions.
diff --git a/app/src/full/kotlin/core/bits/menu/advanced/MenuAdvanced.kt b/app/src/full/kotlin/core/bits/menu/advanced/MenuAdvanced.kt
@@ -35,10 +35,3 @@ fun createMenuAdvanced(ktx: AndroidKontext): NamedViewBinder {
             name = R.string.panel_section_app_settings.res()
     )
 }
-
-data class AdvancedSettings(val enabled: Boolean = false)
-
-fun registerPersistenceForAdvancedSettings() {
-    Register.sourceFor(AdvancedSettings::class.java, PaperSource("advanced-settings"),
-            default = AdvancedSettings(false))
-}
diff --git a/app/src/full/kotlin/tunnel/DnsAnswer.kt → app/src/tun-local/kotlin/tunnel/DnsAnswer.kt b/app/src/full/kotlin/tunnel/DnsAnswer.kt → app/src/tun-local/kotlin/tunnel/DnsAnswer.kt
@@ -1,6 +1,9 @@
 package tunnel
 
-import core.get
+import com.github.salomonbrys.kodein.instance
+import core.*
+import gs.property.I18n
+import org.blokada.R
 import org.xbill.DNS.*
 import java.net.InetAddress
 
@@ -25,4 +28,25 @@ fun generateDnsAnswer(dnsMessage: Message, denyResponse: SOARecord){
                 Section.ANSWER
         )
     }
-}
+}
+
+class DnsAnswerTypeVB(
+        private val ktx: AndroidKontext,
+        private val i18n: I18n = ktx.di().instance(),
+        onTap: (SlotView) -> Unit
+) : SlotVB(onTap) {
+
+    override fun attach(view: SlotView) {
+        view.enableAlternativeBackground()
+        view.type = Slot.Type.INFO
+        view.content = Slot.Content(
+                icon = ktx.ctx.getDrawable(R.drawable.ic_feedback),
+                label = i18n.getString(R.string.slot_dns_answer_label),
+                description = i18n.getString(R.string.slot_dns_answer_description),
+                switched = !get(DnsAnswerState::class.java).hostNotFoundAnswer
+        )
+        view.onSwitch = { Register.set(DnsAnswerState::class.java, DnsAnswerState(!it)) }
+    }
+
+}
+
diff --git a/app/src/ui-blokada/kotlin/core/bits/Slots.kt b/app/src/ui-blokada/kotlin/core/bits/Slots.kt
@@ -12,7 +12,6 @@ import android.widget.EditText
 import blocka.blokadaUserAgent
 import com.github.salomonbrys.kodein.instance
 import core.*
-import core.Register.set
 import core.Tunnel
 import core.bits.menu.MENU_CLICK_BY_NAME_SUBMENU
 import filter.hostnameRegex
@@ -1027,26 +1026,6 @@ class ResetCounterVB(private val ktx: AndroidKontext,
 
 }
 
-class DnsAnswerTypeVB(
-        private val ktx: AndroidKontext,
-        private val i18n: I18n = ktx.di().instance(),
-        onTap: (SlotView) -> Unit
-) : SlotVB(onTap) {
-
-    override fun attach(view: SlotView) {
-        view.enableAlternativeBackground()
-        view.type = Slot.Type.INFO
-        view.content = Slot.Content(
-                icon = ktx.ctx.getDrawable(R.drawable.ic_feedback),
-                label = i18n.getString(R.string.slot_dns_answer_label),
-                description = i18n.getString(R.string.slot_dns_answer_description),
-                switched = !get(DnsAnswerState::class.java).hostNotFoundAnswer
-        )
-        view.onSwitch = { set(DnsAnswerState::class.java, DnsAnswerState(!it)) }
-    }
-
-}
-
 class DnsListControlVB(
         private val ktx: AndroidKontext,
         private val ctx: Context = ktx.ctx,

diff --git a/app/src/ui-blokada/kotlin/core/bits/menu/advanced/MenuAdvancedCommon.kt b/app/src/ui-blokada/kotlin/core/bits/menu/advanced/MenuAdvancedCommon.kt
@@ -1,6 +1,8 @@
 package core.bits.menu.advanced
 
 import core.AndroidKontext
+import core.PaperSource
+import core.Register
 import core.bits.menu.MenuItemVB
 import core.res
 import gs.presentation.NamedViewBinder
@@ -13,3 +15,10 @@ fun createAdvancedMenuItem(ktx: AndroidKontext): NamedViewBinder {
             opens = createMenuAdvanced(ktx)
     )
 }
+
+data class AdvancedSettings(val enabled: Boolean = false)
+
+fun registerPersistenceForAdvancedSettings() {
+    Register.sourceFor(AdvancedSettings::class.java, PaperSource("advanced-settings"),
+            default = AdvancedSettings(false))
+}
diff --git a/app/src/ui-blokada/kotlin/core/bits/menu/dns/DnsDashboardSection.kt b/app/src/ui-blokada/kotlin/core/bits/menu/dns/DnsDashboardSection.kt
@@ -9,6 +9,7 @@ import gs.presentation.ListViewBinder
 import gs.presentation.NamedViewBinder
 import gs.property.IWhen
 import org.blokada.R
+import tunnel.DnsAnswerTypeVB
 
 class DnsDashboardSection(
         val ctx: Context,