X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionModel.java;h=fdcab48788b94f6336f41254298f92c02748e4c6;hb=6a4f07bbddf90574b8ed2e4b5a5a4a82285e8cfe;hp=9539476d77f063e3e7239e95591831b7a64c4052;hpb=4123c82ce24688f2a91da9706ebe77135f3185ea;p=mobile-ledger-staging.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java
index 9539476d..fdcab487 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionModel.java
@@ -260,6 +260,7 @@ public class NewTransactionModel extends ViewModel {
         if (Misc.emptyIsNull(transactionComment) != null)
             head.setComment(transactionComment);
 
+        Item.resetIdDispenser();
         List<Item> newItems = new ArrayList<>();
 
         newItems.add(head);
@@ -299,7 +300,7 @@ public class NewTransactionModel extends ViewModel {
                   newItems.add(accRow);
               }
 
-              new Handler(Looper.getMainLooper()).post(() -> setItems(newItems));
+              new Handler(Looper.getMainLooper()).post(() -> replaceItems(newItems));
           });
     }
     private int extractIntFromMatches(MatchResult m, Integer group, Integer literal) {
@@ -460,15 +461,15 @@ public class NewTransactionModel extends ViewModel {
 
         return tr;
     }
-    void loadTransactionIntoModel(String profileUUID, int transactionId) {
+    void loadTransactionIntoModel(long profileId, int transactionId) {
         List<Item> newList = new ArrayList<>();
         Item.resetIdDispenser();
         LedgerTransaction tr;
-        MobileLedgerProfile profile = Data.getProfile(profileUUID);
+        MobileLedgerProfile profile = Data.getProfile(profileId);
         if (profile == null)
             throw new RuntimeException(String.format(
                     "Unable to find profile %s, which is supposed to contain transaction %d",
-                    profileUUID, transactionId));
+                    profileId, transactionId));
 
         tr = profile.loadTransaction(transactionId);
         TransactionHead head = new TransactionHead(tr.getDescription());
@@ -1030,7 +1031,7 @@ public class NewTransactionModel extends ViewModel {
             return ItemType.generalData;
         }
         public LedgerTransaction asLedgerTransaction() {
-            return new LedgerTransaction(null, date, description, Data.getProfile());
+            return new LedgerTransaction(0, date, description, Data.getProfile());
         }
         public boolean equalContents(TransactionHead other) {
             if (other == null)