Move more system contact info into recipient database

1) Move contact URI, contact photo URI, and custom label
   into recipient database, so there are no longer any
   contact DB queries during Recipient object loading.

2) Use a SoftHashMap so that any referenced Recipient objects
   can't get kicked out of the cache.

3) Don't load Recipient objects through the provider during sync.
   This was a super expensive thing to do, and blew up the cache.

4) Only apply changes to Recipient objects during sync if they
   are in the cache. Otherwise, there should be no outstanding
   references, and the changes are fine going exclusively to
   the DB.
This commit is contained in:
Moxie Marlinspike
2017-11-26 10:45:39 -08:00
parent 64c8b4b2ef
commit 7a5846a6d4
14 changed files with 618 additions and 2571 deletions

View File

@@ -5,7 +5,6 @@ import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.dependencies.InjectableType;
@@ -83,10 +82,6 @@ public class RetrieveProfileAvatarJob extends ContextJob implements InjectableTy
}
database.setProfileAvatar(recipient, profileAvatar);
if (recipient.resolve().getContactPhoto() == null) {
recipient.setContactPhoto(new ProfileContactPhoto(recipient.getAddress(), profileAvatar));
}
}
@Override