Bump org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1

Bumps org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitignore

@@ -17,3 +17,4 @@ node_modules
 *xcuserdata*
 *.sketch
 crowdin.yml
+kotlin-js-store

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     val kotlinVersion = "1.8.20"
-    id("com.android.application") version "7.4.2" apply (false)
+    id("com.android.application") version "8.1.4" apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)

gradle.properties

@@ -3,3 +3,6 @@ org.gradle.daemon=true
 org.gradle.jvmargs=-Xms2048m -Xmx2048m
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

uhabits-android/build.gradle.kts

@@ -19,7 +19,7 @@
 
 plugins {
     id("com.github.triplet.play") version "3.8.4"
-    id("com.android.application") version "7.4.2"
+    id("com.android.application") version "8.1.4"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
     id("org.jlleitschuh.gradle.ktlint")
@@ -42,13 +42,14 @@ kotlin {
 
 android {
 
-    compileSdk = 32
+    namespace = "org.isoron.uhabits"
+    compileSdk = 33
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 32
+        targetSdk = 33
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -93,7 +94,7 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.48"
+    val daggerVersion = "2.48.1"
     val kotlinVersion = "1.8.20"
     val kxCoroutinesVersion = "1.7.3"
     val ktorVersion = "1.6.8"

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -52,7 +53,8 @@ class FrequencyChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        val e = MotionEvent.obtain(0, 0, 0, 0f, 0f, 0)
+        view.onScroll(e, e, -dpToPixels(150), 0f)
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -63,7 +64,8 @@ class ScoreChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        val e = MotionEvent.obtain(0, 0, 0, 0f, 0f, 0)
+        view.onScroll(e, e, -dpToPixels(150), 0f)
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

uhabits-android/src/main/AndroidManifest.xml

@@ -16,12 +16,13 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.isoron.uhabits">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".HabitsApplication"

uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt

@@ -44,21 +44,21 @@ class AndroidDataView(
         addUpdateListener(this@AndroidDataView)
     }
 
-    override fun onTouchEvent(event: MotionEvent?) = detector.onTouchEvent(event)
-    override fun onDown(e: MotionEvent?) = true
-    override fun onShowPress(e: MotionEvent?) = Unit
+    override fun onTouchEvent(event: MotionEvent) = detector.onTouchEvent(event)
+    override fun onDown(e: MotionEvent) = true
+    override fun onShowPress(e: MotionEvent) = Unit
 
-    override fun onSingleTapUp(e: MotionEvent?): Boolean {
+    override fun onSingleTapUp(e: MotionEvent): Boolean {
         return handleClick(e, true)
     }
 
-    override fun onLongPress(e: MotionEvent?) {
+    override fun onLongPress(e: MotionEvent) {
         handleClick(e)
     }
 
     override fun onScroll(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         dx: Float,
         dy: Float
     ): Boolean {
@@ -79,8 +79,8 @@ class AndroidDataView(
     }
 
     override fun onFling(
-        e1: MotionEvent?,
-        e2: MotionEvent?,
+        e1: MotionEvent,
+        e2: MotionEvent,
         velocityX: Float,
         velocityY: Float
     ): Boolean {
@@ -100,7 +100,7 @@ class AndroidDataView(
         return false
     }
 
-    override fun onAnimationUpdate(animation: ValueAnimator?) {
+    override fun onAnimationUpdate(animation: ValueAnimator) {
         if (!scroller.isFinished) {
             scroller.computeScrollOffset()
             updateDataOffset()
@@ -127,11 +127,11 @@ class AndroidDataView(
         }
     }
 
-    private fun handleClick(e: MotionEvent?, isSingleTap: Boolean = false): Boolean {
+    private fun handleClick(e: MotionEvent, isSingleTap: Boolean = false): Boolean {
         val x: Float
         val y: Float
         try {
-            val pointerId = e!!.getPointerId(0)
+            val pointerId = e.getPointerId(0)
             x = e.getX(pointerId)
             y = e.getY(pointerId)
         } catch (ex: RuntimeException) {

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.kt

@@ -116,7 +116,7 @@ abstract class ScrollableChart : View, GestureDetector.OnGestureListener, Animat
         return BundleSavedState(superState, bundle)
     }
 
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, dx: Float, dy: Float): Boolean {
+    override fun onScroll(e1: MotionEvent, e2: MotionEvent, dx: Float, dy: Float): Boolean {
         var dx = dx
         if (scrollerBucketSize == 0) return false
         if (abs(dx) > abs(dy)) {

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt

@@ -19,12 +19,17 @@
 
 package org.isoron.uhabits.activities.habits.list
 
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.Intent
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat.checkSelfPermission
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import org.isoron.uhabits.BaseExceptionHandler
@@ -56,6 +61,16 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
     lateinit var midnightTimer: MidnightTimer
     private val scope = CoroutineScope(Dispatchers.Main)
 
+    private var permissionAlreadyRequested = false
+    private val permissionLauncher =
+        registerForActivityResult(RequestPermission()) { isGranted: Boolean ->
+            if (isGranted) {
+                scheduleReminders()
+            } else {
+                Log.i("ListHabitsActivity", "POST_NOTIFICATIONS denied")
+            }
+        }
+
     private lateinit var menu: ListHabitsMenu
 
     override fun onQuestionMarksChanged() {
@@ -101,7 +116,26 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         screen.onAttached()
         rootView.postInvalidate()
         midnightTimer.onResume()
-        appComponent.reminderScheduler.scheduleAll()
+
+        if (appComponent.reminderScheduler.hasHabitsWithReminders()) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                scheduleReminders()
+            } else {
+                if (checkSelfPermission(this, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+                    scheduleReminders()
+                } else {
+                    // If we have not requested the permission yet, request it. Otherwide do
+                    // nothing. This check is necessary to avoid an infinite onResume loop in case
+                    // the user denies the permission.
+                    if (!permissionAlreadyRequested) {
+                        Log.i("ListHabitsActivity", "Requestion permission: POST_NOTIFICATIONS")
+                        permissionLauncher.launch(POST_NOTIFICATIONS)
+                        permissionAlreadyRequested = true
+                    }
+                }
+            }
+        }
+
         taskRunner.run {
             try {
                 AutoBackup(this@ListHabitsActivity).run()
@@ -117,6 +151,10 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         super.onResume()
     }
 
+    private fun scheduleReminders() {
+        appComponent.reminderScheduler.scheduleAll()
+    }
+
     override fun onCreateOptionsMenu(m: Menu): Boolean {
         menu.onCreate(menuInflater, m)
         return true

uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.kt

@@ -66,7 +66,13 @@ class ReminderController @Inject constructor(
     }
 
     fun onDismiss(habit: Habit) {
-        notificationTray.cancel(habit)
+        if (preferences.shouldMakeNotificationsSticky()) {
+            // This is a workaround to keep sticky notifications non-dismissible in Android 14+.
+            // If the notification is dismissed, we immediately reshow it.
+            notificationTray.reshow(habit)
+        } else {
+            notificationTray.cancel(habit)
+        }
     }
 
     private fun showSnoozeDelayPicker(habit: Habit, context: Context) {

uhabits-core/build.gradle.kts

@@ -44,7 +44,7 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.48")
+                compileOnly("com.google.dagger:dagger:2.48.1")
                 implementation("com.google.guava:guava:32.1.2-android")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
                 implementation("androidx.annotation:annotation:1.7.0")

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/reminders/ReminderScheduler.kt

@@ -115,6 +115,11 @@ class ReminderScheduler @Inject constructor(
         for (habit in reminderHabits) schedule(habit)
     }
 
+    @Synchronized
+    fun hasHabitsWithReminders(): Boolean {
+        return !habitList.getFiltered(HabitMatcher.WITH_ALARM).isEmpty
+    }
+
     @Synchronized
     fun startListening() {
         commandRunner.addListener(this)

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt

@@ -89,6 +89,12 @@ class NotificationTray @Inject constructor(
         }
     }
 
+    fun reshow(habit: Habit) {
+        active[habit]?.let {
+            taskRunner.execute(ShowNotificationTask(habit, it))
+        }
+    }
+
     interface SystemTray {
         fun removeNotification(notificationId: Int)
         fun showNotification(