Minor refactoring

2025-08-12 03:37:53 +00:00 · 2021-05-17 15:18:41 +10:00
parent cf3f0fbe57
commit 6b3aa86324
13 changed files with 106 additions and 138 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java
@@ -12,7 +12,6 @@ import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsignal.libsignal.util.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceGroup;
-import org.session.libsignal.utilities.logging.Log;

 public class IncomingTextMessage implements Parcelable {

@@ -112,7 +111,11 @@ public class IncomingTextMessage implements Parcelable {

  public static IncomingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Address sender, Long sentTimestamp)
  {
-    String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON();
+    String url = openGroupInvitation.getUrl();
+    String name = openGroupInvitation.getName();
+    if (url == null || name == null) { return null; }
+    // FIXME: Doing toJSON() to get the body here is weird
+    String body = UpdateMessageData.Companion.buildOpenGroupInvitation(url, name).toJSON();
    IncomingTextMessage incomingTextMessage = new IncomingTextMessage(sender, 1, sentTimestamp, body, Optional.absent(), 0, false);
    incomingTextMessage.isOpenGroupInvitation = true;
    return incomingTextMessage;
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java
@@ -6,14 +6,12 @@ import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsession.messaging.utilities.UpdateMessageData;

 public class OutgoingTextMessage {
-
  private final Recipient recipient;
  private final String    message;
  private final int       subscriptionId;
  private final long      expiresIn;
  private final long      sentTimestampMillis;
-
-  private boolean isOpenGroupInvitation = false;
+  private boolean         isOpenGroupInvitation = false;

  public OutgoingTextMessage(Recipient recipient, String message, long expiresIn, int subscriptionId, long sentTimestampMillis) {
    this.recipient      = recipient;
@@ -28,7 +26,11 @@ public class OutgoingTextMessage {
  }

  public static OutgoingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Recipient recipient, Long sentTimestamp) {
-    String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON();
+    String url = openGroupInvitation.getUrl();
+    String name = openGroupInvitation.getName();
+    if (url == null || name == null) { return null; }
+    // FIXME: Doing toJSON() to get the body here is weird
+    String body = UpdateMessageData.Companion.buildOpenGroupInvitation(url, name).toJSON();
    OutgoingTextMessage outgoingTextMessage = new OutgoingTextMessage(recipient, body, 0, -1, sentTimestamp);
    outgoingTextMessage.isOpenGroupInvitation = true;
    return outgoingTextMessage;
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt
@@ -1,42 +1,37 @@
 package org.session.libsession.messaging.messages.visible

-import org.session.libsession.messaging.messages.control.ControlMessage
 import org.session.libsignal.service.internal.push.SignalServiceProtos
 import org.session.libsignal.utilities.logging.Log

 class OpenGroupInvitation() {
+    var url: String? = null
+    var name: String? = null

-    var groupUrl: String? = null;
-    var groupName: String? = null;
+    fun isValid(): Boolean {
+        return (url != null && name != null)
+    }

    companion object {
        const val TAG = "OpenGroupInvitation"

-        fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation? {
-            val groupUrl = proto.url
-            val groupName = proto.name
-            return OpenGroupInvitation(groupUrl, groupName)
+        fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation {
+            return OpenGroupInvitation(proto.url, proto.name)
        }
    }

    constructor(url: String?, serverName: String?): this() {
-        this.groupUrl = url
-        this.groupName = serverName
-    }
-
-    fun isValid(): Boolean {
-        return (groupUrl != null && groupName != null)
+        this.url = url
+        this.name = serverName
    }

    fun toProto(): SignalServiceProtos.DataMessage.OpenGroupInvitation? {
        val openGroupInvitationProto = SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder()
-        openGroupInvitationProto.url = groupUrl
-        openGroupInvitationProto.name = groupName
-
+        openGroupInvitationProto.url = url
+        openGroupInvitationProto.name = name
        return try {
            openGroupInvitationProto.build()
        } catch (e: Exception) {
-            Log.w(TAG, "Couldn't construct open group invitation proto from: $this")
+            Log.w(TAG, "Couldn't construct open group invitation proto from: $this.")
            null
        }
    }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
@@ -58,9 +58,9 @@ class VisibleMessage : Message()  {
                result.linkPreview = linkPreview
            }
            val openGroupInvitationProto = if (dataMessage.hasOpenGroupInvitation()) dataMessage.openGroupInvitation else null
-            openGroupInvitationProto?.let {
+            if (openGroupInvitationProto != null) {
                val openGroupInvitation = OpenGroupInvitation.fromProto(openGroupInvitationProto)
-                openGroupInvitation?.let { result.openGroupInvitation = openGroupInvitation}
+                result.openGroupInvitation = openGroupInvitation
            }
            // TODO Contact
            val profile = Profile.fromProto(dataMessage)
@@ -73,7 +73,7 @@ class VisibleMessage : Message()  {
        val proto = SignalServiceProtos.Content.newBuilder()
        val dataMessage: SignalServiceProtos.DataMessage.Builder
        // Profile
-        val profileProto = profile?.let { it.toProto() }
+        val profileProto = profile?.toProto()
        if (profileProto != null) {
            dataMessage = profileProto.toBuilder()
        } else {
@@ -82,19 +82,19 @@ class VisibleMessage : Message()  {
        // Text
        if (text != null) { dataMessage.body = text }
        // Quote
-        val quoteProto = quote?.let { it.toProto() }
+        val quoteProto = quote?.toProto()
        if (quoteProto != null) {
            dataMessage.quote = quoteProto
        }
        // Link preview
-        val linkPreviewProto = linkPreview?.let { it.toProto() }
+        val linkPreviewProto = linkPreview?.toProto()
        if (linkPreviewProto != null) {
            dataMessage.addAllPreview(listOf(linkPreviewProto))
        }
-        //Open group invitation
-        openGroupInvitation?.let {
-            val openGroupInvitationProto = it.toProto()
-            if (openGroupInvitationProto != null) dataMessage.openGroupInvitation = openGroupInvitationProto
+        // Open group invitation
+        val openGroupInvitationProto = openGroupInvitation?.toProto()
+        if (openGroupInvitationProto != null) {
+            dataMessage.openGroupInvitation = openGroupInvitationProto
        }
        // Attachments
        val database = MessagingModuleConfiguration.shared.messageDataProvider
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -53,8 +53,7 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content,
    }
 }

-//region ControlMessage
-
+// region Control Messages
 private fun MessageReceiver.handleReadReceipt(message: ReadReceipt) {
    val context = MessagingModuleConfiguration.shared.context
    SSKEnvironment.shared.readReceiptManager.processReadReceipts(context, message.sender!!, message.timestamps!!, message.receivedTimestamp!!)
@@ -143,13 +142,9 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) {
    }
    storage.addContacts(message.contacts)
 }
-
 //endregion

-//region VisibleMessage
-
-// Visible message handling
-
+// region Visible Messages
 fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalServiceProtos.Content, openGroupID: String?) {
    val storage = MessagingModuleConfiguration.shared.storage
    val context = MessagingModuleConfiguration.shared.context
@@ -242,11 +237,9 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalS
    //Notify the user if needed
    SSKEnvironment.shared.notificationManager.updateNotification(context, threadID)
 }
-
 //endregion

-//region ClosedGroupControlMessage
-
+// region Closed Groups
 private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroupControlMessage) {
    when (message.kind!!) {
        is ClosedGroupControlMessage.Kind.New -> handleNewClosedGroup(message)
@@ -571,5 +564,4 @@ fun MessageReceiver.disableLocalGroupAndUnsubscribe(groupPublicKey: String, grou
    // Notify the PN server
    PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Unsubscribe, groupPublicKey, userPublicKey)
 }
-
-//endregion
+// endregion
--- a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt
@@ -33,4 +33,4 @@ object OpenGroupUrlParser {
    }
 }

-class V2OpenGroupInfo(val server: String, val room: String, val serverPublicKey: String) {}
+class V2OpenGroupInfo(val server: String, val room: String, val serverPublicKey: String)