Skip to content

Commit 4fd6394

Browse files
committed
fix start of DataHandler when map is ready
1 parent 48c4c45 commit 4fd6394

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
applicationId "org.blitzortung.android.app"
1313
minSdkVersion 21
1414
targetSdkVersion 35
15-
versionCode 339
15+
versionCode 340
1616
versionName '2.4.0'
1717
multiDexEnabled false
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/org/blitzortung/android/alert/handler/AlertHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class AlertHandler @Inject constructor(
9595

9696
val dataEventConsumer: (Event) -> Unit = { event ->
9797
if (event is ResultEvent) {
98-
Log.v(Main.LOG_TAG, "AlertHandler.dataEventConsumer $event")
9998
if (!event.flags.ignoreForAlerting) {
99+
Log.v(Main.LOG_TAG, "AlertHandler.dataEventConsumer $event")
100100
if (!event.failed && event.containsRealtimeData() && event.strikes != null) {
101101
val strikes = Strikes(event.strikes, event.gridParameters)
102102
checkStrikes(strikes, locationHandler.location)

app/src/main/java/org/blitzortung/android/app/Main.kt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,15 +484,22 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
484484

485485
locationHandler.start()
486486

487-
mapFragment.mapView.addOnFirstLayoutListener { thisMapView, _, _, _, _ ->
488-
val ownMapView = thisMapView as OwnMapView
489-
dataHandler.updateGrid(ownMapView, dataHandler.autoGridSize)
490-
strikeListOverlay.onZoom(ZoomEvent(ownMapView, ownMapView.zoomLevelDouble))
491-
492-
dataHandler.start()
487+
if (mapFragment.mapView.isLaidOut) {
488+
startDataHandler(mapFragment.mapView)
489+
} else {
490+
mapFragment.mapView.addOnFirstLayoutListener { thisMapView, _, _, _, _ ->
491+
startDataHandler(thisMapView as OwnMapView)
492+
}
493493
}
494494
}
495495

496+
private fun startDataHandler(mapView: OwnMapView) {
497+
dataHandler.updateGrid(mapView, dataHandler.autoGridSize)
498+
strikeListOverlay.onZoom(ZoomEvent(mapView, mapView.zoomLevelDouble))
499+
500+
dataHandler.start()
501+
}
502+
496503
private fun enableDataUpdates() {
497504
with(locationHandler) {
498505
requestUpdates(ownLocationOverlay.locationEventConsumer)

app/src/main/java/org/blitzortung/android/app/view/HistogramView.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class HistogramView @JvmOverloads constructor(
116116
val xd = (width - 2 * padding) / (histogram.size - 1)
117117

118118
val y0 = height - padding
119-
Log.v(LOG_TAG, "HistogramView.onDraw() height: $height, top $topCoordinate")
120119
val yd = (height - topCoordinate - padding) / ymax
121120

122121
foregroundPaint.strokeWidth = 5f

0 commit comments

Comments
 (0)