TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 22:49:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Glide for all contact photo caching

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-10-16 13:11:42 -07:00
parent 10f224ede5
commit b80408bcb4
66 changed files with 931 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
View File

@@ -1,12 +1,14 @@
package org.thoughtcrime.securesms.preferences;
import android.content.Context;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.widget.RelativeLayout;
import android.widget.TextView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
import org.thoughtcrime.securesms.util.Util;
@@ -15,6 +17,7 @@ public class BlockedContactListItem extends RelativeLayout implements RecipientM
private AvatarImageView contactPhotoImage;
private TextView nameView;
private GlideRequests glideRequests;
private Recipient recipient;
public BlockedContactListItem(Context context) {
@@ -32,12 +35,13 @@ public class BlockedContactListItem extends RelativeLayout implements RecipientM
@Override
public void onFinishInflate() {
super.onFinishInflate();
this.contactPhotoImage = (AvatarImageView)findViewById(R.id.contact_photo_image);
this.nameView = (TextView) findViewById(R.id.name);
this.contactPhotoImage = findViewById(R.id.contact_photo_image);
this.nameView = findViewById(R.id.name);
}
public void set(Recipient recipients) {
this.recipient = recipients;
public void set(@NonNull GlideRequests glideRequests, @NonNull Recipient recipients) {
this.glideRequests = glideRequests;
this.recipient = recipients;
onModified(recipients);
recipients.addListener(this);
@@ -48,12 +52,9 @@ public class BlockedContactListItem extends RelativeLayout implements RecipientM
final AvatarImageView contactPhotoImage = this.contactPhotoImage;
final TextView nameView = this.nameView;
Util.runOnMain(new Runnable() {
@Override
public void run() {
contactPhotoImage.setAvatar(recipients, false);
nameView.setText(recipients.toShortString());
}
Util.runOnMain(() -> {
contactPhotoImage.setAvatar(glideRequests, recipients, false);
nameView.setText(recipients.toShortString());
});
}

37
src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
View File

@@ -2,26 +2,23 @@ package org.thoughtcrime.securesms.preferences.widgets;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.profiles.AvatarHelper;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ViewUtil;
public class ProfilePreference extends Preference {
@@ -70,24 +67,12 @@ public class ProfilePreference extends Preference {
final Address localAddress = Address.fromSerialized(TextSecurePreferences.getLocalNumber(getContext()));
final String profileName = TextSecurePreferences.getProfileName(getContext());
new AsyncTask<Void, Void, Drawable>() {
@Override
protected @NonNull Drawable doInBackground(Void... params) {
if (AvatarHelper.getAvatarFile(getContext(), localAddress).exists()) {
return ContactPhotoFactory.getSignalAvatarContactPhoto(getContext(), localAddress, profileName,
getContext().getResources().getDimensionPixelSize(R.dimen.contact_photo_target_size))
.asDrawable(getContext(), 0);
} else {
return ContactPhotoFactory.getResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp)
.asDrawable(getContext(), getContext().getResources().getColor(R.color.grey_400));
}
}
@Override
protected void onPostExecute(@NonNull Drawable contactPhoto) {
avatarView.setImageDrawable(contactPhoto);
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
GlideApp.with(getContext().getApplicationContext())
.load(new ProfileContactPhoto(localAddress, String.valueOf(TextSecurePreferences.getProfileAvatarId(getContext()))))
.error(new ResourceContactPhoto(R.drawable.ic_camera_alt_white_24dp).asDrawable(getContext(), getContext().getResources().getColor(R.color.grey_400)))
.circleCrop()
.diskCacheStrategy(DiskCacheStrategy.ALL)
.into(avatarView);
if (!TextUtils.isEmpty(profileName)) {
profileNameView.setText(profileName);