tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Prevent calls to uninitialized client

Browse Source
This commit is contained in:
Andrea Cavalli 2021-01-24 18:23:23 +01:00
parent 614d2e61a1
commit 3448e980b4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/it/tdlight/common/InternalClient.java
View File

@ -6,6 +6,7 @@ import it.tdlight.jni.TdApi.Function;
import it.tdlight.jni.TdApi.Object; import it.tdlight.jni.TdApi.Object;
import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -18,7 +19,7 @@ public class InternalClient implements ClientEventsHandler, TelegramClient {
private static final java.lang.Object nextClientIdLock = new java.lang.Object(); private static final java.lang.Object nextClientIdLock = new java.lang.Object();
private static int nextClientId = 1; private static int nextClientId = 1;
private int clientId; private volatile Integer clientId = null;
private final InternalClientManager clientManager; private final InternalClientManager clientManager;
private Handler updateHandler; private Handler updateHandler;
private MultiHandler updatesHandler; private MultiHandler updatesHandler;
@ -32,7 +33,7 @@ public class InternalClient implements ClientEventsHandler, TelegramClient {
@Override @Override
public int getClientId() { public int getClientId() {
return clientId; return Objects.requireNonNull(clientId, "Can't obtain the client id before initialization");
} }
@Override @Override
@ -154,6 +155,11 @@ public class InternalClient implements ClientEventsHandler, TelegramClient {
if (isClosedAndMaybeThrow(query)) { if (isClosedAndMaybeThrow(query)) {
resultHandler.onResult(new TdApi.Ok()); resultHandler.onResult(new TdApi.Ok());
} }
if (clientId == null) {
ExceptionHandler handler = exceptionHandler == null ? defaultExceptionHandler : exceptionHandler;
handler.onException(new IllegalStateException("Can't send a request to TDLib before calling \"initialize\" function!"));
return;
}
long queryId = clientManager.getNextQueryId(); long queryId = clientManager.getNextQueryId();
if (resultHandler != null) { if (resultHandler != null) {
handlers.put(queryId, new Handler(resultHandler, exceptionHandler)); handlers.put(queryId, new Handler(resultHandler, exceptionHandler));