Minor cleanup. CodeforKarlsruhe#12

silberzwiebel · Jan 12, 2018 · cd1fade · cd1fade
1 parent 9b17c1e
commit cd1fade
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 9 deletions.
diff --git a/app/src/main/java/de/codefor/karlsruhe/opensense/data/OpenSenseMapService.kt b/app/src/main/java/de/codefor/karlsruhe/opensense/data/OpenSenseMapService.kt
@@ -1,6 +1,5 @@
 package de.codefor.karlsruhe.opensense.data
 
-import android.util.Log
 import com.squareup.moshi.Moshi
 import de.codefor.karlsruhe.opensense.data.boxes.BoxesApi
 import de.codefor.karlsruhe.opensense.data.boxes.model.SenseBox
@@ -39,7 +38,6 @@ object OpenSenseMapService {
     }
 
     fun getSenseBoxAndSensorData(boxId: String, sensorId: String): Single<Pair<SenseBox, SensorData>> {
-        Log.i("OpenSenseMapService", "getSenseBoxAndSensorData() boxId: $boxId, sensorId: $sensorId")
         return boxesApi.getBox(boxId).zipWith(boxesApi.getSensorHistory(boxId, sensorId),
                 BiFunction<SenseBox, List<SensorHistory>, Pair<SenseBox, SensorData>> { senseBox, sensorHistory ->
                     val sensor = senseBox.sensors?.first { it.id == sensorId }

diff --git a/app/src/main/java/de/codefor/karlsruhe/opensense/widget/WidgetHelper.kt b/app/src/main/java/de/codefor/karlsruhe/opensense/widget/WidgetHelper.kt
@@ -4,7 +4,6 @@ import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import de.codefor.karlsruhe.opensense.data.OpenSenseMapService
 import de.codefor.karlsruhe.opensense.data.SensorData
 import de.codefor.karlsruhe.opensense.data.boxes.model.SenseBox
@@ -74,7 +73,6 @@ object WidgetHelper {
         // We keep it really simple here and just use the first selected sensor of this widget
         val sensorId = loadSensorIds(context, appWidgetId).firstOrNull() ?: return Single.error(IllegalStateException("No sensor id stored"))
 
-        Log.i("WidgetHelper", "getSenseBoxAndSensorData() boxId: $boxId, sensorId: $sensorId")
         return OpenSenseMapService.getSenseBoxAndSensorData(boxId, sensorId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

diff --git a/app/src/main/java/de/codefor/karlsruhe/opensense/widget/base/BaseWidget.kt b/app/src/main/java/de/codefor/karlsruhe/opensense/widget/base/BaseWidget.kt
@@ -10,7 +10,6 @@ import de.codefor.karlsruhe.opensense.widget.WidgetHelper
  * The configuration is implemented in [BaseWidgetConfigurationActivity] and its child classes.
  */
 abstract class BaseWidget : AppWidgetProvider() {
-
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
         for (appWidgetId in appWidgetIds) {
             onUpdateWidget(context, appWidgetId, appWidgetManager)

diff --git a/app/src/main/java/de/codefor/karlsruhe/opensense/widget/onevalue/OneValueWidget.kt b/app/src/main/java/de/codefor/karlsruhe/opensense/widget/onevalue/OneValueWidget.kt
@@ -2,7 +2,6 @@ package de.codefor.karlsruhe.opensense.widget.onevalue
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
-import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
 import de.codefor.karlsruhe.opensense.R
@@ -29,7 +28,6 @@ class OneValueWidget : BaseWidget() {
             WidgetHelper.getSenseBox(context, appWidgetId).subscribe({ senseBox ->
                 val sensorIds = WidgetHelper.loadSensorIds(context, appWidgetId)
                 val sensor = senseBox.sensors?.first { (id) -> id == sensorIds.first() }
-                Log.i("OneValueWidget", "$senseBox, ${sensor.toString()}")
                 views.apply {
                     //Show refresh button, hide progress bar
                     setViewVisibility(R.id.one_value_widget_refresh_button, View.VISIBLE)

diff --git a/app/src/main/java/de/codefor/karlsruhe/opensense/widget/plot/PlotWidget.kt b/app/src/main/java/de/codefor/karlsruhe/opensense/widget/plot/PlotWidget.kt
@@ -14,7 +14,6 @@ import com.androidplot.ui.VerticalPositioning
 import com.androidplot.util.PixelUtils
 import com.androidplot.xy.*
 import de.codefor.karlsruhe.opensense.R
-import de.codefor.karlsruhe.opensense.data.boxes.model.SenseBox
 import de.codefor.karlsruhe.opensense.data.boxes.model.Sensor
 import de.codefor.karlsruhe.opensense.data.boxes.model.SensorHistory
 import de.codefor.karlsruhe.opensense.widget.WidgetHelper
@@ -27,7 +26,6 @@ import java.text.ParsePosition
 
 
 class PlotWidget : BaseWidget() {
-
     override fun onUpdateWidget(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager) {
         update(context, appWidgetId, appWidgetManager)
     }