From a6f961babdaa8e76ebc7f3bb3e4d9099b71525a7 Mon Sep 17 00:00:00 2001
From: Matus Kosut <matus.kosut@ntnu.no>
Date: Sat, 16 May 2020 20:14:03 +0200
Subject: [PATCH] send message when expiration time is changed for contact

---
 .../signal/commands/UpdateContactCommand.java      |  5 +++++
 .../java/org/asamk/signal/manager/Manager.java     | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index e188f010..ae84893d 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,6 +3,8 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+import java.io.IOException;
+
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
@@ -41,6 +43,9 @@ public class UpdateContactCommand implements LocalCommand {
             }
         } catch (InvalidNumberException e) {
             System.out.println("Invalid contact number: " + e.getMessage());
+        } catch (IOException e) {
+            System.err.println("Update contact error: " + e.getMessage());
+            return 3;
         }
 
         return 0;
diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 4e701239..cb293f93 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -810,17 +810,21 @@ public class Manager implements Signal, Closeable {
     /**
      * Change the expiration timer for a contact
      */
-    public void setExpirationTimer(SignalServiceAddress address, int messageExpirationTimer) {
-        ContactInfo c = account.getContactStore().getContact(address);
-        c.messageExpirationTime = messageExpirationTimer;
-        account.getContactStore().updateContact(c);
+    public void setExpirationTimer(SignalServiceAddress address, int messageExpirationTimer) throws IOException {
+        final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder();
+        ContactInfo contact = account.getContactStore().getContact(address);
+        contact.messageExpirationTime = messageExpirationTimer;
+        account.getContactStore().updateContact(contact);
         account.save();
+        messageBuilder.withExpiration(messageExpirationTimer);
+        messageBuilder.asExpirationUpdate();
+        sendMessage(messageBuilder, Collections.singleton(address));
     }
 
     /**
      * Change the expiration timer for a contact
      */
-    public void setExpirationTimer(String number, int messageExpirationTimer) throws InvalidNumberException {
+    public void setExpirationTimer(String number, int messageExpirationTimer) throws IOException, InvalidNumberException {
         SignalServiceAddress address = canonicalizeAndResolveSignalServiceAddress(number);
         setExpirationTimer(address, messageExpirationTimer);
     }