Disallow marking users as registered without a UUID.

This commit is contained in:
Greyson Parrelli
2021-08-24 12:21:36 -04:00
committed by Alex Hart
parent 665d9e31f6
commit eb48ab1784
3 changed files with 6 additions and 19 deletions

View File

@@ -228,9 +228,11 @@ public class Recipient {
Recipient resolved = resolved(recipientId);
if (highTrust && !resolved.isRegistered()) {
if (highTrust && !resolved.isRegistered() && uuid != null) {
Log.w(TAG, "External high-trust push was locally marked unregistered. Marking as registered.");
db.markRegistered(recipientId);
db.markRegistered(recipientId, uuid);
} else if (highTrust && !resolved.isRegistered()) {
Log.w(TAG, "External high-trust push was locally marked unregistered, but we don't have a UUID, so we can't do anything.", new Throwable());
}
return resolved;