improved flags integration

wuan · May 5, 2016 · 18fef5b · 18fef5b
1 parent 409392f
commit 18fef5b
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/app/src/main/java/org/blitzortung/android/data/DataHandler.kt b/app/src/main/java/org/blitzortung/android/data/DataHandler.kt
@@ -51,7 +51,7 @@ class DataHandler @JvmOverloads constructor(
     var parameters = Parameters()
         private set
 
-    private var parametersController: ParametersController? = null
+    lateinit private var parametersController: ParametersController
 
     private val dataConsumerContainer = object : ConsumerContainer<DataEvent>() {
         override fun addedFirstConsumer() {
@@ -66,7 +66,7 @@ class DataHandler @JvmOverloads constructor(
     }
 
     private val internalDataConsumer: (DataEvent) -> Unit = { dataEvent ->
-        if (dataEvent is ResultEvent && dataEvent.parameters?.storeResult ?: false) {
+        if (dataEvent is ResultEvent && dataEvent.flags.storeResult) {
             dataConsumerContainer.storeAndBroadcast(dataEvent)
         } else {
             dataConsumerContainer.broadcast(dataEvent)
@@ -138,7 +138,7 @@ class DataHandler @JvmOverloads constructor(
         }
 
     private fun sendEvent(dataEvent: DataEvent) {
-        if (dataEvent is ResultEvent && dataEvent.parameters?.storeResult ?: false) {
+        if (dataEvent is ResultEvent && dataEvent.flags.storeResult) {
             internalDataConsumerContainer.storeAndBroadcast(dataEvent)
         } else {
             internalDataConsumerContainer.broadcast(dataEvent)
@@ -214,15 +214,15 @@ class DataHandler @JvmOverloads constructor(
         get() = parameters.intervalDuration
 
     fun ffwdInterval(): Boolean {
-        return updateParameters({ parametersController!!.ffwdInterval(it) })
+        return updateParameters({ parametersController.ffwdInterval(it) })
     }
 
     fun rewInterval(): Boolean {
-        return updateParameters({ parametersController!!.rewInterval(it) })
+        return updateParameters({ parametersController.rewInterval(it) })
     }
 
     fun goRealtime(): Boolean {
-        return updateParameters({ parametersController!!.goRealtime(it) })
+        return updateParameters({ parametersController.goRealtime(it) })
     }
 
     fun updateParameters(updater: (Parameters) -> Parameters): Boolean {
@@ -249,10 +249,11 @@ class DataHandler @JvmOverloads constructor(
         override fun doInBackground(vararg taskParametersArray: TaskParameters): ResultEvent? {
             val taskParameters = taskParametersArray[0]
             val parameters = taskParameters.parameters
+            val flags = taskParameters.flags
 
             if (lock.tryLock()) {
                 try {
-                    var result = ResultEvent(referenceTime = System.currentTimeMillis(), parameters = parameters)
+                    var result = ResultEvent(referenceTime = System.currentTimeMillis(), parameters = parameters, flags = flags)
 
                     dataProvider!!.retrieveData() {
                         if (parameters.isRaster()) {
@@ -273,7 +274,7 @@ class DataHandler @JvmOverloads constructor(
                     return result
                 } catch (e: RuntimeException) {
                     e.printStackTrace()
-                    return ResultEvent(failed = true)
+                    return ResultEvent(failed = true, referenceTime = System.currentTimeMillis(), parameters = parameters, flags = flags)
                 } finally {
                     lock.unlock()
                 }
@@ -304,8 +305,8 @@ class DataHandler @JvmOverloads constructor(
             Log.v(Main.LOG_TAG, "FetchBackgroundDataTask aquire wakelock " + wakeLock)
 
             val taskParameters = taskParametersArray[0]
-            val updatedParameters = taskParameters.parameters.copy(intervalDuration = 10, storeResult = false)
-            val updatedParams = arrayOf(taskParameters.copy(parameters = updatedParameters))
+            val updatedParameters = taskParameters.parameters.copy(intervalDuration = 10)
+            val updatedParams = arrayOf(taskParameters.copy(parameters = updatedParameters, flags = Flags(storeResult = false)))
 
             return super.doInBackground(*updatedParams)
         }

diff --git a/app/src/main/java/org/blitzortung/android/data/Flags.kt b/app/src/main/java/org/blitzortung/android/data/Flags.kt
@@ -0,0 +1,23 @@
+/*
+
+   Copyright 2016 Andreas Würl
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+package org.blitzortung.android.data
+
+data class Flags(
+        val storeResult: Boolean = true
+) {}
diff --git a/app/src/main/java/org/blitzortung/android/data/Parameters.kt b/app/src/main/java/org/blitzortung/android/data/Parameters.kt
@@ -23,8 +23,7 @@ data class Parameters(
         val rasterBaselength: Int = 0,
         override val intervalDuration: Int = 0,
         override val intervalOffset: Int = 0,
-        val countThreshold: Int = 0,
-        val storeResult: Boolean = true
+        val countThreshold: Int = 0
 ) : TimeIntervalWithOffset {
 
     fun isRealtime(): Boolean = intervalOffset == 0

diff --git a/app/src/main/java/org/blitzortung/android/data/TaskParameters.kt b/app/src/main/java/org/blitzortung/android/data/TaskParameters.kt
@@ -21,6 +21,10 @@ package org.blitzortung.android.data
 
 data class TaskParameters(
         val parameters: Parameters,
+        val flags: Flags = DEFAULT_FLAGS,
         val updateParticipants: Boolean = false
 ) {
+    companion object {
+        private val DEFAULT_FLAGS = Flags()
+    }
 }
diff --git a/app/src/main/java/org/blitzortung/android/data/provider/result/ResultEvent.kt b/app/src/main/java/org/blitzortung/android/data/provider/result/ResultEvent.kt
@@ -18,6 +18,7 @@
 
 package org.blitzortung.android.data.provider.result
 
+import org.blitzortung.android.data.Flags
 import org.blitzortung.android.data.Parameters
 import org.blitzortung.android.data.beans.RasterParameters
 import org.blitzortung.android.data.beans.Station
@@ -32,11 +33,12 @@ data class ResultEvent(
         val failed: Boolean = false,
         val incrementalData: Boolean = false,
         val referenceTime: Long = 0,
-        val parameters: Parameters? = null
+        val parameters: Parameters,
+        val flags: Flags
 ) : DataEvent {
 
     fun containsRealtimeData(): Boolean {
-        return parameters != null && parameters.intervalOffset == 0
+        return parameters.intervalOffset == 0
     }
 
     override fun toString(): String {