From f2f4c77016114ae9188f0ac7aa31eae9ec13162f Mon Sep 17 00:00:00 2001
From: r-ca <nem@nem.x0.to>
Date: Mon, 29 Jan 2024 00:40:06 +0900
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=BF=E3=82=B0=E4=B8=80=E8=A6=A7=E3=81=AE?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=82=92=E5=88=87=E3=82=8A=E5=87=BA=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/LacertaApplyTagDialog.java         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagDialog.java b/component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagDialog.java
index 596a2d01..913621a8 100644
--- a/component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagDialog.java
+++ b/component/common/src/main/java/one/nem/lacerta/component/common/LacertaApplyTagDialog.java
@@ -135,21 +135,20 @@ public class LacertaApplyTagDialog extends DialogFragment {
     private CompletableFuture<ArrayList<DocumentTagApplyTagDialogExtendedModel>> getDocumentTagArrayList(String documentId) {
         return CompletableFuture.supplyAsync(() -> {
             ArrayList<DocumentTagApplyTagDialogExtendedModel> documentTagArrayList = new ArrayList<>();
-            lacertaLibrary.getTagList().thenAccept(documentTags -> {
-                setAppliedTagList(documentId);
-                for (int i = 0; i < documentTags.size(); i++) {
+            setRegisteredTagList().thenAccept(Void -> {
+                setAppliedTagList(documentId).join();
+                for (int i = 0; i < this.registeredTags.size(); i++) {
                     boolean isChecked = false;
                     for (int j = 0; j < this.appliedTags.size(); j++) {
-                        if (documentTags.get(i).getId().equals(this.appliedTags.get(j).getId())) {
+                        if (this.registeredTags.get(i).getId().equals(this.appliedTags.get(j).getId())) {
                             isChecked = true;
                             break;
                         }
                     }
                     documentTagArrayList.add(new DocumentTagApplyTagDialogExtendedModel(
-                            new DocumentTag(documentTags.get(i).getId(), documentTags.get(i).getName(), documentTags.get(i).getColor()), isChecked));
+                            new DocumentTag(this.registeredTags.get(i).getId(), this.registeredTags.get(i).getName(), this.registeredTags.get(i).getColor()), isChecked));
                 }
             });
-
             return documentTagArrayList;
         });
     }
@@ -162,9 +161,11 @@ public class LacertaApplyTagDialog extends DialogFragment {
         });
     }
 
-    private void setRegisteredTagList() {
-        lacertaLibrary.getTagList().thenAccept(documentTags -> {
-            this.registeredTags = documentTags;
+    private CompletableFuture<Void> setRegisteredTagList() {
+        return CompletableFuture.runAsync(() -> {
+            lacertaLibrary.getTagList().thenAccept(documentTags -> {
+                this.registeredTags = documentTags;
+            });
         });
     }