tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Update tdlib

Browse Source
This commit is contained in:
Andrea Cavalli 2023-01-03 01:50:20 +01:00
parent 484d76a838
commit 0b0de0cd1a
2 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bom/pom.xml
View File

@ -8,8 +8,8 @@
<name>TDLight Java BOM</name>
<properties>
<revision>1.0.0.0-SNAPSHOT</revision>
<nativesRevisionNumber>285</nativesRevisionNumber>
<apiRevisionNumber>283</apiRevisionNumber>
<nativesRevisionNumber>291</nativesRevisionNumber>
<apiRevisionNumber>289</apiRevisionNumber>
<nativesRevisionSuffix/>
<tdlight.natives.version>4.0.${nativesRevisionNumber}${nativesRevisionSuffix}</tdlight.natives.version>
<apiRevisionSuffix/>

49
src/main/java/it/tdlight/common/utils/LoadLibrary.java
View File

@ -192,67 +192,20 @@ public final class LoadLibrary {
System.load(tempFile.toFile().getAbsolutePath());
}
private static Class<?> tryLoadLibraryVersionClass(String classForResource, Os os, Arch arch) throws CantLoadLibrary {
private static Class<?> tryLoadLibraryVersionClass(String classForResource, Os os, Arch arch) {
try {
return Class.forName(classForResource);
} catch (ClassNotFoundException e1) {
// exact library not found
//Check if a wrong version is installed
try {
Class<?> foundAnotherVersion = Class.forName(removeFromVersion(classForResource));
throw new CantLoadLibrary("Can't load the native libraries."
+ " A different version of the native libraries was found."
+ " Please make sure that you installed the correct one."
+ " Required version: " + getRequiredVersionName(os, arch), e1);
} catch (ClassNotFoundException e2) {
// not found arch
//Check if a wrong arch is installed
try {
Class<?> foundAnotherArch = Class.forName(removeFromArch(classForResource));
throw new CantLoadLibrary("Can't load the native libraries."
+ " A different architecture of the native libraries was found."
+ " Please make sure that you installed the correct one."
+ " Required version: " + getRequiredVersionName(os, arch), e1);
} catch (ClassNotFoundException e3) {
// not found os
//Check if a wrong os is installed
try {
Class<?> foundAnotherOs = Class.forName(removeFromOs(classForResource));
throw new CantLoadLibrary("Can't load the native libraries."
+ " A different OS of the native libraries was found."
+ " Please make sure that you installed the correct one."
+ " Required version: " + getRequiredVersionName(os, arch), e1);
} catch (ClassNotFoundException e4) {
// not found anything
// No library was found, return
return null;
}
}
}
}
}
private static String getRequiredVersionName(Os os, Arch arch) {
return LibraryVersion.IMPLEMENTATION_NAME + " " + os.toString().toLowerCase() + " " + arch.toString().toLowerCase()
+ " " + LibraryVersion.NATIVES_VERSION;
}
private static String removeFromVersion(String libraryVersionClass) {
return removeLastPackageParts(libraryVersionClass, 1, "AnyVersion");
}
private static String removeFromArch(String libraryVersionClass) {
return removeLastPackageParts(libraryVersionClass, 2, "AnyArch");
}
private static String removeFromOs(String libraryVersionClass) {
return removeLastPackageParts(libraryVersionClass, 3, "AnyOs");
}
private static Arch getCpuArch() {
String architecture = System.getProperty("os.arch").trim();
switch (architecture) {