|
|
@ -1,9 +1,7 @@
|
|
|
|
package org.session.libsession.messaging.messages.control
|
|
|
|
package org.session.libsession.messaging.messages.control
|
|
|
|
|
|
|
|
|
|
|
|
import com.google.protobuf.ByteString
|
|
|
|
import com.google.protobuf.ByteString
|
|
|
|
import org.session.libsession.messaging.MessagingModuleConfiguration
|
|
|
|
|
|
|
|
import org.session.libsession.messaging.messages.copyExpiration
|
|
|
|
import org.session.libsession.messaging.messages.copyExpiration
|
|
|
|
import org.session.libsession.utilities.Address
|
|
|
|
|
|
|
|
import org.session.libsignal.crypto.ecc.DjbECPrivateKey
|
|
|
|
import org.session.libsignal.crypto.ecc.DjbECPrivateKey
|
|
|
|
import org.session.libsignal.crypto.ecc.DjbECPublicKey
|
|
|
|
import org.session.libsignal.crypto.ecc.DjbECPublicKey
|
|
|
|
import org.session.libsignal.crypto.ecc.ECKeyPair
|
|
|
|
import org.session.libsignal.crypto.ecc.ECKeyPair
|
|
|
@ -119,7 +117,6 @@ class ClosedGroupControlMessage() : ControlMessage() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ClosedGroupControlMessage(kind)
|
|
|
|
return ClosedGroupControlMessage(kind)
|
|
|
|
.copyExpiration(proto)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -175,8 +172,6 @@ class ClosedGroupControlMessage() : ControlMessage() {
|
|
|
|
it.closedGroupControlMessage = closedGroupControlMessage.build()
|
|
|
|
it.closedGroupControlMessage = closedGroupControlMessage.build()
|
|
|
|
it.setGroupContext()
|
|
|
|
it.setGroupContext()
|
|
|
|
}.build()
|
|
|
|
}.build()
|
|
|
|
// Expiration timer
|
|
|
|
|
|
|
|
applyExpiryMode()
|
|
|
|
|
|
|
|
}.build()
|
|
|
|
}.build()
|
|
|
|
} catch (e: Exception) {
|
|
|
|
} catch (e: Exception) {
|
|
|
|
Log.w(TAG, "Couldn't construct closed group control message proto from: $this.")
|
|
|
|
Log.w(TAG, "Couldn't construct closed group control message proto from: $this.")
|
|
|
|