Fix some bugs with PKWM padding and attachment detection.

This commit is contained in:
Moxie Marlinspike
2014-11-11 20:29:55 -08:00
parent 9a6f65988f
commit d9d4ec9d9d
5 changed files with 32 additions and 15 deletions

View File

@@ -101,6 +101,10 @@ public class PushDecryptJob extends MasterSecretJob {
else if (message.isGroupUpdate()) handleGroupMessage(masterSecret, envelope, message);
else if (message.getAttachments().isPresent()) handleMediaMessage(masterSecret, envelope, message);
else handleTextMessage(masterSecret, envelope, message);
if (envelope.isPreKeyWhisperMessage()) {
ApplicationContext.getInstance(context).getJobManager().add(new RefreshPreKeysJob(context));
}
} catch (InvalidVersionException e) {
Log.w(TAG, e);
handleInvalidVersionMessage(masterSecret, envelope);

View File

@@ -2,15 +2,16 @@ package org.thoughtcrime.securesms.push;
import android.content.Context;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.crypto.SecurityEvent;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
public class SecurityEventListener implements TextSecureMessageSender.EventListener {
private static final String TAG = SecurityEventListener.class.getSimpleName();
private final Context context;
public SecurityEventListener(Context context) {
@@ -23,10 +24,6 @@ public class SecurityEventListener implements TextSecureMessageSender.EventListe
long threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipients);
SecurityEvent.broadcastSecurityUpdateEvent(context, threadId);
ApplicationContext.getInstance(context)
.getJobManager()
.add(new RefreshPreKeysJob(context));
}
}