marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated DBusMap

Browse Source
This commit is contained in:
AsamK 2024-09-08 19:22:02 +02:00
parent a0d1b081ff
commit eca3c6fa30
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
graalvm-config-dir/reflect-config.json
View File

@ -799,6 +799,34 @@
"queryAllDeclaredConstructors":true, "queryAllDeclaredConstructors":true,
"methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"pin","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }] "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"pin","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
}, },
{
"name":"org.asamk.signal.dbus.DbusProperties",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalControlImpl",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalImpl",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalConfigurationImpl",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalDeviceImpl",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalGroupImpl",
"queryAllDeclaredMethods":true
},
{
"name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalIdentityImpl",
"queryAllDeclaredMethods":true
},
{ {
"name":"org.asamk.signal.json.JsonAttachment", "name":"org.asamk.signal.json.JsonAttachment",
"allDeclaredFields":true, "allDeclaredFields":true,
@ -1831,6 +1859,10 @@
"name":"org.bouncycastle.pqc.jcajce.provider.XMSS$Mappings", "name":"org.bouncycastle.pqc.jcajce.provider.XMSS$Mappings",
"methods":[{"name":"<init>","parameterTypes":[] }] "methods":[{"name":"<init>","parameterTypes":[] }]
}, },
{
"name":"org.freedesktop.dbus.connections.base.GlobalHandler",
"queryAllDeclaredMethods":true
},
{ {
"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"] }]
@ -1863,7 +1895,7 @@
"name":"org.freedesktop.dbus.interfaces.Properties", "name":"org.freedesktop.dbus.interfaces.Properties",
"allDeclaredMethods":true, "allDeclaredMethods":true,
"allDeclaredClasses":true, "allDeclaredClasses":true,
"methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }] "methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }, {"name":"Set","parameterTypes":["java.lang.String","java.lang.String","java.lang.Object"] }]
}, },
{ {
"name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged", "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",

5
src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
View File

@ -49,7 +49,6 @@ import org.asamk.signal.manager.api.UpdateProfile;
import org.asamk.signal.manager.api.UserStatus; import org.asamk.signal.manager.api.UserStatus;
import org.asamk.signal.manager.api.UsernameLinkUrl; import org.asamk.signal.manager.api.UsernameLinkUrl;
import org.asamk.signal.manager.api.UsernameStatus; import org.asamk.signal.manager.api.UsernameStatus;
import org.freedesktop.dbus.DBusMap;
import org.freedesktop.dbus.DBusPath; import org.freedesktop.dbus.DBusPath;
import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusException;
@ -1063,7 +1062,7 @@ public class DbusManagerImpl implements Manager {
return List.of(); return List.of();
} }
final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments"); final List<Map<String, Variant<?>>> attachments = getValue(extras, "attachments");
return attachments.stream().map(a -> { return attachments.stream().map(a -> {
final String file = a.containsKey("file") ? getValue(a, "file") : null; final String file = a.containsKey("file") ? getValue(a, "file") : null;
return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId") return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")
@ -1090,7 +1089,7 @@ public class DbusManagerImpl implements Manager {
return List.of(); return List.of();
} }
final List<DBusMap<String, Variant<?>>> mentions = getValue(extras, "mentions"); final List<Map<String, Variant<?>>> mentions = getValue(extras, "mentions");
return mentions.stream() return mentions.stream()
.map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")), .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
getValue(a, "start"), getValue(a, "start"),