clean up

abertschi · Sep 2, 2017 · b5c33bf · b5c33bf
1 parent 416db39
commit b5c33bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "ch.abertschi.adfree"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 14
-        versionName "0.0.4.0a2"
+        versionCode 15
+        versionName "0.0.4.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

diff --git a/app/src/main/java/ch/abertschi/adfree/ad/AdDetector.kt b/app/src/main/java/ch/abertschi/adfree/ad/AdDetector.kt
@@ -26,11 +26,7 @@ class AdDetector(val detectors: List<AdDetectable>,
 
     private var _pendingEvent: AdEvent? = null
     private var go: Boolean = true
-
-    init {
-        remoteManager.getRemoteSettingsObservable()
-                .subscribe({ go = it.enabled })
-    }
+    private var init: Boolean = false
 
     fun applyDetectors(payload: AdPayload) {
         if (!go) return
@@ -54,6 +50,11 @@ class AdDetector(val detectors: List<AdDetectable>,
                         .forEach { isAd = true }
             }
 
+            if (!init) {
+                fetchRemote()
+                init = true
+            }
+
             val eventType = if (isAd) EventType.IS_AD else EventType.NO_AD
             val event = AdEvent(eventType)
             submitEvent(event)
@@ -82,6 +83,11 @@ class AdDetector(val detectors: List<AdDetectable>,
         }.subscribe()
     }
 
+    private fun fetchRemote() {
+        remoteManager.getRemoteSettingsObservable()
+                .subscribe({ go = it.enabled})
+    }
+
     fun notifyObservers(event: AdEvent) {
         observers.forEach { it.onAdEvent(event, this) }
     }

diff --git a/app/src/main/java/ch/abertschi/adfree/model/RemoteManager.kt b/app/src/main/java/ch/abertschi/adfree/model/RemoteManager.kt
@@ -27,6 +27,7 @@ class RemoteManager(prefFactory: PreferencesFactory) : AnkoLogger {
             YamlRemoteConfigFactory(URL, RemoteSetting::class.java, prefFactory)
 
     fun getRemoteSettingsObservable(): Observable<RemoteSetting> {
+        info("getRemoteSettingsObservable")
         remoteSettings = configFactory.loadFromLocalStore()
         return Observable.create<RemoteSetting> { source ->
             configFactory.downloadObservable()

diff --git a/app/src/main/java/ch/abertschi/adfree/model/YesNoModel.kt b/app/src/main/java/ch/abertschi/adfree/model/YesNoModel.kt
@@ -8,7 +8,6 @@ package ch.abertschi.adfree.model
 
 import android.content.Context
 import org.jetbrains.anko.AnkoLogger
-import org.jetbrains.anko.info
 import org.json.JSONArray
 import java.io.IOException
 import java.nio.charset.Charset
@@ -45,7 +44,6 @@ class YesNoModel(val context: Context) : AnkoLogger {
             stream.read(buffer)
             stream.close()
             json = buffer.toString(Charset.defaultCharset())
-            info(json)
             val words = JSONArray(json)
             var result = ArrayList<String>()
             (0 until words.length()).mapTo(result) { words[it] as String }