Fixes #1648

mtotschnig · Feb 9, 2025 · 419c232 · 419c232
1 parent 4638319
commit 419c232
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/CategoryCriterion.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/CategoryCriterion.kt
@@ -37,6 +37,9 @@ data class CategoryCriterion(
 ) : IdCriterion() {
     constructor(label: String = "", vararg values: Long) : this(label, values.toList())
 
+    override val isNullable: Boolean
+        get() = true
+
     @IgnoredOnParcel
     override val id = R.id.FILTER_CATEGORY_COMMAND
 

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/Criterion.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/Criterion.kt
@@ -14,6 +14,9 @@ sealed interface Criterion : Parcelable {
     fun prettyPrint(context: Context): String
     fun getSelectionArgs(queryParts: Boolean): Array<String>
 
+    val isNullable
+        get() = false
+
     val displayTitle: Int
         get() = when (this) {
             is SimpleCriterion<*> -> displayInfo.title

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/NotCriterion.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/NotCriterion.kt
@@ -10,12 +10,16 @@ import kotlinx.serialization.Serializable
 @SerialName("not")
 data class NotCriterion(val criterion: Criterion): Criterion {
     override fun getSelectionForParts(tableName: String?) =
-        "NOT(${criterion.getSelectionForParts(tableName)})"
+        addIsNullCheck("NOT(${criterion.getSelectionForParts(tableName)})")
 
     override fun getSelectionForParents(
         tableName: String?,
         forExport: Boolean,
-    ) = "NOT(${criterion.getSelectionForParents(tableName, forExport)})"
+    ) = addIsNullCheck("NOT(${criterion.getSelectionForParents(tableName, forExport)})")
+
+    private fun addIsNullCheck(selection: String) =
+        if (criterion is SimpleCriterion<*> && criterion.isNullable && criterion.isNull != true)
+            "($selection OR ${criterion.column} IS NULL)" else selection
 
     override fun prettyPrint(context: Context) = "¬(${criterion.prettyPrint(context)})"
 

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/PayeeCriterion.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/provider/filter/PayeeCriterion.kt
@@ -35,6 +35,9 @@ data class PayeeCriterion(
 ) : IdCriterion() {
     constructor(label: String = "", vararg values: Long) : this(label, values.toList())
 
+    override val isNullable: Boolean
+        get() = true
+
     @IgnoredOnParcel
     override val id: Int = R.id.FILTER_PAYEE_COMMAND
     @IgnoredOnParcel