Renamed library and separated native files

src/main/java-templates/it/tdlight/tdlight/utils/LibraryVersion.java

@@ -1,4 +1,4 @@
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 public final class LibraryVersion {
     public static final String VERSION = "${project.version}";
 }

src/main/java/it/ernytech/tdlib/utils/package-info.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
- * This file is part of JTdlib.
- *
- *     JTdlib is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU Lesser General Public License as published by
- *     the Free Software Foundation, either version 3 of the License.
- *
- *     JTdlib is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public License
- *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * it.ernytech.tdlib.utils is a group of utils necessary to complete the essential operation of tdlib.
- */
-package it.ernytech.tdlib.utils;

src/main/java/it/tdlight/tdlight/Client.java

@@ -0,0 +1,150 @@
+package it.tdlight.tdlight;
+
+import it.tdlight.tdnatives.TdApi.Object;
+import it.tdlight.tdlight.natives.NativeClient;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.StampedLock;
+
+/**
+ * Interface for interaction with TDLib.
+ */
+public class Client extends NativeClient implements TelegramClient {
+	private long clientId;
+	private final ReentrantLock receiveLock = new ReentrantLock();
+	private final StampedLock executionLock = new StampedLock();
+	private volatile Long stampedLockValue = 1L;
+
+	/**
+	 * Creates a new TDLib client.
+	 */
+	public Client() {
+		super();
+		try {
+			Init.start();
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+			System.exit(1);
+		}
+		this.clientId = createNativeClient();
+	}
+
+	/**
+	 * Sends request to TDLib. May be called from any thread.
+	 * @param request Request to TDLib.
+	 */
+	@Override
+	public void send(Request request) {
+		if (this.executionLock.isWriteLocked()) {
+			throw new IllegalStateException("ClientActor is destroyed");
+		}
+
+		nativeClientSend(this.clientId, request.getId(), request.getFunction());
+	}
+
+	private long[] eventIds;
+	private Object[] events;
+
+	/**
+	 * Receives incoming updates and request responses from TDLib. May be called from any thread, but shouldn't be called simultaneously from two different threads.
+	 * @param timeout Maximum number of seconds allowed for this function to wait for new records.
+	 * @param eventSize Maximum number of events allowed in list.
+	 * @return An incoming update or request response list. The object returned in the response may be an empty list if the timeout expires.
+	 */
+	@Override
+	public List<Response> receive(double timeout, int eventSize) {
+		if (this.executionLock.isWriteLocked()) {
+			throw new IllegalStateException("ClientActor is destroyed");
+		}
+
+		var responseList = new ArrayList<Response>();
+		if (eventIds == null) {
+			eventIds = new long[eventSize];
+			events = new Object[eventSize];
+		} else if (eventIds.length != eventSize) {
+			throw new IllegalArgumentException("EventSize can't change! Previous value = " + eventIds.length + " New value = " + eventSize);
+		} else {
+			Arrays.fill(eventIds, 0);
+			Arrays.fill(events, null);
+		}
+
+		if (this.receiveLock.isLocked()) {
+			throw new IllegalThreadStateException("Thread: " + Thread.currentThread().getName() + " trying receive incoming updates but shouldn't be called simultaneously from two different threads!");
+		}
+
+		int resultSize;
+		this.receiveLock.lock();
+		try {
+			resultSize = nativeClientReceive(this.clientId, eventIds, events, timeout);
+		} finally {
+			this.receiveLock.unlock();
+		}
+
+		for (int i = 0; i < resultSize; i++) {
+			responseList.add(new Response(eventIds[i], events[i]));
+		}
+
+		return responseList;
+	}
+
+	/**
+	 * Receives incoming updates and request responses from TDLib. May be called from any thread, but shouldn't be called simultaneously from two different threads.
+	 * @param timeout Maximum number of seconds allowed for this function to wait for new records.
+	 * @return An incoming update or request response. The object returned in the response may be a nullptr if the timeout expires.
+	 */
+	@Override
+	public Response receive(double timeout) {
+		if (this.executionLock.isWriteLocked()) {
+			throw new IllegalStateException("ClientActor is destroyed");
+		}
+
+		var responseList = receive(timeout, 1);
+
+		if (responseList.size() < 1) {
+			return null;
+		}
+
+		return responseList.get(0);
+	}
+
+	/**
+	 * Synchronously executes TDLib requests. Only a few requests can be executed synchronously. May be called from any thread.
+	 * @param request Request to the TDLib.
+	 * @return The request response.
+	 */
+	@Override
+	public Response execute(Request request) {
+		if (this.executionLock.isWriteLocked()) {
+			throw new IllegalStateException("ClientActor is destroyed");
+		}
+
+		Object object = nativeClientExecute(request.getFunction());
+		return new Response(0, object);
+	}
+
+	/**
+	 * Destroys the client and TDLib instance.
+	 */
+	@Override
+	public void destroyClient() {
+		stampedLockValue = this.executionLock.tryWriteLock();
+		destroyNativeClient(this.clientId);
+	}
+
+	/**
+	 * Destroys the client and TDLib instance.
+	 */
+	@Override
+	public void initializeClient() {
+		this.executionLock.tryUnlockWrite();
+		stampedLockValue = null;
+		this.clientId = createNativeClient();
+	}
+
+	@Override
+	public boolean isDestroyed() {
+		return this.executionLock.isWriteLocked();
+	}
+}

