Correctly handle PKWM via SMS.

moxie0 · moxie0 · commit a85dbce0416c · 2014-11-12T15:42:43.000-08:00
diff --git a/src/org/thoughtcrime/securesms/database/EncryptingSmsDatabase.java b/src/org/thoughtcrime/securesms/database/EncryptingSmsDatabase.java
@@ -102,7 +102,7 @@ public Pair<Long, Long> insertMessageInbox(AsymmetricMasterSecret masterSecret,
   public void updateBundleMessageBody(MasterSecret masterSecret, long messageId, String body) {
     String encryptedBody = getEncryptedBody(masterSecret, body);
     updateMessageBodyAndType(messageId, encryptedBody, Types.TOTAL_MASK,
-                             Types.BASE_INBOX_TYPE | Types.SECURE_MESSAGE_BIT);
+                             Types.BASE_INBOX_TYPE | Types.ENCRYPTION_SYMMETRIC_BIT | Types.SECURE_MESSAGE_BIT);
   }
 
   public void updateMessageBody(MasterSecret masterSecret, long messageId, String body) {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public Pair<Long, Long> insertMessageInbox(AsymmetricMasterSecret masterSecret,`
`102`	`102`	`public void updateBundleMessageBody(MasterSecret masterSecret, long messageId, String body) {`
`103`	`103`	`String encryptedBody = getEncryptedBody(masterSecret, body);`
`104`	`104`	`updateMessageBodyAndType(messageId, encryptedBody, Types.TOTAL_MASK,`
`105`		`- Types.BASE_INBOX_TYPE \| Types.SECURE_MESSAGE_BIT);`
	`105`	`+ Types.BASE_INBOX_TYPE \| Types.ENCRYPTION_SYMMETRIC_BIT \| Types.SECURE_MESSAGE_BIT);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public void updateMessageBody(MasterSecret masterSecret, long messageId, String body) {`