Stop using some more modern Java constructs

chvp · Mar 4, 2024 · 913bb9e · 913bb9e
1 parent 85ffca1
commit 913bb9e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/app/src/main/java/be/chvp/nanoledger/data/LedgerRepository.kt b/app/src/main/java/be/chvp/nanoledger/data/LedgerRepository.kt
@@ -70,7 +70,13 @@ class LedgerRepository
                 fileUri
                     ?.let { context.contentResolver.openInputStream(it) }
                     ?.let { BufferedReader(InputStreamReader(it)) }
-                    ?.use { it.lines().forEach { result.add(it) } }
+                    ?.use { reader ->
+                        var line = reader.readLine()
+                        while(line != null) {
+                            result.add(line)
+                            line = reader.readLine()
+                        }
+                    }
                 val extracted = extractTransactions(result)
                 _fileContents.postValue(result)
                 _transactions.postValue(extracted)

diff --git a/app/src/main/java/be/chvp/nanoledger/ui/add/AddViewModel.kt b/app/src/main/java/be/chvp/nanoledger/ui/add/AddViewModel.kt
@@ -186,9 +186,14 @@ class AddViewModel
         ) {
             val result = ArrayList(postings.value!!)
             result[index] = Triple(newAccount, result[index].second, result[index].third)
-            result.removeIf { it.first == "" && it.third == "" }
-            result.add(emptyPosting())
-            _postings.value = result
+            val filteredResult = ArrayList<Triple<String, String, String>>()
+            for (triple in result) {
+                if (triple.first != "" || triple.third != "") {
+                    filteredResult.add(triple)
+                }
+            }
+            filteredResult.add(emptyPosting())
+            _postings.value = filteredResult
         }
 
         fun setCurrency(
@@ -206,9 +211,14 @@ class AddViewModel
         ) {
             val result = ArrayList(postings.value!!)
             result[index] = Triple(result[index].first, result[index].second, newAmount)
-            result.removeIf { it.first == "" && it.third == "" }
-            result.add(emptyPosting())
-            _postings.value = result
+            val filteredResult = ArrayList<Triple<String, String, String>>()
+            for (triple in result) {
+                if (triple.first != "" || triple.third != "") {
+                    filteredResult.add(triple)
+                }
+            }
+            filteredResult.add(emptyPosting())
+            _postings.value = filteredResult
         }
 
         fun emptyPosting(): Triple<String, String, String> {