Skip to content

Commit

Permalink
trying ci fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rexhoffman committed Sep 24, 2023
1 parent 090f04f commit fcb06de
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 3 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/dbus.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>

<!-- Our well-known bus type, do not change this -->
<type>system</type>

<!-- Fork into daemon mode -->
<fork/>

<!-- This is a setuid helper that is used to launch system services -->
<servicehelper>/lib/dbus-1/dbus-daemon-launch-helper</servicehelper>

<!-- Write a pid file -->
<pidfile>/tmp/dbus-pid</pidfile>

<!-- Only listen on a local socket. (abstract=/path/to/socket
means use abstract namespace, don't really create filesystem
file; only Linux supports this. Use path=/whatever on other
systems.) -->
<listen>unix:path=/tmp/test_system_bus_socket</listen>
</busconfig>
4 changes: 2 additions & 2 deletions .setupkeystore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
keyring="$1"

set -x
if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then
export $(dbus-launch)
if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then
export $(dbus-launch) # --config-file=${GITHUB_WORKSPACE}/.github/workflows/dbus.xml)
eval "$(echo '\n' | gnome-keyring-daemon --unlock)"
echo [email protected] | secret-tool store --label="main" email address
PASS=$(secret-tool lookup email address)
Expand Down
18 changes: 18 additions & 0 deletions java-keyring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,24 @@
<dependency>
<groupId>de.swiesend</groupId>
<artifactId>secret-service</artifactId>
<exclusions>
<exclusion>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-transport-native-unixsocket</artifactId>
</exclusion>
<exclusion>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-transport-jnr-unixsocket</artifactId>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-core</artifactId>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import org.freedesktop.dbus.annotations.DBusInterfaceName;
import org.freedesktop.dbus.connections.impl.DBusConnection;
import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
import org.freedesktop.dbus.interfaces.DBusInterface;

import java.io.IOException;
Expand All @@ -43,9 +44,18 @@ public class KWalletBackend implements KeyringBackend {
private DBusConnection connection;
private int id = -1;


public KWalletBackend() throws BackendNotSupportedException {
try {
connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
// connection = DBusConnectionBuilder.forAddress(BusAddress.of(System.getProperty("DBUS_TCP_SESSION")))
// .withRegisterSelf(true)
// .withShared(true)
// .transportConfig()
// .withAdditionalConfig("TIMEOUT", 10000)
// .back()
// .build();

connection = DBusConnectionBuilder.forSessionBus().build();
wallet = connection.getRemoteObject("org.kde.kwalletd5", "/modules/kwalletd5", KWallet.class, true);
wallet.localWallet(); //attempt connection to wallet
} catch (Exception e) {
Expand Down
10 changes: 10 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@
<artifactId>jna-platform</artifactId>
<version>5.13.0</version>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-transport-jnr-unixsocket</artifactId>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java-core</artifactId>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
Expand Down

0 comments on commit fcb06de

Please sign in to comment.