Fix missing message ID & update for core changes

src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java

@@ -255,8 +255,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
                                                                            .asGroupMessage(group)
                                                                            .build();
 
-      // TODO: Message ID
+      return messageSender.sendMessage(messageId, addresses, unidentifiedAccess, groupDataMessage);
-      return messageSender.sendMessage(0, addresses, unidentifiedAccess, groupDataMessage);
     } else {
       SignalServiceGroup       group        = new SignalServiceGroup(GroupUtil.getDecodedId(groupId));
       SignalServiceDataMessage groupMessage = SignalServiceDataMessage.newBuilder()
@@ -273,8 +272,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
                                                                       .withPreviews(previews)
                                                                       .build();
 
-      // TODO: Message ID
+      return messageSender.sendMessage(messageId, addresses, unidentifiedAccess, groupMessage);
-      return messageSender.sendMessage(0, addresses, unidentifiedAccess, groupMessage);
     }
   }
 

src/org/thoughtcrime/securesms/loki/LokiAPIDatabase.kt

@@ -83,7 +83,8 @@ class LokiAPIDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(
         return TextSecurePreferences.getProfileName(context)
     }
 
-    override fun setMessageID(signalID: Long, lokiID: Long) {
+    override fun updateMessageIDIfNeeded(signalID: Long, lokiID: Long) {
+        if (signalID == lokiID) return
         DatabaseFactory.getMmsDatabase(context).updateMessageID(signalID, lokiID)
     }
 }