mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-29 10:30:38 +00:00
Update hypfvieh dbus-java 4.0 beta which uses native java unix sockets
Fixes #673 Fixes #632
This commit is contained in:
parent
53b84bad02
commit
fa5c09d23b
5 changed files with 27 additions and 134 deletions
|
@ -30,12 +30,15 @@ graalvmNative {
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url = uri("https://raw.github.com/AsamK/maven/master/releases/")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.bouncycastle:bcprov-jdk15on:1.69")
|
implementation("org.bouncycastle:bcprov-jdk15on:1.69")
|
||||||
implementation("net.sourceforge.argparse4j:argparse4j:0.9.0")
|
implementation("net.sourceforge.argparse4j:argparse4j:0.9.0")
|
||||||
implementation("com.github.hypfvieh:dbus-java:3.3.1")
|
implementation("com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.0.0-beta")
|
||||||
implementation("org.slf4j:slf4j-simple:1.7.32")
|
implementation("org.slf4j:slf4j-simple:1.7.32")
|
||||||
implementation("org.slf4j", "jul-to-slf4j", "1.7.32")
|
implementation("org.slf4j", "jul-to-slf4j", "1.7.32")
|
||||||
implementation(project(":lib"))
|
implementation(project(":lib"))
|
||||||
|
|
|
@ -1,4 +1,13 @@
|
||||||
[
|
[
|
||||||
|
{
|
||||||
|
"name":"com.sun.security.auth.module.UnixSystem",
|
||||||
|
"fields":[
|
||||||
|
{"name":"gid"},
|
||||||
|
{"name":"groups"},
|
||||||
|
{"name":"uid"},
|
||||||
|
{"name":"username"}
|
||||||
|
]}
|
||||||
|
,
|
||||||
{
|
{
|
||||||
"name":"java.lang.Boolean",
|
"name":"java.lang.Boolean",
|
||||||
"methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]}
|
"methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]}
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
{
|
{
|
||||||
"interfaces":["org.asamk.Signal"]}
|
"interfaces":["org.asamk.Signal"]}
|
||||||
,
|
,
|
||||||
|
{
|
||||||
|
"interfaces":["org.asamk.Signal$Group"]}
|
||||||
|
,
|
||||||
{
|
{
|
||||||
"interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
|
"interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
|
||||||
|
|
||||||
|
|
|
@ -61,26 +61,6 @@
|
||||||
"name":"com.google.protobuf.PrimitiveNonBoxingCollection",
|
"name":"com.google.protobuf.PrimitiveNonBoxingCollection",
|
||||||
"allDeclaredMethods":true}
|
"allDeclaredMethods":true}
|
||||||
,
|
,
|
||||||
{
|
|
||||||
"name":"com.kenai.jffi.Invoker",
|
|
||||||
"methods":[
|
|
||||||
{"name":"invokeI6","parameterTypes":["com.kenai.jffi.CallContext","long","int","int","int","int","int","int"] },
|
|
||||||
{"name":"invokeL6","parameterTypes":["com.kenai.jffi.CallContext","long","long","long","long","long","long","long"] },
|
|
||||||
{"name":"invokeN6","parameterTypes":["com.kenai.jffi.CallContext","long","long","long","long","long","long","long"] }
|
|
||||||
]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"com.kenai.jffi.Version",
|
|
||||||
"fields":[
|
|
||||||
{"name":"MAJOR"},
|
|
||||||
{"name":"MICRO"},
|
|
||||||
{"name":"MINOR"}
|
|
||||||
]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"com.kenai.jffi.internal.StubLoader",
|
|
||||||
"methods":[{"name":"isLoaded","parameterTypes":[] }]}
|
|
||||||
,
|
|
||||||
{
|
{
|
||||||
"name":"com.sun.crypto.provider.AESCipher$General",
|
"name":"com.sun.crypto.provider.AESCipher$General",
|
||||||
"methods":[{"name":"<init>","parameterTypes":[] }]}
|
"methods":[{"name":"<init>","parameterTypes":[] }]}
|
||||||
|
@ -288,90 +268,6 @@
|
||||||
"name":"javax.security.auth.x500.X500Principal",
|
"name":"javax.security.auth.x500.X500Principal",
|
||||||
"methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]}
|
"methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]}
|
||||||
,
|
,
|
||||||
{
|
|
||||||
"name":"jnr.constants.platform.linux.ProtocolFamily"}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.constants.platform.linux.Shutdown"}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.constants.platform.linux.Sock"}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.constants.platform.linux.SocketLevel"}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.constants.platform.linux.SocketOption"}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.enxio.channels.Native$LibC",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.enxio.channels.Native$LibC$jnr$ffi$1",
|
|
||||||
"methods":[{"name":"<init>","parameterTypes":["jnr.ffi.Runtime","jnr.ffi.provider.jffi.NativeLibrary","java.lang.Object[]"] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.Pointer",
|
|
||||||
"allDeclaredMethods":true,
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.StructLayout$gid_t",
|
|
||||||
"methods":[{"name":"<init>","parameterTypes":["jnr.ffi.StructLayout"] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.byref.IntByReference",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.converters.ByReferenceParameterConverter",
|
|
||||||
"methods":[{"name":"nativeType","parameterTypes":[] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.converters.ByReferenceParameterConverter$Out",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.converters.StringResultConverter",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.converters.StructByReferenceToNativeConverter",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.jffi.BufferParameterStrategy",
|
|
||||||
"methods":[{"name":"address","parameterTypes":["java.nio.Buffer"] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.jffi.PointerParameterStrategy",
|
|
||||||
"methods":[{"name":"address","parameterTypes":["jnr.ffi.Pointer"] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.jffi.Provider",
|
|
||||||
"methods":[{"name":"<init>","parameterTypes":[] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.ffi.provider.jffi.platform.x86_64.linux.TypeAliases",
|
|
||||||
"fields":[{"name":"ALIASES"}]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.posix.Timeval",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.unixsocket.Native$LibC",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.unixsocket.Native$LibC$jnr$ffi$0",
|
|
||||||
"methods":[{"name":"<init>","parameterTypes":["jnr.ffi.Runtime","jnr.ffi.provider.jffi.NativeLibrary","java.lang.Object[]"] }]}
|
|
||||||
,
|
|
||||||
{
|
|
||||||
"name":"jnr.unixsocket.SockAddrUnix",
|
|
||||||
"allPublicMethods":true}
|
|
||||||
,
|
|
||||||
{
|
{
|
||||||
"name":"long",
|
"name":"long",
|
||||||
"allDeclaredMethods":true,
|
"allDeclaredMethods":true,
|
||||||
|
@ -408,7 +304,8 @@
|
||||||
{
|
{
|
||||||
"name":"org.asamk.Signal$MessageReceivedV2",
|
"name":"org.asamk.Signal$MessageReceivedV2",
|
||||||
"queryAllDeclaredConstructors":true,
|
"queryAllDeclaredConstructors":true,
|
||||||
"queryAllPublicConstructors":true}
|
"queryAllPublicConstructors":true,
|
||||||
|
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","long","java.lang.String","byte[]","java.lang.String","java.util.Map"] }]}
|
||||||
,
|
,
|
||||||
{
|
{
|
||||||
"name":"org.asamk.Signal$ReceiptReceived",
|
"name":"org.asamk.Signal$ReceiptReceived",
|
||||||
|
@ -418,7 +315,8 @@
|
||||||
{
|
{
|
||||||
"name":"org.asamk.Signal$ReceiptReceivedV2",
|
"name":"org.asamk.Signal$ReceiptReceivedV2",
|
||||||
"queryAllDeclaredConstructors":true,
|
"queryAllDeclaredConstructors":true,
|
||||||
"queryAllPublicConstructors":true}
|
"queryAllPublicConstructors":true,
|
||||||
|
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","long","java.lang.String","java.lang.String","java.util.Map"] }]}
|
||||||
,
|
,
|
||||||
{
|
{
|
||||||
"name":"org.asamk.Signal$StructDevice",
|
"name":"org.asamk.Signal$StructDevice",
|
||||||
|
@ -759,7 +657,6 @@
|
||||||
"queryAllDeclaredConstructors":true,
|
"queryAllDeclaredConstructors":true,
|
||||||
"methods":[
|
"methods":[
|
||||||
{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] },
|
{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] },
|
||||||
{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] },
|
|
||||||
{"name":"linkPreviews","parameterTypes":[] },
|
{"name":"linkPreviews","parameterTypes":[] },
|
||||||
{"name":"phoneNumberSharingMode","parameterTypes":[] },
|
{"name":"phoneNumberSharingMode","parameterTypes":[] },
|
||||||
{"name":"phoneNumberUnlisted","parameterTypes":[] },
|
{"name":"phoneNumberUnlisted","parameterTypes":[] },
|
||||||
|
@ -796,11 +693,6 @@
|
||||||
"allDeclaredMethods":true,
|
"allDeclaredMethods":true,
|
||||||
"allDeclaredConstructors":true}
|
"allDeclaredConstructors":true}
|
||||||
,
|
,
|
||||||
{
|
|
||||||
"name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$Group",
|
|
||||||
"allDeclaredFields":true,
|
|
||||||
"allDeclaredMethods":true}
|
|
||||||
,
|
|
||||||
{
|
{
|
||||||
"name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1",
|
"name":"org.asamk.signal.manager.storage.groups.GroupStore$Storage$GroupV1",
|
||||||
"allDeclaredFields":true,
|
"allDeclaredFields":true,
|
||||||
|
@ -1322,6 +1214,10 @@
|
||||||
"name":"org.freedesktop.dbus.errors.ServiceUnknown",
|
"name":"org.freedesktop.dbus.errors.ServiceUnknown",
|
||||||
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
|
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
|
||||||
,
|
,
|
||||||
|
{
|
||||||
|
"name":"org.freedesktop.dbus.errors.UnknownMethod",
|
||||||
|
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
|
||||||
|
,
|
||||||
{
|
{
|
||||||
"name":"org.freedesktop.dbus.errors.UnknownObject",
|
"name":"org.freedesktop.dbus.errors.UnknownObject",
|
||||||
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
|
"methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]}
|
||||||
|
@ -1349,9 +1245,6 @@
|
||||||
"name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
|
"name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
|
||||||
"allPublicConstructors":true}
|
"allPublicConstructors":true}
|
||||||
,
|
,
|
||||||
{
|
|
||||||
"name":"org.objectweb.asm.util.TraceMethodVisitor"}
|
|
||||||
,
|
|
||||||
{
|
{
|
||||||
"name":"org.signal.storageservice.protos.groups.AccessControl",
|
"name":"org.signal.storageservice.protos.groups.AccessControl",
|
||||||
"fields":[
|
"fields":[
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{
|
{
|
||||||
"resources":{
|
"resources":{
|
||||||
"includes":[
|
"includes":[
|
||||||
|
{
|
||||||
|
"pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
|
"pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
|
||||||
},
|
},
|
||||||
|
@ -97,24 +100,6 @@
|
||||||
{
|
{
|
||||||
"pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
|
"pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/ConstantSet.class\\E"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/platform/linux/ProtocolFamily.class\\E"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/platform/linux/Shutdown.class\\E"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/platform/linux/Sock.class\\E"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/platform/linux/SocketLevel.class\\E"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern":"\\Qjnr/constants/platform/linux/SocketOption.class\\E"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"pattern":"\\Qlibsignal_jni.so\\E"
|
"pattern":"\\Qlibsignal_jni.so\\E"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue