From 706d7a5b098c0f7c53322b29ba919395dafab6de Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 9 May 2023 23:23:57 +0200 Subject: [PATCH] return authentication data when possible --- .../java/it/tdlight/client/AuthenticationDataImpl.java | 2 +- .../java/it/tdlight/client/AuthenticationDataQrCode.java | 2 +- .../java/it/tdlight/client/AuthenticationSupplier.java | 8 ++++---- .../it/tdlight/client/SimpleAuthenticationSupplier.java | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 tdlight-java/src/main/java/it/tdlight/client/SimpleAuthenticationSupplier.java diff --git a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataImpl.java b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataImpl.java index c22b6ba..26f210b 100644 --- a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataImpl.java +++ b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataImpl.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; @SuppressWarnings("unused") -final class AuthenticationDataImpl implements AuthenticationSupplier, AuthenticationData { +final class AuthenticationDataImpl implements SimpleAuthenticationSupplier { private final String userPhoneNumber; private final String botToken; diff --git a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataQrCode.java b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataQrCode.java index ce911ee..8939ec5 100644 --- a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataQrCode.java +++ b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationDataQrCode.java @@ -2,7 +2,7 @@ package it.tdlight.client; import java.util.concurrent.CompletableFuture; -class AuthenticationDataQrCode implements AuthenticationSupplier, AuthenticationData { +class AuthenticationDataQrCode implements SimpleAuthenticationSupplier { @Override public boolean isQrCode() { diff --git a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationSupplier.java b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationSupplier.java index 1b979ac..b3d8cc5 100644 --- a/tdlight-java/src/main/java/it/tdlight/client/AuthenticationSupplier.java +++ b/tdlight-java/src/main/java/it/tdlight/client/AuthenticationSupplier.java @@ -6,7 +6,7 @@ public interface AuthenticationSupplier { CompletableFuture get(); - static AuthenticationSupplier qrCode() { + static SimpleAuthenticationSupplier qrCode() { return new AuthenticationDataQrCode(); } @@ -14,15 +14,15 @@ public interface AuthenticationSupplier { * Deprecated, use {@link #user(String)} instead */ @Deprecated - static AuthenticationSupplier user(long userPhoneNumber) { + static SimpleAuthenticationSupplier user(long userPhoneNumber) { return user(String.valueOf(userPhoneNumber)); } - static AuthenticationSupplier user(String userPhoneNumber) { + static SimpleAuthenticationSupplier user(String userPhoneNumber) { return new AuthenticationDataImpl(userPhoneNumber, null); } - static AuthenticationSupplier bot(String botToken) { + static SimpleAuthenticationSupplier bot(String botToken) { return new AuthenticationDataImpl(null, botToken); } diff --git a/tdlight-java/src/main/java/it/tdlight/client/SimpleAuthenticationSupplier.java b/tdlight-java/src/main/java/it/tdlight/client/SimpleAuthenticationSupplier.java new file mode 100644 index 0000000..f714a8d --- /dev/null +++ b/tdlight-java/src/main/java/it/tdlight/client/SimpleAuthenticationSupplier.java @@ -0,0 +1,4 @@ +package it.tdlight.client; + +public interface SimpleAuthenticationSupplier extends AuthenticationSupplier, + AuthenticationData {}