TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 11:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear unidentified access mode when profile key changes.

Browse Source
This commit is contained in:
Alan Evans 2020-02-12 17:30:20 -04:00 committed by Greyson Parrelli
parent 455974cb05
commit 23e55ac5f7
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
View File

@ -799,25 +799,30 @@ public class RecipientDatabase extends Database {
/** /**
* Updates the profile key. * Updates the profile key.
* <p> * <p>
* If it changes, it clears out the profile key credential. * If it changes, it clears out the profile key credential and resets the unidentified access mode.
* @return true iff changed.
*/ */
public void setProfileKey(@NonNull RecipientId id, @Nullable ProfileKey profileKey) { public boolean setProfileKey(@NonNull RecipientId id, @NonNull ProfileKey profileKey) {
String selection = ID + " = ?"; String selection = ID + " = ?";
String[] args = new String[]{id.serialize()}; String[] args = new String[]{id.serialize()};
ContentValues valuesToCompare = new ContentValues(1); ContentValues valuesToCompare = new ContentValues(1);
ContentValues valuesToSet = new ContentValues(2); ContentValues valuesToSet = new ContentValues(3);
String encodedProfileKey = profileKey == null ? null : Base64.encodeBytes(profileKey.serialize()); String encodedProfileKey = Base64.encodeBytes(profileKey.serialize());
valuesToCompare.put(PROFILE_KEY, encodedProfileKey); valuesToCompare.put(PROFILE_KEY, encodedProfileKey);
valuesToSet.put(PROFILE_KEY, encodedProfileKey); valuesToSet.put(PROFILE_KEY, encodedProfileKey);
valuesToSet.putNull(PROFILE_KEY_CREDENTIAL); valuesToSet.putNull(PROFILE_KEY_CREDENTIAL);
valuesToSet.put(UNIDENTIFIED_ACCESS_MODE, UnidentifiedAccessMode.UNKNOWN.getMode());
SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, valuesToCompare); SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, valuesToCompare);
if (update(updateQuery, valuesToSet)) { if (update(updateQuery, valuesToSet)) {
markDirty(id, DirtyState.UPDATE); markDirty(id, DirtyState.UPDATE);
Recipient.live(id).refresh(); Recipient.live(id).refresh();
return true;
} else {
return false;
} }
} }

9
app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
View File

@ -1180,14 +1180,15 @@ public final class PushProcessMessageJob extends BaseJob {
{ {
RecipientDatabase database = DatabaseFactory.getRecipientDatabase(context); RecipientDatabase database = DatabaseFactory.getRecipientDatabase(context);
Recipient recipient = Recipient.externalPush(context, content.getSender()); Recipient recipient = Recipient.externalPush(context, content.getSender());
ProfileKey currentProfileKey = ProfileKeyUtil.profileKeyOrNull(recipient.getProfileKey());
ProfileKey messageProfileKey = ProfileKeyUtil.profileKeyOrNull(messageProfileKeyBytes); ProfileKey messageProfileKey = ProfileKeyUtil.profileKeyOrNull(messageProfileKeyBytes);
if (messageProfileKey != null && !messageProfileKey.equals(currentProfileKey)) { if (messageProfileKey != null) {
database.setProfileKey(recipient.getId(), messageProfileKey); if (database.setProfileKey(recipient.getId(), messageProfileKey)) {
database.setUnidentifiedAccessMode(recipient.getId(), RecipientDatabase.UnidentifiedAccessMode.UNKNOWN);
ApplicationDependencies.getJobManager().add(new RetrieveProfileJob(recipient)); ApplicationDependencies.getJobManager().add(new RetrieveProfileJob(recipient));
} }
} else {
Log.w(TAG, "Ignored invalid profile key seen in message");
}
} }
private void handleNeedsDeliveryReceipt(@NonNull SignalServiceContent content, private void handleNeedsDeliveryReceipt(@NonNull SignalServiceContent content,