From 0f3fc687279360f369f19f72e5be0a5365336173 Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Fri, 22 Jan 2021 11:03:46 +0100 Subject: [PATCH] Increase target SDK to 30 --- uhabits-android/build.gradle.kts | 4 ++-- .../org/isoron/uhabits/activities/common/views/ScoreChart.kt | 2 +- .../isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt | 3 ++- .../java/org/isoron/uhabits/receivers/ReminderReceiver.kt | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 960590f66..4cc8429fe 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -27,13 +27,13 @@ plugins { } android { - compileSdkVersion(29) + compileSdkVersion(30) defaultConfig { versionCode(20001) versionName("2.0.1-alpha") minSdkVersion(23) - targetSdkVersion(29) + targetSdkVersion(30) applicationId("org.isoron.uhabits") testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner") } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.kt index 3a53f0f8a..f26e5374f 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.kt @@ -156,7 +156,7 @@ class ScoreChart : ScrollableChart { drawMarker(activeCanvas, prevRect) } if (k == nColumns - 1) drawMarker(activeCanvas, rect) - prevRect!!.set(rect) + prevRect!!.set(rect!!) rect!![0f, 0f, columnWidth] = columnHeight.toFloat() rect!!.offset(k * columnWidth, internalPaddingTop.toFloat()) drawFooter(activeCanvas, rect, timestamp) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt index ace88e61d..06b773a81 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt @@ -49,7 +49,8 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener { val app = applicationContext as HabitsApplication val appComponent = app.component reminderController = appComponent.reminderController - habit = appComponent.habitList.getById(ContentUris.parseId(intent.data)) + val data = intent.data + if (data != null) habit = appComponent.habitList.getById(ContentUris.parseId(data)) if (habit == null) finish() val theme = R.style.Theme_AppCompat_Light_Dialog_Alert dialog = AlertDialog.Builder(ContextThemeWrapper(this, theme)) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt index 026f99bec..951b46ae8 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt @@ -46,7 +46,8 @@ class ReminderReceiver : BroadcastReceiver() { Log.i(TAG, String.format("Received intent: %s", intent.toString())) var habit: Habit? = null val today: Long = getStartOfTodayWithOffset() - if (intent.data != null) habit = habits.getById(ContentUris.parseId(intent.data)) + val data = intent.data + if (data != null) habit = habits.getById(ContentUris.parseId(data)) val timestamp = intent.getLongExtra("timestamp", today) val reminderTime = intent.getLongExtra("reminderTime", today) try {