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

Avoid bug in tdlib by predicting the next client identifier

Browse Source
This commit is contained in:
Andrea Cavalli 2021-01-24 17:22:38 +01:00
parent 2571ffb7cb
commit 51516f9d54
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class InternalClient implements ClientEventsHandler, TelegramClient { public class InternalClient implements ClientEventsHandler, TelegramClient {
private final ConcurrentHashMap<Long, Handler> handlers = new ConcurrentHashMap<Long, Handler>(); private final ConcurrentHashMap<Long, Handler> handlers = new ConcurrentHashMap<Long, Handler>();
private static final java.lang.Object nextClientIdLock = new java.lang.Object();
private static int nextClientId = 1;
private int clientId; private int clientId;
private final InternalClientManager clientManager; private final InternalClientManager clientManager;
@ -116,11 +118,7 @@ public class InternalClient implements ClientEventsHandler, TelegramClient {
this.updateHandler = null; this.updateHandler = null;
this.updatesHandler = new MultiHandler(updatesHandler, updateExceptionHandler); this.updatesHandler = new MultiHandler(updatesHandler, updateExceptionHandler);
this.defaultExceptionHandler = defaultExceptionHandler; this.defaultExceptionHandler = defaultExceptionHandler;
createAndRegisterClient(clientId);
clientManager.registerClient(clientId, this);
// Send a dummy request because @levlam is too lazy to fix race conditions in a better way
this.send(new TdApi.GetAuthorizationState(), (result) -> {}, ex -> {});
} }
@Override @Override
@ -130,9 +128,18 @@ public class InternalClient implements ClientEventsHandler, TelegramClient {
this.updateHandler = new Handler(updateHandler, updateExceptionHandler); this.updateHandler = new Handler(updateHandler, updateExceptionHandler);
this.updatesHandler = null; this.updatesHandler = null;
this.defaultExceptionHandler = defaultExceptionHandler; this.defaultExceptionHandler = defaultExceptionHandler;
createAndRegisterClient(clientId);
}
this.clientId = NativeClientAccess.create(); private void createAndRegisterClient(int clientId) {
clientManager.registerClient(clientId, this); synchronized (nextClientIdLock) {
int nextClientId = InternalClient.nextClientId++;
clientManager.registerClient(clientId, this);
this.clientId = NativeClientAccess.create();
if (this.clientId != nextClientId) {
throw new RuntimeException("FATAL ERROR 00 -- REPORT AT https://github.com/tdlight-team/tdlight-java/issues");
}
}
// Send a dummy request because @levlam is too lazy to fix race conditions in a better way // Send a dummy request because @levlam is too lazy to fix race conditions in a better way
this.send(new TdApi.GetAuthorizationState(), (result) -> {}, ex -> {}); this.send(new TdApi.GetAuthorizationState(), (result) -> {}, ex -> {});