Skip to content

Commit e814443

Browse files
committed
Marshal fingerprint password callbacks on EDT
1 parent 06631a1 commit e814443

1 file changed

Lines changed: 28 additions & 12 deletions

File tree

common/src/main/java/com/codename1/fingerprint/impl/InternalCallback.java

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ public static void requestSuccess(int requestId, String value) {
121121
}
122122
requests.remove(requestId);
123123
if (!req.isDone()) {
124-
req.complete(value);
124+
Display.getInstance().callSerially(() -> {
125+
if (!req.isDone()) {
126+
req.complete(value);
127+
}
128+
});
125129
}
126130
}
127131

@@ -132,11 +136,15 @@ public static void requestError(int requestId, String message) {
132136
}
133137
requests.remove(requestId);
134138
if (!req.isDone()) {
135-
if ("__CANCELLED__".equals(message)) {
136-
req.cancel(true);
137-
} else {
138-
req.error(new RuntimeException(message));
139-
}
139+
Display.getInstance().callSerially(() -> {
140+
if (!req.isDone()) {
141+
if ("__CANCELLED__".equals(message)) {
142+
req.cancel(true);
143+
} else {
144+
req.error(new RuntimeException(message));
145+
}
146+
}
147+
});
140148
}
141149
}
142150

@@ -147,11 +155,15 @@ public static void requestKeyRevokedError(int requestId, String message) {
147155
}
148156
requests.remove(requestId);
149157
if (!req.isDone()) {
150-
if ("__CANCELLED__".equals(message)) {
151-
req.cancel(true);
152-
} else {
153-
req.error(new KeyRevokedException(message));
154-
}
158+
Display.getInstance().callSerially(() -> {
159+
if (!req.isDone()) {
160+
if ("__CANCELLED__".equals(message)) {
161+
req.cancel(true);
162+
} else {
163+
req.error(new KeyRevokedException(message));
164+
}
165+
}
166+
});
155167
}
156168
}
157169

@@ -162,7 +174,11 @@ public static void requestComplete(int requestId, boolean success) {
162174
}
163175
requests.remove(requestId);
164176
if (!req.isDone()) {
165-
req.complete(success);
177+
Display.getInstance().callSerially(() -> {
178+
if (!req.isDone()) {
179+
req.complete(success);
180+
}
181+
});
166182
}
167183
}
168184
}

0 commit comments

Comments
 (0)