From: AsamK <asamk@gmx.de>
Date: Sun, 7 Nov 2021 10:04:41 +0000 (+0100)
Subject: Add exportObject helper method
X-Git-Tag: v0.10.0~81
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/82bb4f22f07bae40ff42570d0ada81125adf4392?ds=sidebyside

Add exportObject helper method
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index b68e65b4..7c7b34cc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -97,7 +97,7 @@ public class StorageHelper {
                 (contact == null || !contact.isBlocked()) && contactRecord.isBlocked()
         )) {
             final var newContact = (contact == null ? Contact.newBuilder() : Contact.newBuilder(contact)).withBlocked(
-                    contactRecord.isBlocked())
+                            contactRecord.isBlocked())
                     .withName((contactRecord.getGivenName().or("") + " " + contactRecord.getFamilyName().or("")).trim())
                     .build();
             account.getContactStore().storeContact(recipientId, newContact);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 047b4f99..9f6f1340 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -32,6 +32,7 @@ import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.types.Variant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -839,12 +840,7 @@ public class DbusSignalImpl implements Signal {
         linkedDevices.forEach(d -> {
             final var object = new DbusSignalDeviceImpl(d);
             final var deviceObjectPath = object.getObjectPath();
-            try {
-                connection.exportObject(object);
-                logger.debug("Exported dbus object: " + deviceObjectPath);
-            } catch (DBusException e) {
-                e.printStackTrace();
-            }
+            exportObject(object);
             if (d.isThisDevice()) {
                 thisDevice = new DBusPath(deviceObjectPath);
             }
@@ -876,12 +872,7 @@ public class DbusSignalImpl implements Signal {
 
         groups.forEach(g -> {
             final var object = new DbusSignalGroupImpl(g.groupId());
-            try {
-                connection.exportObject(object);
-                logger.debug("Exported dbus object: " + object.getObjectPath());
-            } catch (DBusException e) {
-                e.printStackTrace();
-            }
+            exportObject(object);
             this.groups.add(new StructGroup(new DBusPath(object.getObjectPath()),
                     g.groupId().serialize(),
                     emptyIfNull(g.title())));
@@ -898,14 +889,9 @@ public class DbusSignalImpl implements Signal {
     }
 
     private void updateConfiguration() {
-        try {
-            unExportConfiguration();
-            final var object = new DbusSignalConfigurationImpl();
-            connection.exportObject(object);
-            logger.debug("Exported dbus object: " + objectPath + "/Configuration");
-        } catch (DBusException e) {
-            e.printStackTrace();
-        }
+        unExportConfiguration();
+        final var object = new DbusSignalConfigurationImpl();
+        exportObject(object);
     }
 
     private void unExportConfiguration() {
@@ -913,6 +899,15 @@ public class DbusSignalImpl implements Signal {
         connection.unExportObject(objectPath);
     }
 
+    private void exportObject(final DBusInterface object) {
+        try {
+            connection.exportObject(object);
+            logger.debug("Exported dbus object: " + object.getObjectPath());
+        } catch (DBusException e) {
+            e.printStackTrace();
+        }
+    }
+
     public class DbusSignalDeviceImpl extends DbusProperties implements Signal.Device {
 
         private final org.asamk.signal.manager.api.Device device;