fixes for issues discovered during testing

mtotschnig · Sep 26, 2023 · 10ada85 · 10ada85
1 parent 5021753
commit 10ada85
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/viewmodel/data/Transaction2.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/viewmodel/data/Transaction2.kt
@@ -167,7 +167,6 @@ data class Transaction2(
                 KEY_REFERENCE_NUMBER,
                 KEY_STATUS,
                 KEY_TAGLIST,
-                KEY_ATTACHMENT_COUNT,
                 KEY_PARENTID,
                 when (grouping) {
                     Grouping.MONTH -> getYearOfMonthStart()
@@ -181,7 +180,8 @@ data class Transaction2(
             ).let {
                 if (extended) it + listOf(
                     KEY_CURRENCY,
-                    "$TRANSFER_PEER_PARENT AS $KEY_TRANSFER_PEER_PARENT"
+                    "$TRANSFER_PEER_PARENT AS $KEY_TRANSFER_PEER_PARENT",
+                    KEY_ATTACHMENT_COUNT
                 ) else it
             }.toTypedArray()
 
@@ -234,7 +234,7 @@ data class Transaction2(
                 week = cursor.getInt(KEY_WEEK),
                 day = cursor.getInt(KEY_DAY),
                 icon = cursor.getStringOrNull(KEY_ICON),
-                attachmentCount = cursor.getInt(KEY_ATTACHMENT_COUNT)
+                attachmentCount = cursor.getIntIfExists(KEY_ATTACHMENT_COUNT) ?: 0
             )
         }
     }

diff --git a/myExpenses/src/main/res/values/version_info.xml b/myExpenses/src/main/res/values/version_info.xml
@@ -208,4 +208,7 @@
         <item>@string/whats_new_364_1</item>
         <item>@string/whats_new_364_2</item>
     </string-array>
+    <string-array name="whats_new_365">
+        <item>@string/whats_new_365</item>
+    </string-array>
 </resources>
diff --git a/myExpenses/src/test/java/org/totschnig/myexpenses/export/ExportTest.kt b/myExpenses/src/test/java/org/totschnig/myexpenses/export/ExportTest.kt
@@ -115,7 +115,7 @@ class ExportTest: BaseTestWithRepository() {
         uuidList.add(op.uuid!!)
         context.contentResolver.applyBatch(
             TransactionProvider.AUTHORITY,
-            saveTagLinks(listOf(tag1Id, tag2Id), op.id, null, true)
+            ArrayList(saveTagLinks(listOf(tag1Id, tag2Id), op.id, null, true))
         )
         op.amount = (Money(CurrencyUnit.DebugInstance, expense2))
         op.catId = cat1Id
@@ -168,7 +168,7 @@ class ExportTest: BaseTestWithRepository() {
         uuidList.add(part.uuid!!)
         context.contentResolver.applyBatch(
             TransactionProvider.AUTHORITY,
-            saveTagLinks(listOf(tag1Id, tag2Id), part.id, null, true)
+            ArrayList(saveTagLinks(listOf(tag1Id, tag2Id), part.id, null, true))
         )
         split.status = DatabaseConstants.STATUS_NONE
         split.save(contentResolver, true)

diff --git a/myExpenses/src/test/java/org/totschnig/myexpenses/sync/ResourceStorageTest.kt b/myExpenses/src/test/java/org/totschnig/myexpenses/sync/ResourceStorageTest.kt
@@ -2,6 +2,7 @@ package org.totschnig.myexpenses.sync
 
 import com.google.common.truth.Truth
 import org.junit.Test
+import java.io.InputStream
 
 class ResourceStorageTest {
 
@@ -17,6 +18,14 @@ class ResourceStorageTest {
                 )
             }
 
+        override fun getCollection(collectionName: String, require: Boolean): Resource? {
+            TODO("Not yet implemented")
+        }
+
+        override fun getInputStream(resource: Resource): InputStream {
+            TODO("Not yet implemented")
+        }
+
         override fun childrenForCollection(folder: Resource?): Collection<Resource> =
             ((folder ?: storage) as Folder).members