Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
#	libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java

libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt

@@ -152,6 +152,7 @@ class Address private constructor(address: String) : Parcelable, Comparable<Addr
         val UNKNOWN = Address("Unknown")
         private val TAG = Address::class.java.simpleName
         private val cachedFormatter = AtomicReference<Pair<String, ExternalAddressFormatter>>()
+        @JvmStatic
         fun fromSerialized(serialized: String): Address {
             return Address(serialized)
         }

libsession/src/main/java/org/session/libsession/messaging/utilities/UnidentifiedAccessUtil.kt

@@ -13,7 +13,7 @@ import org.session.libsignal.service.api.crypto.UnidentifiedAccessPair
 
 object UnidentifiedAccessUtil {
     private val TAG = UnidentifiedAccessUtil::class.simpleName
-    private val sodium = LazySodiumAndroid(SodiumAndroid())
+    private val sodium by lazy { LazySodiumAndroid(SodiumAndroid()) }
 
     fun getAccessFor(recipientPublicKey: String): UnidentifiedAccessPair? {
         try {

libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt

@@ -60,10 +60,12 @@ object GroupUtil {
         return groupId.startsWith(MMS_GROUP_PREFIX)
     }
 
+    @JvmStatic
     fun isOpenGroup(groupId: String): Boolean {
         return groupId.startsWith(OPEN_GROUP_PREFIX)
     }
 
+    @JvmStatic
     fun isClosedGroup(groupId: String): Boolean {
         return groupId.startsWith(CLOSED_GROUP_PREFIX)
     }