Merge branch 'dev' of https://github.com/loki-project/session-android into specific-group-updates

libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt

@@ -6,7 +6,9 @@ import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
 import org.session.libsession.messaging.MessagingConfiguration
 import org.session.libsignal.utilities.logging.Log
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.schedule
 import kotlin.math.min
 import kotlin.math.pow
@@ -16,6 +18,8 @@ import kotlin.math.roundToLong
 class JobQueue : JobDelegate {
     private var hasResumedPendingJobs = false // Just for debugging
 
+    private val jobTimestampMap = ConcurrentHashMap<Long, AtomicInteger>()
+
     private val dispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
     private val scope = GlobalScope + SupervisorJob()
     private val queue = Channel<Job>(UNLIMITED)
@@ -44,7 +48,14 @@ class JobQueue : JobDelegate {
     }
 
     private fun addWithoutExecuting(job: Job) {
-        job.id = System.currentTimeMillis().toString()
+        // When adding multiple jobs in rapid succession, timestamps might not be good enough as a unique ID. To
+        // deal with this we keep track of the number of jobs with a given timestamp and that to the end of the
+        // timestamp to make it a unique ID. We can't use a random number because we do still want to keep track
+        // of the order in which the jobs were added.
+        val currentTime = System.currentTimeMillis()
+        jobTimestampMap.putIfAbsent(currentTime, AtomicInteger())
+        job.id = jobTimestampMap[currentTime]!!.getAndIncrement().toString()
+
         MessagingConfiguration.shared.storage.persistJob(job)
     }
 

libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java

@@ -58,6 +58,7 @@ public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {
                                    @Nullable final Attachment avatar,
                                    long sentTime,
                                    long expireIn,
+                                   boolean expirationUpdate,
                                    @Nullable QuoteModel quote,
                                    @NonNull List<Contact> contacts,
                                    @NonNull List<LinkPreview> previews)
@@ -65,7 +66,7 @@ public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {
     super(recipient, Base64.encodeBytes(group.toByteArray()),
           new LinkedList<Attachment>() {{if (avatar != null) add(avatar);}},
           sentTime,
-          DistributionTypes.CONVERSATION, expireIn, false, quote, contacts, previews);
+          DistributionTypes.CONVERSATION, expireIn, expirationUpdate, quote, contacts, previews);
 
     this.group = group;
   }

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

@@ -78,6 +78,11 @@ object GroupUtil {
         return getEncodedClosedGroupID(getEncodedClosedGroupID(Hex.fromStringCondensed(groupPublicKey)).toByteArray())
     }
 
+    @JvmStatic
+    fun doubleEncodeGroupID(groupID: ByteArray): String {
+        return getEncodedClosedGroupID(getEncodedClosedGroupID(groupID).toByteArray())
+    }
+
     @JvmStatic
     @Throws(IOException::class)
     fun doubleDecodeGroupID(groupID: String): ByteArray {