diff --git a/src/main/java/it/tdlight/client/AuthorizationStateReadyGetMe.java b/src/main/java/it/tdlight/client/AuthorizationStateReadyGetMe.java index 3046566..46e662b 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateReadyGetMe.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateReadyGetMe.java @@ -5,6 +5,7 @@ import it.tdlight.jni.TdApi.AuthorizationStateReady; import it.tdlight.jni.TdApi.GetMe; import it.tdlight.jni.TdApi.UpdateAuthorizationState; import it.tdlight.jni.TdApi.User; +import it.tdlight.jni.TdApi.Error; import java.util.concurrent.atomic.AtomicReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitAuthenticationDataHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitAuthenticationDataHandler.java index 3ac17ea..a9a2b48 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitAuthenticationDataHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitAuthenticationDataHandler.java @@ -36,15 +36,15 @@ final class AuthorizationStateWaitAuthenticationDataHandler implements GenericUp String botToken = authenticationData.getBotToken(); TdApi.CheckAuthenticationBotToken response = new TdApi.CheckAuthenticationBotToken(botToken); client.send(response, ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } else if (authenticationData.isQrCode()) { TdApi.RequestQrCodeAuthentication response = new TdApi.RequestQrCodeAuthentication(); client.send(response, ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } else { @@ -53,8 +53,8 @@ final class AuthorizationStateWaitAuthenticationDataHandler implements GenericUp String phoneNumber = String.valueOf(authenticationData.getUserPhoneNumber()); SetAuthenticationPhoneNumber response = new SetAuthenticationPhoneNumber(phoneNumber, phoneSettings); client.send(response, ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitCodeHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitCodeHandler.java index f81086f..eac8e66 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitCodeHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitCodeHandler.java @@ -2,6 +2,7 @@ package it.tdlight.client; import it.tdlight.common.ExceptionHandler; import it.tdlight.common.TelegramClient; +import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi.AuthorizationStateWaitCode; import it.tdlight.jni.TdApi.CheckAuthenticationCode; import it.tdlight.jni.TdApi.UpdateAuthorizationState; @@ -32,8 +33,8 @@ final class AuthorizationStateWaitCodeHandler implements GenericUpdateHandler { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java index 20a39b7..1125f32 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java @@ -2,6 +2,7 @@ package it.tdlight.client; import it.tdlight.common.ExceptionHandler; import it.tdlight.common.TelegramClient; +import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi.AuthorizationStateWaitEncryptionKey; import it.tdlight.jni.TdApi.CheckDatabaseEncryptionKey; import it.tdlight.jni.TdApi.UpdateAuthorizationState; @@ -20,8 +21,8 @@ final class AuthorizationStateWaitEncryptionKeyHandler implements GenericUpdateH public void onUpdate(UpdateAuthorizationState update) { if (update.authorizationState.getConstructor() == AuthorizationStateWaitEncryptionKey.CONSTRUCTOR) { client.send(new CheckDatabaseEncryptionKey(), ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitPasswordHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitPasswordHandler.java index a8599b4..08e9f1f 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitPasswordHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitPasswordHandler.java @@ -2,6 +2,7 @@ package it.tdlight.client; import it.tdlight.common.ExceptionHandler; import it.tdlight.common.TelegramClient; +import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi.AuthorizationStateWaitPassword; import it.tdlight.jni.TdApi.CheckAuthenticationPassword; import it.tdlight.jni.TdApi.UpdateAuthorizationState; @@ -31,8 +32,8 @@ final class AuthorizationStateWaitPasswordHandler implements GenericUpdateHandle String password = clientInteraction.onParameterRequest(InputParameter.ASK_PASSWORD, parameterInfo); CheckAuthenticationPassword response = new CheckAuthenticationPassword(password); client.send(response, ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitRegistrationHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitRegistrationHandler.java index e75ece9..6d7dbc7 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitRegistrationHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitRegistrationHandler.java @@ -48,8 +48,8 @@ final class AuthorizationStateWaitRegistrationHandler implements GenericUpdateHa } RegisterUser response = new RegisterUser(firstName, lastName); client.send(response, ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java index 7c31bbc..624302f 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java @@ -2,6 +2,7 @@ package it.tdlight.client; import it.tdlight.common.ExceptionHandler; import it.tdlight.common.TelegramClient; +import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi.AuthorizationStateWaitTdlibParameters; import it.tdlight.jni.TdApi.SetTdlibParameters; import it.tdlight.jni.TdApi.TdlibParameters; @@ -41,8 +42,8 @@ final class AuthorizationStateWaitTdlibParametersHandler implements GenericUpdat params.enableStorageOptimizer = settings.isStorageOptimizerEnabled(); params.ignoreFileNames = settings.isIgnoreFileNames(); client.send(new SetTdlibParameters(params), ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }, exceptionHandler); } diff --git a/src/main/java/it/tdlight/client/CommandsHandler.java b/src/main/java/it/tdlight/client/CommandsHandler.java index be42c14..ff4a173 100644 --- a/src/main/java/it/tdlight/client/CommandsHandler.java +++ b/src/main/java/it/tdlight/client/CommandsHandler.java @@ -70,8 +70,8 @@ final class CommandsHandler implements GenericUpdateHandler { for (CommandHandler handler : handlers) { client.send(new TdApi.GetChat(message.chatId), response -> { - if (response.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) response); + if (response.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) response); } handler.onCommand((Chat) response, message.sender, arguments); }, error -> logger.warn("Error when handling the command {}", commandName, error)); diff --git a/src/main/java/it/tdlight/client/SimpleTelegramClient.java b/src/main/java/it/tdlight/client/SimpleTelegramClient.java index 2821dea..69dc166 100644 --- a/src/main/java/it/tdlight/client/SimpleTelegramClient.java +++ b/src/main/java/it/tdlight/client/SimpleTelegramClient.java @@ -238,8 +238,8 @@ public final class SimpleTelegramClient implements Authenticable { */ public void sendClose() { client.send(new TdApi.Close(), ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }); } @@ -249,8 +249,8 @@ public final class SimpleTelegramClient implements Authenticable { */ public void closeAndWait() throws InterruptedException { client.send(new TdApi.Close(), ok -> { - if (ok.getConstructor() == Error.CONSTRUCTOR) { - throw new TelegramError((Error) ok); + if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { + throw new TelegramError((TdApi.Error) ok); } }); this.waitForExit(); diff --git a/src/main/java/it/tdlight/common/ClientEventsHandler.java b/src/main/java/it/tdlight/common/ClientEventsHandler.java index 2baf3ea..4c5b500 100644 --- a/src/main/java/it/tdlight/common/ClientEventsHandler.java +++ b/src/main/java/it/tdlight/common/ClientEventsHandler.java @@ -1,8 +1,10 @@ package it.tdlight.common; +import it.tdlight.jni.TdApi; + public interface ClientEventsHandler { int getClientId(); - void handleEvents(boolean isClosed, long[] eventIds, Object[] events, int arrayOffset, int arrayLength); + void handleEvents(boolean isClosed, long[] eventIds, TdApi.Object[] events, int arrayOffset, int arrayLength); } diff --git a/src/main/java/it/tdlight/common/EventsHandler.java b/src/main/java/it/tdlight/common/EventsHandler.java index 27b2d0d..89b8645 100644 --- a/src/main/java/it/tdlight/common/EventsHandler.java +++ b/src/main/java/it/tdlight/common/EventsHandler.java @@ -1,11 +1,13 @@ package it.tdlight.common; +import it.tdlight.jni.TdApi; + public interface EventsHandler { void handleClientEvents(int clientId, boolean isClosed, long[] clientEventIds, - Object[] clientEvents, + TdApi.Object[] clientEvents, int arrayOffset, int arrayLength); } diff --git a/src/main/java/it/tdlight/common/TelegramClient.java b/src/main/java/it/tdlight/common/TelegramClient.java index 7677383..5de29db 100644 --- a/src/main/java/it/tdlight/common/TelegramClient.java +++ b/src/main/java/it/tdlight/common/TelegramClient.java @@ -1,6 +1,7 @@ package it.tdlight.common; import it.tdlight.jni.TdApi; +import it.tdlight.jni.TdApi.Object; public interface TelegramClient { diff --git a/src/main/java/it/tdlight/common/UpdatesHandler.java b/src/main/java/it/tdlight/common/UpdatesHandler.java index 8a089d2..4229af4 100644 --- a/src/main/java/it/tdlight/common/UpdatesHandler.java +++ b/src/main/java/it/tdlight/common/UpdatesHandler.java @@ -1,5 +1,6 @@ package it.tdlight.common; +import it.tdlight.jni.TdApi; import java.util.List; /** @@ -13,5 +14,5 @@ public interface UpdatesHandler { * @param object Updates of type {@link it.tdlight.jni.TdApi.Update} about new events, or {@link * it.tdlight.jni.TdApi.Error}. */ - void onUpdates(List object); + void onUpdates(List object); } \ No newline at end of file diff --git a/src/main/java/it/tdlight/common/internal/InternalClient.java b/src/main/java/it/tdlight/common/internal/InternalClient.java index 1eba1bf..df6e4b8 100644 --- a/src/main/java/it/tdlight/common/internal/InternalClient.java +++ b/src/main/java/it/tdlight/common/internal/InternalClient.java @@ -88,7 +88,8 @@ public final class InternalClient implements ClientEventsHandler, TelegramClient } catch (IllegalStateException ignored) { logger.trace(TG_MARKER, "Can't remove shutdown hook because the JVM is already shutting down"); } - handlers.forEach((eventId, handler) -> handleResponse(eventId, new Error(500, "Instance closed"), handler)); + handlers.forEach((eventId, handler) -> + handleResponse(eventId, new TdApi.Error(500, "Instance closed"), handler)); handlers.clear(); logger.info(TG_MARKER, "Client closed {}", clientId); }