src/main/java/it/tdlight/tdlight/ConstructorDetector.java

@@ -15,10 +15,9 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdbot;
-
-import it.ernytech.tdlib.TdApi;
+package it.tdlight.tdlight;
 
+import it.tdlight.tdnatives.TdApi;
 import java.lang.reflect.Field;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -30,7 +29,7 @@ public class ConstructorDetector {
     static {
         // Call this to load static methods and prevent errors during startup!
         try {
-            it.ernytech.tdlib.utils.Init.start();
+            Init.start();
         } catch (Throwable throwable) {
             throwable.printStackTrace();
         }

src/main/java/it/tdlight/tdlight/FatalErrorCallbackPtr.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
 
 /**
  * A type of callback function that will be called when a fatal error happens.

src/main/java/it/tdlight/tdlight/Init.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
+ * This file is part of JTdlib.
+ *
+ *     JTdlib is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License.
+ *
+ *     JTdlib is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.tdlight.tdlight;
+
+import it.tdlight.tdlight.utils.CantLoadLibrary;
+import it.tdlight.tdlight.utils.LoadLibrary;
+import it.tdlight.tdlight.utils.Os;
+
+/**
+ * Init class to successfully initialize Tdlib
+ */
+public class Init {
+
+    private static boolean started = false;
+
+    /**
+     * Initialize Tdlib
+     *
+     * @throws CantLoadLibrary An exception that is thrown when the LoadLibrary class fails to load the library.
+     */
+    public synchronized static void start() throws Throwable {
+        if (!started) {
+            var os = LoadLibrary.getOs();
+
+            if (os == Os.win) {
+                LoadLibrary.load("libeay32");
+                LoadLibrary.load("ssleay32");
+                LoadLibrary.load("zlib1");
+            }
+
+            LoadLibrary.load("tdjni");
+            ConstructorDetector.init();
+            started = true;
+        }
+    }
+}

src/main/java/it/tdlight/tdlight/Log.java

@@ -0,0 +1,31 @@
+package it.tdlight.tdlight;
+
+import it.tdlight.tdlight.natives.NativeLog;
+import java.util.Objects;
+
+public class Log extends NativeLog {
+
+	static {
+		try {
+			Init.start();
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+			System.exit(0);
+		}
+	}
+
+	private static final FatalErrorCallbackPtr defaultFatalErrorCallbackPtr = System.err::println;
+	private static FatalErrorCallbackPtr fatalErrorCallback = defaultFatalErrorCallbackPtr;
+
+	/**
+	 * Sets the callback that will be called when a fatal error happens. None of the TDLib methods can be called from the callback. The TDLib will crash as soon as callback returns. By default the callback set to print in stderr.
+	 * @param fatalErrorCallback Callback that will be called when a fatal error happens. Pass null to restore default callback.
+	 */
+	public static void setFatalErrorCallback(FatalErrorCallbackPtr fatalErrorCallback) {
+		Log.fatalErrorCallback = Objects.requireNonNullElse(fatalErrorCallback, defaultFatalErrorCallbackPtr);
+	}
+
+	private static void onFatalError(String errorMessage) {
+		new Thread(() -> Log.fatalErrorCallback.onFatalError(errorMessage)).start();
+	}
+}

src/main/java/it/tdlight/tdlight/Request.java

@@ -15,21 +15,23 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
+
+import it.tdlight.tdnatives.TdApi.Function;
 
 /**
  * A request to the TDLib.
  */
 public class Request {
     private long id;
-    private TdApi.Function function;
+    private Function function;
 
     /**
      * Creates a request with eventId and function.
      * @param id Request identifier. Responses to TDLib requests will have the same id as the corresponding request. Updates from TDLib will have id == 0, incoming requests are thus disallowed to have id == 0.
      * @param function TDLib API function representing a request to TDLib.
      */
-    public Request(long id, TdApi.Function function) {
+    public Request(long id, Function function) {
         this.id = id;
         this.function = function;
     }
@@ -46,7 +48,7 @@ public class Request {
      * Get TDLib API function.
      * @return TDLib API function representing a request to TDLib.
      */
-    public TdApi.Function getFunction() {
+    public Function getFunction() {
         return this.function;
     }
 }

src/main/java/it/tdlight/tdlight/Response.java

@@ -15,21 +15,23 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
+
+import it.tdlight.tdnatives.TdApi.Object;
 
 /**
  * A response to a request, or an incoming update from TDLib.
  */
 public class Response {
     private long id;
-    private TdApi.Object object;
+    private Object object;
 
     /**
      * Creates a response with eventId and object, do not create answers explicitly! you must receive the reply through a client.
      * @param id TDLib request identifier, which corresponds to the response or 0 for incoming updates from TDLib.
      * @param object TDLib API object representing a response to a TDLib request or an incoming update.
      */
-    public Response(long id, TdApi.Object object) {
+    public Response(long id, Object object) {
         this.id = id;
         this.object = object;
     }
@@ -46,7 +48,7 @@ public class Response {
      * Get TDLib API object.
      * @return TDLib API object representing a response to a TDLib request or an incoming update.
      */
-    public TdApi.Object getObject() {
+    public Object getObject() {
         return this.object;
     }
 }

src/main/java/it/tdlight/tdlight/ResponseArray.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
 
 /**
  * An array of incoming updates from TDLib.

src/main/java/it/tdlight/tdlight/TdCallback.java

@@ -15,11 +15,11 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
 
-import it.ernytech.tdlib.utils.CloseCallback;
-import it.ernytech.tdlib.utils.ErrorCallback;
-import it.ernytech.tdlib.utils.ReceiveCallback;
+import it.tdlight.tdlight.utils.CloseCallback;
+import it.tdlight.tdlight.utils.ErrorCallback;
+import it.tdlight.tdlight.utils.ReceiveCallback;
 
 /**
  * Interface of callback for interaction with TDLib.

src/main/java/it/tdlight/tdlight/TelegramClient.java

@@ -1,4 +1,4 @@
-package it.ernytech.tdlib;
+package it.tdlight.tdlight;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/it/tdlight/tdlight/natives/NativeClient.java

@@ -1,3 +1,4 @@
+package it.tdlight.tdlight.natives;
 /*
  * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
  * This file is part of JTdlib.
@@ -15,7 +16,15 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * it.ernytech.tdbot is a group of class for to simplify the creation of bots or userbots.
- */
-package it.ernytech.tdbot;
+
+
+import it.ernytech.tdlib.TdApi.Function;
+import it.ernytech.tdlib.TdApi.Object;
+
+public class NativeClient {
+    protected static native long createNativeClient();
+    protected static native void nativeClientSend(long nativeClientId, long eventId, Function function);
+    protected static native int nativeClientReceive(long nativeClientId, long[] eventIds, Object[] events, double timeout);
+    protected static native Object nativeClientExecute(Function function);
+    protected static native void destroyNativeClient(long nativeClientId);
+}

src/main/java/it/tdlight/tdlight/natives/NativeLog.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
+ * This file is part of JTdlib.
+ *
+ *     JTdlib is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License.
+ *
+ *     JTdlib is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.tdlight.tdlight.natives;
+
+/**
+ * Interface for managing the internal logging of TDLib. By default TDLib writes logs to stderr or an OS specific log and uses a verbosity level of 5.
+ */
+public class NativeLog {
+
+    /**
+     * Sets the path to the file to where the internal TDLib log will be written. By default TDLib writes logs to stderr or an OS specific log. Use this method to write the log to a file instead.
+     * @param filePath Path to a file where the internal TDLib log will be written. Use an empty path to switch back to the default logging behaviour.
+     * @return True on success, or false otherwise, i.e. if the file can't be opened for writing.
+     */
+    public static native boolean setFilePath(String filePath);
+
+    /**
+     * Sets maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated. Unused if log is not written to a file. Defaults to 10 MB.
+     * @param maxFileSize Maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated. Should be positive.
+     */
+    public static native void setMaxFileSize(long maxFileSize);
+
+    /**
+     * Sets the verbosity level of the internal logging of TDLib. By default the TDLib uses a verbosity level of 5 for logging.
+     * @param verbosityLevel New value of the verbosity level for logging. Value 0 corresponds to fatal errors, value 1 corresponds to errors, value 2 corresponds to warnings and debug warnings, value 3 corresponds to informational, value 4 corresponds to debug, value 5 corresponds to verbose debug, value greater than 5 and up to 1024 can be used to enable even more logging.
+     */
+    public static native void setVerbosityLevel(int verbosityLevel);
+}

src/main/java/it/tdlight/tdlight/utils/Arch.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 /**
  * Enumeration with all architectures recognized by this library.

src/main/java/it/tdlight/tdlight/utils/CantLoadLibrary.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 /**
  * An exception that is thrown when the LoadLibrary class fails to load the library.

src/main/java/it/tdlight/tdlight/utils/CloseCallback.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 /**
  * Interface of callback for receive notification of closing Tdlib.

src/main/java/it/tdlight/tdlight/utils/ErrorCallback.java

@@ -15,9 +15,9 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
-import it.ernytech.tdlib.Response;
+import it.tdlight.tdlight.Response;
 
 /**
  * Interface of callback for receive incoming error response.

src/main/java/it/tdlight/tdlight/utils/LoadLibrary.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 import java.io.IOException;
 import java.nio.ByteOrder;

src/main/java/it/tdlight/tdlight/utils/NativeErrorCallback.java

@@ -15,9 +15,9 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
-import it.ernytech.tdlib.Response;
+import it.tdlight.tdlight.Response;
 
 /**
  * Interface of callback for receive incoming error response.

src/main/java/it/tdlight/tdlight/utils/Os.java

@@ -15,7 +15,7 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 /**
  * Enumeration with all operating systems recognized by this library.

src/main/java/it/tdlight/tdlight/utils/ReceiveCallback.java

@@ -15,9 +15,9 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
-import it.ernytech.tdlib.Response;
+import it.tdlight.tdlight.Response;
 
 /**
  * Interface of callback for receive incoming update or request response.

src/main/java/it/tdlight/tdlight/utils/ScannerUtils.java

@@ -1,4 +1,4 @@
-package it.ernytech.tdlib.utils;
+package it.tdlight.tdlight.utils;
 
 import java.io.PrintStream;
 import java.util.Scanner;

src/main/java/it/tdlight/tdnatives/NativeClient.java

@@ -1,3 +1,4 @@
+package it.tdlight.tdlight.natives;
 /*
  * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
  * This file is part of JTdlib.
@@ -15,7 +16,15 @@
  *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * it.ernytech.tdlib is a group of inspired by the classic native C ++ classes of Tdlib Client and Log to interact with the Tdlib API.
- */
-package it.ernytech.tdlib;
+
+
+import it.tdlight.tdnatives.TdApi.Function;
+import it.tdlight.tdnatives.TdApi.Object;
+
+public class NativeClient {
+    protected static native long createNativeClient();
+    protected static native void nativeClientSend(long nativeClientId, long eventId, Function function);
+    protected static native int nativeClientReceive(long nativeClientId, long[] eventIds, Object[] events, double timeout);
+    protected static native Object nativeClientExecute(Function function);
+    protected static native void destroyNativeClient(long nativeClientId);
+}

src/main/java/it/tdlight/tdnatives/NativeLog.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018. Ernesto Castellotti <erny.castell@gmail.com>
+ * This file is part of JTdlib.
+ *
+ *     JTdlib is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License.
+ *
+ *     JTdlib is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public License
+ *     along with JTdlib.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.tdlight.tdlight.natives;
+
+/**
+ * Interface for managing the internal logging of TDLib. By default TDLib writes logs to stderr or an OS specific log and uses a verbosity level of 5.
+ */
+public class NativeLog {
+
+    /**
+     * Sets the path to the file to where the internal TDLib log will be written. By default TDLib writes logs to stderr or an OS specific log. Use this method to write the log to a file instead.
+     * @param filePath Path to a file where the internal TDLib log will be written. Use an empty path to switch back to the default logging behaviour.
+     * @return True on success, or false otherwise, i.e. if the file can't be opened for writing.
+     */
+    public static native boolean setFilePath(String filePath);
+
+    /**
+     * Sets maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated. Unused if log is not written to a file. Defaults to 10 MB.
+     * @param maxFileSize Maximum size of the file to where the internal TDLib log is written before the file will be auto-rotated. Should be positive.
+     */
+    public static native void setMaxFileSize(long maxFileSize);
+
+    /**
+     * Sets the verbosity level of the internal logging of TDLib. By default the TDLib uses a verbosity level of 5 for logging.
+     * @param verbosityLevel New value of the verbosity level for logging. Value 0 corresponds to fatal errors, value 1 corresponds to errors, value 2 corresponds to warnings and debug warnings, value 3 corresponds to informational, value 4 corresponds to debug, value 5 corresponds to verbose debug, value greater than 5 and up to 1024 can be used to enable even more logging.
+     */
+    public static native void setVerbosityLevel(int verbosityLevel);
+}

src/main/jni/build.sh

@@ -2,8 +2,8 @@
 #rm -r jtdlib/jnibuild
 #rm -r jtdlib/build
 
-rm ../java/it/ernytech/tdlib/TdApi.java || true
-rm ../java/it/ernytech/tdlib/new_TdApi.java || true
+rm ../java/it/tdlight/tdlight/natives/TdApi.java || true
+rm ../java/it/tdlight/tdlight/natives/new_TdApi.java || true
 
 export TD_SRC_DIR=${PWD}/td
 export TD_BIN_DIR=${PWD}/jtdlib/td

src/main/jni/jtdlib/CMakeLists.txt

@@ -28,7 +28,7 @@ message(STATUS "Java Source Directory: ${JAVA_SRC_DIR}")
 # Generating TdApi.java
 find_program(PHP_EXECUTABLE php)
 
-set(TD_API_JAVA_PACKAGE "it/ernytech/tdlib")
+set(TD_API_JAVA_PACKAGE "it/tdlight/tdnatives")
 set(TD_API_JAVA_PATH ${JAVA_SRC_DIR})
 set(TD_API_TLO_PATH ${CMAKE_CURRENT_SOURCE_DIR}/td/bin/td/generate/scheme/td_api.tlo)
 set(TD_API_TL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/td/bin/td/generate/scheme/td_api.tl)
@@ -53,7 +53,7 @@ add_custom_target(build_java
 )
 
 add_custom_target(generate_javadoc
-  COMMAND ${Java_JAVADOC_EXECUTABLE} -d ${JAVA_OUTPUT_DIRECTORY}/../docs it.ernytech.tdlib
+  COMMAND ${Java_JAVADOC_EXECUTABLE} -d ${JAVA_OUTPUT_DIRECTORY}/../docs it.tdlight.tdnatives
   WORKING_DIRECTORY ${TD_API_JAVA_PATH}
   COMMENT "Generating Javadoc documentation"
   DEPENDS td_generate_java_api

src/main/jni/jtdlib/sources.txt

@@ -1,15 +1,3 @@
-../../../java/it/ernytech/tdlib/Client.java
-../../../java/it/ernytech/tdlib/TelegramClient.java
-../../../java/it/ernytech/tdlib/utils/Init.java
-../../../java/it/ernytech/tdlib/utils/LoadLibrary.java
-../../../java/it/ernytech/tdlib/utils/Os.java
-../../../java/it/ernytech/tdlib/Log.java
-../../../java/it/ernytech/tdlib/Request.java
-../../../java/it/ernytech/tdlib/Response.java
-../../../java/it/ernytech/tdlib/utils/Arch.java
-../../../java/it/ernytech/tdlib/utils/CantLoadLibrary.java
-../../../java/it/ernytech/tdlib/FatalErrorCallbackPtr.java
-../../../java/it/ernytech/tdbot/ConstructorDetector.java
-../../../java/it/ernytech/tdlib/TdApi.java
-../../../java-templates/it/ernytech/tdlib/utils/LibraryVersion.java
-
+../../../java/it/tdlight/tdnatives/NativeClient.java
+../../../java/it/tdlight/tdnatives/NativeLog.java
+../../../java/it/tdlight/tdnatives/TdApi.java