Fix #202 Creating a label: Display issue

2 files changed, 4 insertions, 5 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
index 1d7bbd553..6f9dd467f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
@@ -322,8 +322,9 @@ public class CardDetailsFragment extends Fragment implements DatePickerDialog.On
                     newLabel.setTitle(((LabelAutoCompleteAdapter) labels.getAdapter()).getLastFilterText());
                     newLabel.setLocalId(null);
                     observeOnce(syncManager.createLabel(accountId, newLabel, boardId), CardDetailsFragment.this, createdLabel -> {
+                        newLabel.setLocalId(createdLabel.getLocalId());
                         cardDetailsListener.onLabelAdded(createdLabel);
-                        labelsGroup.addView(createChipFromLabel(label));
+                        labelsGroup.addView(createChipFromLabel(newLabel));
                         labelsGroup.setVisibility(View.VISIBLE);
                     });
                 } else {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
index 11fb0db3a..fc3a6957c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java
@@ -30,8 +30,6 @@ import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.util.ViewUtil;
 
-import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-
 public class LabelAutoCompleteAdapter extends BaseAdapter implements Filterable {
     public static final long CREATE_ID = Long.MIN_VALUE;
     private Context context;
@@ -125,7 +123,7 @@ public class LabelAutoCompleteAdapter extends BaseAdapter implements Filterable
                         LiveData<List<Label>> liveData = constraint.length() > 0
                                 ? syncManager.searchNotYetAssignedLabelsByTitle(accountId, boardId, cardId, constraint.toString())
                                 : syncManager.findProposalsForLabelsToAssign(accountId, boardId, cardId, maxLabelsSuggested);
-                        observeOnce(liveData, owner, labels -> {
+                        liveData.observe(owner, (labels -> {
                             if (canManage && constraint.length() > 0) {
                                 createLabel.setTitle(String.format(createLabelText, constraint));
                             }
@@ -144,7 +142,7 @@ public class LabelAutoCompleteAdapter extends BaseAdapter implements Filterable
                                 filterResults.values = createLabels;
                                 filterResults.count = createLabels.size();
                             }
-                        });
+                        }));
                     });
                 }
                 return filterResults;