fix closed groups & clean

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.Util;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java

@@ -12,7 +12,7 @@ import android.util.Pair;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
-import org.session.libsession.utilities.ThreadUtils;
+import org.session.libsignal.service.loki.utilities.ThreadUtils;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.concurrent.ListenableFuture;
 import org.session.libsession.utilities.concurrent.SettableFuture;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -901,7 +901,7 @@ public class ConversationItem extends LinearLayout
       // Show custom display names for group chats
       String displayName = recipient.toShortString();
       try {
-        String serverId = GroupUtil.getDecodedGroupID(conversationRecipient.getAddress().serialize().getBytes());
+        String serverId = GroupUtil.getDecodedGroupID(conversationRecipient.getAddress().serialize());
         String senderDisplayName = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(serverId, recipient.getAddress().serialize());
         if (senderDisplayName != null) { displayName = senderDisplayName; }
       } catch (Exception e) {

app/src/main/java/org/thoughtcrime/securesms/crypto/DatabaseSecret.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 
 import java.io.IOException;
 

app/src/main/java/org/thoughtcrime/securesms/crypto/MasterCipher.java

@@ -25,7 +25,7 @@ import org.session.libsignal.libsignal.ecc.ECPrivateKey;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.session.libsession.utilities.Base64;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;

app/src/main/java/org/thoughtcrime/securesms/crypto/PublicKey.java

@@ -18,7 +18,7 @@
 package org.thoughtcrime.securesms.crypto;
 
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.Util;
 import org.session.libsignal.libsignal.InvalidKeyException;
 import org.session.libsignal.libsignal.ecc.Curve;

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -205,7 +205,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     contentValues.put(AVATAR_RELAY, relay);
     contentValues.put(TIMESTAMP, System.currentTimeMillis());
     contentValues.put(ACTIVE, 1);
-    contentValues.put(MMS, GroupUtil.INSTANCE.isMmsGroup(groupId));
+    contentValues.put(MMS, GroupUtil.isMmsGroup(groupId));
 
     if (admins != null) {
       contentValues.put(ADMINS, Address.Companion.toSerializedList(admins, ','));

app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java

@@ -40,7 +40,7 @@ import java.util.Set;
 public class GroupManager {
 
   public static long getOpenGroupThreadID(String id, @NonNull  Context context) {
-    final String groupID = GroupUtil.getEncodedOpenGroupID(id);
+    final String groupID = GroupUtil.getEncodedOpenGroupID(id.getBytes());
     return getThreadIDFromGroupID(groupID, context);
   }
 
@@ -90,7 +90,7 @@ public class GroupManager {
                                                            @Nullable Bitmap  avatar,
                                                            @Nullable String  name)
   {
-    final String groupID = GroupUtil.getEncodedOpenGroupID(id);
+    final String groupID = GroupUtil.getEncodedOpenGroupID(id.getBytes());
     return createLokiGroup(groupID, context, avatar, name);
   }
 

app/src/main/java/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java

@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.session.libsession.utilities.Base64;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsession.utilities.Util;
 
 import java.io.File;

app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.libsignal.util.guava.Optional;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;

app/src/main/java/org/thoughtcrime/securesms/jobs/MmsSendJob.java

@@ -39,7 +39,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsession.utilities.NumberUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java

@@ -97,7 +97,7 @@ import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.libsignal.loki.SessionResetProtocol;
@@ -1268,7 +1268,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
   private Recipient getMessageDestination(SignalServiceContent content, SignalServiceDataMessage message) {
     if (message.getGroupInfo().isPresent()) {
-      return Recipient.from(context, Address.Companion.fromExternal(context, GroupUtil.getEncodedId(message.getGroupInfo().get())), false);
+      return Recipient.from(context, Address.Companion.fromExternal(context, GroupUtil.getEncodedClosedGroupID(message.getGroupInfo().get().getGroupId())), false);
     } else {
       return Recipient.from(context, Address.Companion.fromExternal(context, content.getSender()), false);
     }

app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java

@@ -16,7 +16,6 @@ import org.session.libsession.utilities.Util;
 
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.TextSecureExpiredException;
 import org.thoughtcrime.securesms.contactshare.ContactModelMapper;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.session.libsession.messaging.threads.Address;
@@ -31,7 +30,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.session.libsignal.libsignal.util.guava.Optional;
 import org.session.libsignal.service.api.crypto.UnidentifiedAccessPair;

app/src/main/java/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.session.libsignal.service.api.push.exceptions.PushNetworkException;
 

app/src/main/java/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.session.libsignal.service.api.messages.SignalServiceStickerManifest;

app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java

@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.service.UpdateApkReadyListener;
 import org.thoughtcrime.securesms.util.FileUtils;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsession.utilities.JsonUtils;
 import org.session.libsession.utilities.TextSecurePreferences;
 

app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java

@@ -6,8 +6,6 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.text.Html;
-import android.text.TextUtils;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.google.android.gms.common.util.IOUtils;
@@ -25,7 +23,7 @@ import org.thoughtcrime.securesms.net.RequestController;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
 import org.thoughtcrime.securesms.stickers.StickerUrl;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.libsignal.util.Pair;
@@ -43,10 +41,7 @@ import org.session.libsession.utilities.concurrent.SignalExecutors;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.inject.Inject;
 

app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt

@@ -118,7 +118,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
             loaderContainer.fadeOut()
             isLoading = false
             val threadID = DatabaseFactory.getThreadDatabase(this).getOrCreateThreadIdFor(Recipient.from(this, Address.fromSerialized(groupID), false))
-            if (!isFinishing) {
+             if (!isFinishing) {
                 openConversationActivity(this, threadID, Recipient.from(this, Address.fromSerialized(groupID), false))
                 finish()
             }

app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.loki.utilities.KeyPairUtilities
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.thoughtcrime.securesms.loki.utilities.push
 import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.libsignal.util.KeyHelper
 import org.session.libsignal.service.loki.crypto.MnemonicCodec

app/src/main/java/org/thoughtcrime/securesms/loki/api/SessionProtocolImpl.kt

@@ -6,8 +6,10 @@ import com.goterl.lazycode.lazysodium.LazySodiumAndroid
 import com.goterl.lazycode.lazysodium.SodiumAndroid
 import com.goterl.lazycode.lazysodium.interfaces.Box
 import com.goterl.lazycode.lazysodium.interfaces.Sign
+
+import org.session.libsession.utilities.Hex
+
 import org.session.libsignal.libsignal.ecc.ECKeyPair
-import org.session.libsignal.libsignal.util.Hex
 import org.session.libsignal.service.loki.api.crypto.SessionProtocol
 import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt

@@ -15,7 +15,7 @@ import org.session.libsignal.service.loki.protocol.shelved.multidevice.DeviceLin
 import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
 import org.session.libsignal.service.loki.utilities.toHexString
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import org.session.libsession.utilities.TextSecurePreferences
 import java.util.*
 

app/src/main/java/org/thoughtcrime/securesms/loki/database/SharedSenderKeysDatabase.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.*
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupRatchet
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupRatchetCollectionType
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupSenderKey

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt

@@ -9,8 +9,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.BaseJob
 import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.loki.utilities.recipient
-import org.thoughtcrime.securesms.util.Hex
-import org.session.libsignal.libsignal.SignalProtocolAddress
+import org.session.libsession.utilities.Hex
 import org.session.libsignal.service.api.push.SignalServiceAddress
 import org.session.libsignal.service.internal.push.SignalServiceProtos
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupSenderKey

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJobV2.kt

@@ -16,13 +16,12 @@ import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
 import org.session.libsignal.service.loki.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
-import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.BaseJob
 import org.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.loki.utilities.recipient
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 
 import java.util.*
 import java.util.concurrent.TimeUnit

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.loki.utilities.get
 import org.thoughtcrime.securesms.loki.utilities.getAll
 import org.thoughtcrime.securesms.loki.utilities.getString
 import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
 import org.session.libsignal.libsignal.ecc.DjbECPublicKey
 import org.session.libsignal.libsignal.ecc.ECKeyPair

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt

@@ -9,18 +9,10 @@ import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.threads.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.libsignal.ecc.Curve
-import org.session.libsignal.libsignal.util.guava.Optional
-import org.session.libsignal.service.api.messages.SignalServiceGroup
-import org.session.libsignal.service.api.messages.SignalServiceGroup.GroupType
-import org.session.libsignal.service.internal.push.SignalServiceProtos
 import org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext
-import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupRatchet
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupRatchetCollectionType
 import org.session.libsignal.service.loki.protocol.closedgroups.ClosedGroupSenderKey
 import org.session.libsignal.service.loki.protocol.closedgroups.SharedSenderKeysImplementation
-import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey
-import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.session.libsignal.service.loki.utilities.toHexString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
@@ -29,10 +21,8 @@ import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGroupOperation
 import org.thoughtcrime.securesms.loki.utilities.recipient
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage
-import org.thoughtcrime.securesms.sms.IncomingGroupMessage
-import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.thoughtcrime.securesms.sms.MessageSender
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import java.io.IOException
 import java.util.*
 
@@ -306,7 +296,7 @@ object ClosedGroupsProtocol {
     @JvmStatic
     @Throws(IOException::class)
     fun doubleEncodeGroupID(groupPublicKey: String): String {
-        return GroupUtil.getEncodedClosedGroupID(GroupUtil.getEncodedClosedGroupID(groupPublicKey))
+        return GroupUtil.getEncodedClosedGroupID(GroupUtil.getEncodedClosedGroupID(Hex.fromStringCondensed(groupPublicKey)).toByteArray())
     }
 
     @JvmStatic

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt

@@ -23,12 +23,13 @@ import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage
 import org.thoughtcrime.securesms.sms.IncomingGroupMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.threads.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsignal.service.loki.utilities.ThreadUtils
 
 import java.io.IOException
 import java.util.*
@@ -45,7 +46,7 @@ object ClosedGroupsProtocolV2 {
 
     public fun createClosedGroup(context: Context, name: String, members: Collection<String>): Promise<String, Exception> {
         val deferred = deferred<String, Exception>()
-        Thread {
+        ThreadUtils.queue {
             // Prepare
             val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
             val membersAsData = members.map { Hex.fromStringCondensed(it) }
@@ -80,7 +81,7 @@ object ClosedGroupsProtocolV2 {
             LokiPushNotificationManager.performOperation(context, ClosedGroupOperation.Subscribe, groupPublicKey, userPublicKey)
             // Fulfill the promise
             deferred.resolve(groupID)
-        }.start()
+        }
         // Return
         return deferred.promise
     }
@@ -109,7 +110,7 @@ object ClosedGroupsProtocolV2 {
 
     public fun update(context: Context, groupPublicKey: String, members: Collection<String>, name: String): Promise<Unit, Exception> {
         val deferred = deferred<Unit, Exception>()
-        Thread {
+        ThreadUtils.queue {
             val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
             val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
             val groupDB = DatabaseFactory.getGroupDatabase(context)
@@ -117,7 +118,7 @@ object ClosedGroupsProtocolV2 {
             val group = groupDB.getGroup(groupID).orNull()
             if (group == null) {
                 Log.d("Loki", "Can't update nonexistent closed group.")
-                return@Thread deferred.reject(Error.NoThread)
+                return@queue deferred.reject(Error.NoThread)
             }
             val oldMembers = group.members.map { it.serialize() }.toSet()
             val newMembers = members.minus(oldMembers)
@@ -127,18 +128,18 @@ object ClosedGroupsProtocolV2 {
             val encryptionKeyPair = apiDB.getLatestClosedGroupEncryptionKeyPair(groupPublicKey)
             if (encryptionKeyPair == null) {
                 Log.d("Loki", "Couldn't get encryption key pair for closed group.")
-                return@Thread deferred.reject(Error.NoKeyPair)
+                return@queue deferred.reject(Error.NoKeyPair)
             }
             val removedMembers = oldMembers.minus(members)
             if (removedMembers.contains(admins.first()) && members.isNotEmpty()) {
                 Log.d("Loki", "Can't remove admin from closed group unless the group is destroyed entirely.")
-                return@Thread deferred.reject(Error.InvalidUpdate)
+                return@queue deferred.reject(Error.InvalidUpdate)
             }
             val isUserLeaving = removedMembers.contains(userPublicKey)
             if (isUserLeaving && members.isNotEmpty()) {
                 if (removedMembers.count() != 1 || newMembers.isNotEmpty()) {
                     Log.d("Loki", "Can't remove self and add or remove others simultaneously.")
-                    return@Thread deferred.reject(Error.InvalidUpdate)
+                    return@queue deferred.reject(Error.InvalidUpdate)
                 }
             }
             // Send the update to the group
@@ -184,7 +185,7 @@ object ClosedGroupsProtocolV2 {
             val threadID = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(Recipient.from(context, Address.fromSerialized(groupID), false))
             insertOutgoingInfoMessage(context, groupID, infoType, name, members, admins, threadID)
             deferred.resolve(Unit)
-        }.start()
+        }
         return deferred.promise
     }
 
@@ -407,7 +408,7 @@ object ClosedGroupsProtocolV2 {
     @JvmStatic
     @Throws(IOException::class)
     public fun doubleEncodeGroupID(groupPublicKey: String): String {
-        return GroupUtil.getEncodedClosedGroupID(GroupUtil.getEncodedClosedGroupID(groupPublicKey))
+        return GroupUtil.getEncodedClosedGroupID(GroupUtil.getEncodedClosedGroupID(Hex.fromStringCondensed(groupPublicKey)).toByteArray())
     }
 
     @JvmStatic

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/KeyPairUtilities.kt

@@ -7,7 +7,7 @@ import com.goterl.lazycode.lazysodium.utils.Key
 import com.goterl.lazycode.lazysodium.utils.KeyPair
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.session.libsession.utilities.Base64
-import org.thoughtcrime.securesms.util.Hex
+import org.session.libsession.utilities.Hex
 import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
 import org.session.libsignal.libsignal.ecc.DjbECPublicKey
 import org.session.libsignal.libsignal.ecc.ECKeyPair

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt

@@ -62,7 +62,7 @@ object OpenGroupUtilities {
                 ?: throw IllegalStateException("Public chat API is not initialized!")
 
         // Check if open group has a related DB record.
-        val groupId = GroupUtil.getEncodedOpenGroupID(PublicChat.getId(channel, url))
+        val groupId = GroupUtil.getEncodedOpenGroupID(PublicChat.getId(channel, url).toByteArray())
         if (!DatabaseFactory.getGroupDatabase(context).hasGroup(groupId)) {
             throw IllegalStateException("Attempt to update open group info for non-existent DB record: $groupId")
         }

app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java

@@ -18,7 +18,7 @@ import network.loki.messenger.R;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.FileUtils;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 

app/src/main/java/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.model.StickerPackRecord;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsession.utilities.concurrent.SignalExecutors;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.libsignal.util.guava.Optional;

app/src/main/java/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java

@@ -7,7 +7,7 @@ import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
+import org.session.libsession.utilities.Hex;
 import org.session.libsignal.libsignal.InvalidMessageException;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 

app/src/main/java/org/thoughtcrime/securesms/util/Hex.java

@@ -1,138 +0,0 @@
-/**
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms.util;
-
-import java.io.IOException;
-
-/**
- * Utility for generating hex dumps.
- */
-public class Hex {
-
-  private final static int HEX_DIGITS_START = 10;
-  private final static int ASCII_TEXT_START = HEX_DIGITS_START + (16*2 + (16/2));
-
-  final static String EOL = System.getProperty("line.separator");
-
-  private final static char[] HEX_DIGITS = {
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-  };
-
-  public static String toString(byte[] bytes) {
-    return toString(bytes, 0, bytes.length);
-  }
-
-  public static String toString(byte[] bytes, int offset, int length) {
-    StringBuffer buf = new StringBuffer();
-    for (int i = 0; i < length; i++) {
-      appendHexChar(buf, bytes[offset + i]);
-      buf.append(' ');
-    }
-    return buf.toString();
-  }
-
-  public static String toStringCondensed(byte[] bytes) {
-    StringBuffer buf = new StringBuffer();
-    for (int i=0;i<bytes.length;i++) {
-      appendHexChar(buf, bytes[i]);
-    }
-    return buf.toString();
-  }
-
-  public static byte[] fromStringCondensed(String encoded) throws IOException {
-    final char[] data = encoded.toCharArray();
-    final int    len  = data.length;
-
-    if ((len & 0x01) != 0) {
-      throw new IOException("Odd number of characters.");
-    }
-
-    final byte[] out = new byte[len >> 1];
-
-    // two characters form the hex value.
-    for (int i = 0, j = 0; j < len; i++) {
-      int f = Character.digit(data[j], 16) << 4;
-      j++;
-      f = f | Character.digit(data[j], 16);
-      j++;
-      out[i] = (byte) (f & 0xFF);
-    }
-
-    return out;
-  }
-
-  public static String dump(byte[] bytes) {
-    return dump(bytes, 0, bytes.length);
-  }
-
-  public static String dump(byte[] bytes, int offset, int length) {
-    StringBuffer buf = new StringBuffer();
-    int lines = ((length - 1) / 16) + 1;
-    int lineOffset;
-    int lineLength;
-
-    for (int i = 0; i < lines; i++) {
-      lineOffset = (i * 16) + offset;
-      lineLength = Math.min(16, (length - (i * 16)));
-      appendDumpLine(buf, i, bytes, lineOffset, lineLength);
-      buf.append(EOL);
-    }
-
-    return buf.toString();
-  }
-
-  private static void appendDumpLine(StringBuffer buf, int line, byte[] bytes, int lineOffset, int lineLength) {
-    buf.append(HEX_DIGITS[(line >> 28) & 0xf]);
-    buf.append(HEX_DIGITS[(line >> 24) & 0xf]);
-    buf.append(HEX_DIGITS[(line >> 20) & 0xf]);
-    buf.append(HEX_DIGITS[(line >> 16) & 0xf]);
-    buf.append(HEX_DIGITS[(line >> 12) & 0xf]);
-    buf.append(HEX_DIGITS[(line >>  8) & 0xf]);
-    buf.append(HEX_DIGITS[(line >>  4) & 0xf]);
-    buf.append(HEX_DIGITS[(line      ) & 0xf]);
-    buf.append(": ");
-
-    for (int i = 0; i < 16; i++) {
-      int idx = i + lineOffset;
-      if (i < lineLength) {
-        int b = bytes[idx];
-        appendHexChar(buf, b);
-      } else {
-        buf.append("  ");
-      }
-      if ((i % 2) == 1) {
-        buf.append(' ');
-      }
-    }
-
-    for (int i = 0; i < 16 && i < lineLength; i++) {
-      int idx = i + lineOffset;
-      int b = bytes[idx];
-      if (b >= 0x20 && b <= 0x7e) {
-        buf.append((char)b);
-      } else {
-        buf.append('.');
-      }
-    }
-  }
-
-  private static void appendHexChar(StringBuffer buf, int b) {
-    buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
-    buf.append(HEX_DIGITS[b & 0xf]);
-  }
-
-}