mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Move back to async message processing.

fork-5.53.8
Greyson Parrelli 2021-02-26 15:08:56 -05:00
rodzic 32d052259f
commit ce9d44d010
2 zmienionych plików z 24 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
Wyświetl plik

@ -116,20 +116,17 @@ public final class PushDecryptMessageJob extends BaseJob {
throw new RetryLaterException();
}
List<Job> jobs = new LinkedList<>();
List<Job> jobs = new LinkedList<>();
DecryptionResult result = MessageDecryptionUtil.decrypt(context, envelope);
try (DatabaseSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
DecryptionResult result = MessageDecryptionUtil.decrypt(context, envelope);
if (result.getContent() != null) {
jobs.add(new PushProcessMessageJob(result.getContent(), smsMessageId, envelope.getTimestamp()));
} else if (result.getException() != null && result.getState() != MessageState.NOOP) {
jobs.add(new PushProcessMessageJob(result.getState(), result.getException(), smsMessageId, envelope.getTimestamp()));
}
jobs.addAll(result.getJobs());
if (result.getContent() != null) {
jobs.add(new PushProcessMessageJob(result.getContent(), smsMessageId, envelope.getTimestamp()));
} else if (result.getException() != null && result.getState() != MessageState.NOOP) {
jobs.add(new PushProcessMessageJob(result.getState(), result.getException(), smsMessageId, envelope.getTimestamp()));
}
jobs.addAll(result.getJobs());
for (Job job: jobs) {
ApplicationDependencies.getJobManager().add(job);
}

17
app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageProcessor.java
Wyświetl plik

@ -25,12 +25,12 @@ import org.thoughtcrime.securesms.jobs.PushProcessMessageJob;
import org.thoughtcrime.securesms.messages.MessageDecryptionUtil.DecryptionResult;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.SetUtil;
import org.thoughtcrime.securesms.util.Stopwatch;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.api.SignalSessionLock;
import org.whispersystems.signalservice.api.messages.SignalServiceContent;
import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
@ -100,6 +100,20 @@ public class IncomingMessageProcessor {
}
private @Nullable String processMessage(@NonNull SignalServiceEnvelope envelope) {
if (FeatureFlags.internalUser()) {
return processMessageInline(envelope);
} else {
return processMessageDeferred(envelope);
}
}
private @Nullable String processMessageDeferred(@NonNull SignalServiceEnvelope envelope) {
Job job = new PushDecryptMessageJob(context, envelope);
jobManager.add(job);
return job.getId();
}
private @Nullable String processMessageInline(@NonNull SignalServiceEnvelope envelope) {
Log.i(TAG, "Received message " + envelope.getTimestamp() + ".");
Stopwatch stopwatch = new Stopwatch("message");
@ -122,6 +136,7 @@ public class IncomingMessageProcessor {
Log.i(TAG, "Acquired lock while processing message " + envelope.getTimestamp() + ".");
DecryptionResult result = MessageDecryptionUtil.decrypt(context, envelope);
Log.d(TAG, "Decryption finished for " + envelope.getTimestamp());
stopwatch.split("decrypt");
for (Job job : result.getJobs()) {