Skip to content

Commit b63fdd6

Browse files
Remove deprecated message receiving code (#1772)
1 parent ab8b223 commit b63fdd6

File tree

8 files changed

+2
-1613
lines changed

8 files changed

+2
-1613
lines changed

app/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt

Lines changed: 0 additions & 415 deletions
This file was deleted.

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class JobQueue : JobDelegate {
3838
for (job in channel) {
3939
if (!isActive) break
4040
val communityAddress = when (job) {
41-
is BatchMessageReceiveJob -> job.fromCommunity?.address
4241
is OpenGroupDeleteJob -> job.address?.address
4342
is TrimThreadJob -> job.communityAddress?.address
4443
else -> null
@@ -132,10 +131,8 @@ class JobQueue : JobDelegate {
132131
is OpenGroupDeleteJob -> {
133132
openGroupQueue.send(job)
134133
}
135-
is TrimThreadJob,
136-
is BatchMessageReceiveJob -> {
137-
if ((job is BatchMessageReceiveJob && job.fromCommunity != null)
138-
|| (job is TrimThreadJob && job.communityAddress != null)) {
134+
is TrimThreadJob -> {
135+
if (job.communityAddress != null) {
139136
openGroupQueue.send(job)
140137
} else {
141138
rxQueue.send(job)
@@ -223,7 +220,6 @@ class JobQueue : JobDelegate {
223220
AttachmentDownloadJob.KEY,
224221
MessageSendJob.KEY,
225222
NotifyPNServerJob.KEY,
226-
BatchMessageReceiveJob.KEY,
227223
OpenGroupDeleteJob.KEY,
228224
InviteContactsJob.KEY,
229225
)
@@ -249,16 +245,6 @@ class JobQueue : JobDelegate {
249245
return
250246
}
251247

252-
// Batch message receive job, re-queue non-permanently failed jobs
253-
if (job is BatchMessageReceiveJob && job.failureCount <= 0) {
254-
val replacementParameters = job.failures.toList()
255-
if (replacementParameters.isNotEmpty()) {
256-
val newJob = job.recreateWithNewMessages(replacementParameters)
257-
newJob.failureCount = job.failureCount + 1
258-
add(newJob)
259-
}
260-
}
261-
262248
// Regular job failure
263249
job.failureCount += 1
264250

app/src/main/java/org/session/libsession/messaging/jobs/SessionJobManagerFactories.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import javax.inject.Inject
55
class SessionJobManagerFactories @Inject constructor(
66
private val attachmentDownloadJobFactory: AttachmentDownloadJob.Factory,
77
private val attachmentUploadJobFactory: AttachmentUploadJob.Factory,
8-
private val batchFactory: BatchMessageReceiveJob.Factory,
98
private val trimThreadFactory: TrimThreadJob.Factory,
109
private val messageSendJobFactory: MessageSendJob.Factory,
1110
private val deleteJobFactory: OpenGroupDeleteJob.Factory,
@@ -19,7 +18,6 @@ class SessionJobManagerFactories @Inject constructor(
1918
MessageSendJob.KEY to messageSendJobFactory,
2019
NotifyPNServerJob.KEY to NotifyPNServerJob.DeserializeFactory(),
2120
TrimThreadJob.KEY to trimThreadFactory,
22-
BatchMessageReceiveJob.KEY to batchFactory,
2321
OpenGroupDeleteJob.KEY to deleteJobFactory,
2422
InviteContactsJob.KEY to inviteContactsJobFactory,
2523
)

app/src/main/java/org/session/libsession/messaging/messages/visible/ParsedMessage.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt

Lines changed: 0 additions & 76 deletions
This file was deleted.

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)