Skip to content

Fix crash in FrequencyChart when scrolling before 1970 #2235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix crash in FrequencyChart when scrolling before 1970 #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ...oid/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
*/
package org.isoron.uhabits.activities.common.views

import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.RectF
import android.view.MotionEvent
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.MediumTest
Expand All @@ -26,6 +29,8 @@ import org.isoron.uhabits.utils.toFixedAndroidColor
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.util.Calendar
import java.util.GregorianCalendar

@RunWith(AndroidJUnit4::class)
@MediumTest
Expand Down Expand Up @@ -73,6 +78,21 @@ class FrequencyChartTest : BaseViewTest() {
assertRenders(view, BASE_PATH + "renderTransparent.png")
}

@Test
fun testDrawBefore1970_doesNotCrash() {
val chart = FrequencyChart(targetContext)
val rect = RectF(0f, 0f, 300f, 100f)
val canvas = Canvas(Bitmap.createBitmap(300, 100, Bitmap.Config.ARGB_8888))
val oldDate = GregorianCalendar(1969, Calendar.DECEMBER, 15)

try {
chart.javaClass.getDeclaredMethod("drawColumn", Canvas::class.java, RectF::class.java, GregorianCalendar::class.java)
.apply { isAccessible = true }
.invoke(chart, canvas, rect, oldDate)
} catch (e: Exception) {
fail("Drawing before 1970 should not throw, but got: ${e.cause?.message ?: e.message}")
}
}
companion object {
const val BASE_PATH = "common/FrequencyChart/"
}
Expand Down
2 changes: 2 additions & 0 deletions uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ class FrequencyChart : ScrollableChart {
}

private fun drawColumn(canvas: Canvas, rect: RectF?, date: GregorianCalendar) {
// Guard: prevent crash when rendering before Unix epoch (negative timestamps)
if (date.timeInMillis < 0) return
val values = frequency[Timestamp(date)]
val weekDaysInMonth = getWeekdaysInMonth(Timestamp(date))
val rowHeight = rect!!.height() / 8.0f
Expand Down