diff --git a/example/pom.xml b/example/pom.xml index 23b304a..595bdd6 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -26,7 +26,7 @@ it.tdlight tdlight-java-bom - 2.8.5.3 + 2.8.5.5 pom import diff --git a/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java b/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java deleted file mode 100644 index 1125f32..0000000 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitEncryptionKeyHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -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; - -final class AuthorizationStateWaitEncryptionKeyHandler implements GenericUpdateHandler { - - private final TelegramClient client; - private final ExceptionHandler exceptionHandler; - - public AuthorizationStateWaitEncryptionKeyHandler(TelegramClient client, ExceptionHandler exceptionHandler) { - this.client = client; - this.exceptionHandler = exceptionHandler; - } - - @Override - public void onUpdate(UpdateAuthorizationState update) { - if (update.authorizationState.getConstructor() == AuthorizationStateWaitEncryptionKey.CONSTRUCTOR) { - client.send(new CheckDatabaseEncryptionKey(), 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 624302f..41f89c6 100644 --- a/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java +++ b/src/main/java/it/tdlight/client/AuthorizationStateWaitTdlibParametersHandler.java @@ -5,7 +5,6 @@ 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; import it.tdlight.jni.TdApi.UpdateAuthorizationState; final class AuthorizationStateWaitTdlibParametersHandler implements GenericUpdateHandler { @@ -25,7 +24,7 @@ final class AuthorizationStateWaitTdlibParametersHandler implements GenericUpdat @Override public void onUpdate(UpdateAuthorizationState update) { if (update.authorizationState.getConstructor() == AuthorizationStateWaitTdlibParameters.CONSTRUCTOR) { - TdlibParameters params = new TdlibParameters(); + TdApi.SetTdlibParameters params = new TdApi.SetTdlibParameters(); params.useTestDc = settings.isUsingTestDatacenter(); params.databaseDirectory = settings.getDatabaseDirectoryPath().toString(); params.filesDirectory = settings.getDownloadedFilesDirectoryPath().toString(); @@ -41,7 +40,8 @@ final class AuthorizationStateWaitTdlibParametersHandler implements GenericUpdat params.applicationVersion = settings.getApplicationVersion(); params.enableStorageOptimizer = settings.isStorageOptimizerEnabled(); params.ignoreFileNames = settings.isIgnoreFileNames(); - client.send(new SetTdlibParameters(params), ok -> { + params.databaseEncryptionKey = null; + client.send(params, ok -> { if (ok.getConstructor() == TdApi.Error.CONSTRUCTOR) { throw new TelegramError((TdApi.Error) ok); } diff --git a/src/main/java/it/tdlight/client/SimpleTelegramClient.java b/src/main/java/it/tdlight/client/SimpleTelegramClient.java index 0f16bf3..9460150 100644 --- a/src/main/java/it/tdlight/client/SimpleTelegramClient.java +++ b/src/main/java/it/tdlight/client/SimpleTelegramClient.java @@ -70,9 +70,6 @@ public final class SimpleTelegramClient implements Authenticable { this.addUpdateHandler(TdApi.UpdateAuthorizationState.class, new AuthorizationStateWaitTdlibParametersHandler(client, settings, this::handleDefaultException) ); - this.addUpdateHandler(TdApi.UpdateAuthorizationState.class, - new AuthorizationStateWaitEncryptionKeyHandler(client, this::handleDefaultException) - ); this.addUpdateHandler(TdApi.UpdateAuthorizationState.class, new AuthorizationStateWaitAuthenticationDataHandler(client, this, this::handleDefaultException) ); diff --git a/tdlight/pom.xml b/tdlight/pom.xml index 452b352..4574e0b 100644 --- a/tdlight/pom.xml +++ b/tdlight/pom.xml @@ -56,7 +56,7 @@ org.slf4j slf4j-api - 2.0.0 + 2.0.3 org.reactivestreams