Skip to content

Commit 496b1cd

Browse files
committed
Fix raw use of parameterized Function
1 parent f41157c commit 496b1cd

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

‎source/install.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pushd "$TDLIB_INSTALL_DIR/tdlib/java/org/drinkless/tdlib" > /dev/null || exit 1
3232
sed -i".bak" -E '/ {4}static \{/,+7d' TdApi.java || exit 1
3333
sed -i".bak" "s/'/'/g" TdApi.java || exit 1
3434
sed -i".bak" -E '/ {4}static \{/,+7d' Client.java || exit 1
35+
sed -i".bak" "s/Function /Function<?> /g" Client.java || exit 1
3536
rm *.bak
3637
popd > /dev/null
3738

‎src/main/java/org/drinkless/tdlib/Client.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static class ExecutionException extends Exception {
8383
* exception thrown from resultHandler. If it is null, then
8484
* defaultExceptionHandler will be called.
8585
*/
86-
public void send(TdApi.Function query, ResultHandler resultHandler, ExceptionHandler exceptionHandler) {
86+
public void send(TdApi.Function<?> query, ResultHandler resultHandler, ExceptionHandler exceptionHandler) {
8787
long queryId = currentQueryId.incrementAndGet();
8888
if (resultHandler != null) {
8989
handlers.put(queryId, new Handler(resultHandler, exceptionHandler));
@@ -99,7 +99,7 @@ public void send(TdApi.Function query, ResultHandler resultHandler, ExceptionHan
9999
* of the query or with TdApi.Error as parameter. If it is null, then
100100
* defaultExceptionHandler will be called.
101101
*/
102-
public void send(TdApi.Function query, ResultHandler resultHandler) {
102+
public void send(TdApi.Function<?> query, ResultHandler resultHandler) {
103103
send(query, resultHandler, null);
104104
}
105105

@@ -241,11 +241,11 @@ private Client(ResultHandler updateHandler, ExceptionHandler updateExceptionHand
241241

242242
private static native int createNativeClient();
243243

244-
private static native void nativeClientSend(int nativeClientId, long eventId, TdApi.Function function);
244+
private static native void nativeClientSend(int nativeClientId, long eventId, TdApi.Function<?> function);
245245

246246
private static native int nativeClientReceive(int[] clientIds, long[] eventIds, TdApi.Object[] events, double timeout);
247247

248-
private static native TdApi.Object nativeClientExecute(TdApi.Function function);
248+
private static native TdApi.Object nativeClientExecute(TdApi.Function<?> function);
249249

250250
private static native void nativeClientSetLogMessageHandler(int maxVerbosityLevel, LogMessageHandler logMessageHandler);
251251
}

0 commit comments

Comments
 (0)