Skip to content

Dbus java 5.0.0 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
purejava wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Dbus java 5.0.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<!-- 3rd party dependencies -->
<hkdf.version>2.0.0</hkdf.version>
<dbus-java.version>4.3.0</dbus-java.version>
<dbus-java.version>5.0.0</dbus-java.version>
<slf4j.version>2.0.9</slf4j.version>

<!-- test dependencies -->
Expand Down
10 changes: 3 additions & 7 deletions src/main/java/de/swiesend/secretservice/handlers/MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,8 @@ public MessageHandler(DBusConnection connection) {

public Object[] send(String service, String path, String iface, String method, String signature, Object... args) {
try {
org.freedesktop.dbus.messages.Message message = new MethodCall(
service,
path,
iface,
method, (byte) 0, signature, args);

org.freedesktop.dbus.messages.MessageFactory msgFactory = connection.getMessageFactory();
org.freedesktop.dbus.messages.Message message = msgFactory.createMethodCall(service, path, iface, method, (byte) 0, signature, args);
connection.sendMessage(message);

org.freedesktop.dbus.messages.Message response = ((MethodCall) message).getReply(MAX_DELAY_MILLIS);
Expand All @@ -41,7 +37,7 @@ public Object[] send(String service, String path, String iface, String method, S
if (log.isDebugEnabled()) log.debug(Arrays.deepToString(parameters));
}

if (response instanceof org.freedesktop.dbus.errors.Error) {
if (response instanceof org.freedesktop.dbus.messages.Error) {
String error = response.getName();
switch (error) {
case "org.freedesktop.Secret.Error.NoSession":
Expand Down