From 83a7e0cad01230a2cd302189b7c25817e8bfca0e Mon Sep 17 00:00:00 2001
From: Johan Vos <johan@lodgon.com>
Date: Sun, 5 Sep 2021 14:50:37 +0200
Subject: [PATCH 1/2] make this compile with Java 11

---
 java/pom.xml                                  | 142 ++++++++++++++++++
 .../api/crypto/SignalServiceCipher.java       |   2 +-
 .../crypto/ContactDiscoveryCipher.java        |   8 +-
 3 files changed, 145 insertions(+), 7 deletions(-)
 create mode 100755 java/pom.xml

diff --git a/java/pom.xml b/java/pom.xml
new file mode 100755
index 0000000000..b456a07825
--- /dev/null
+++ b/java/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.whispersystems</groupId>
+    <artifactId>signal-service-java</artifactId>
+    <version>2.15.4-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>webscheduler</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>Gluon</id>
+            <url>https://nexus.gluonhq.com/nexus/content/repositories/releases</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+          <groupId>org.whispersystems</groupId>
+          <artifactId>signal-client-java</artifactId>
+          <version>0.8.4</version>
+        </dependency>
+        <dependency>
+          <groupId>com.googlecode.libphonenumber</groupId>
+          <artifactId>libphonenumber</artifactId>
+          <version>8.10.7</version>
+        </dependency>
+        <dependency>
+          <groupId>org.whispersystems</groupId>
+          <artifactId>curve25519-java</artifactId>
+          <version>0.5.0</version>
+        </dependency>
+        <dependency>
+          <groupId>org.signal</groupId>
+          <artifactId>signal-metadata-java</artifactId>
+          <version>0.1.2</version>
+        </dependency>
+        <dependency>
+          <groupId>com.squareup.okhttp3</groupId>
+          <artifactId>okhttp</artifactId>
+          <version>3.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.conscrypt</groupId>
+      <artifactId>conscrypt-openjdk-uber</artifactId>
+      <version>2.0.0</version>
+      <scope>test</scope>
+    </dependency>
+<!--
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.5.2</version>
+    </dependency>
+-->
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+
+        <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-deploy-plugin</artifactId>
+           <version>2.7</version>
+           <configuration>
+             <skip>false</skip>
+           </configuration>
+         </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-javadoc-plugin</artifactId>
+           <version>2.9</version>
+           <configuration>
+             <skip>false</skip>
+           </configuration>
+         </plugin>
+  <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <version>0.6.1</version>
+        <configuration>
+          <protocExecutable>/usr/bin/protoc</protocExecutable>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/java/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/java/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
index d7cc397c27..8779aedb25 100644
--- a/java/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
+++ b/java/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
@@ -250,7 +250,7 @@ private Plaintext decrypt(SignalServiceEnvelope envelope, byte[] ciphertext)
       } else if (envelope.isUnidentifiedSender()) {
         SealedSessionCipher   sealedSessionCipher = new SealedSessionCipher(signalProtocolStore, localAddress.getUuid().orNull(), localAddress.getNumber().orNull(), 1);
         DecryptionResult      result              = sealedSessionCipher.decrypt(certificateValidator, ciphertext, envelope.getServerTimestamp());
-        SignalServiceAddress  resultAddress       = new SignalServiceAddress(UuidUtil.parse(result.getSenderUuid().orNull()), result.getSenderE164());
+        SignalServiceAddress  resultAddress       = new SignalServiceAddress(UuidUtil.parse(result.getSenderUuid()), result.getSenderE164());
         SignalProtocolAddress protocolAddress     = getPreferredProtocolAddress(signalProtocolStore, resultAddress, result.getDeviceId());
 
         paddedMessage  = result.getPaddedMessage();
diff --git a/java/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java b/java/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java
index 1e3e46efc5..a138cefb8e 100644
--- a/java/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java
+++ b/java/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/ContactDiscoveryCipher.java
@@ -1,12 +1,8 @@
 package org.whispersystems.signalservice.internal.contacts.crypto;
 
 
-import org.threeten.bp.Instant;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.Period;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZonedDateTime;
-import org.threeten.bp.format.DateTimeFormatter;
+import java.time.*;
+import java.time.format.*;
 import org.whispersystems.libsignal.util.ByteUtil;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.internal.contacts.entities.DiscoveryRequest;

From 6e9d375bc61eeb2d52a0e01ca14127825fa2483a Mon Sep 17 00:00:00 2001
From: Johan Vos <johan@lodgon.com>
Date: Wed, 8 Sep 2021 11:46:43 +0200
Subject: [PATCH 2/2] Use correct name for the artifact.

---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index b456a07825..a8fe4fd395 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -7,7 +7,7 @@
     <version>2.15.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>webscheduler</name>
+    <name>signal-service-java</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>