Remove async photo loader (it was never used anyway)
Change-Id: Ief3dfdf50a617724e3f4ce086305cc4240e9b25d
diff --git a/src/com/android/contacts/ContactLoader.java b/src/com/android/contacts/ContactLoader.java
index 45cfe4a..685bd7d 100644
--- a/src/com/android/contacts/ContactLoader.java
+++ b/src/com/android/contacts/ContactLoader.java
@@ -61,7 +61,6 @@
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -131,7 +130,6 @@
private ArrayList<GroupMetaData> mGroups;
- private boolean mLoadingPhoto;
private byte[] mPhotoBinaryData;
private final boolean mSendToVoicemail;
private final String mCustomRingtone;
@@ -246,7 +244,6 @@
mGroups = from.mGroups;
- mLoadingPhoto = from.mLoadingPhoto;
mPhotoBinaryData = from.mPhotoBinaryData;
mSendToVoicemail = from.mSendToVoicemail;
mCustomRingtone = from.mCustomRingtone;
@@ -265,10 +262,6 @@
mDirectoryExportSupport = exportSupport;
}
- private void setLoadingPhoto(boolean flag) {
- mLoadingPhoto = flag;
- }
-
private void setPhotoBinaryData(byte[] photoBinaryData) {
mPhotoBinaryData = photoBinaryData;
}
@@ -425,10 +418,6 @@
return mDirectoryAccountName;
}
- public boolean isLoadingPhoto() {
- return mLoadingPhoto;
- }
-
public byte[] getPhotoBinaryData() {
return mPhotoBinaryData;
}
@@ -1167,11 +1156,6 @@
mLookupUri, true, mObserver);
}
- if (mContact.getPhotoBinaryData() == null && mContact.getPhotoUri() != null) {
- mContact.setLoadingPhoto(true);
- new AsyncPhotoLoader().execute(mContact.getPhotoUri());
- }
-
// inform the source of the data that this contact is being looked at
postViewNotificationToSyncAdapter();
}
@@ -1214,50 +1198,6 @@
}
}
- private class AsyncPhotoLoader extends AsyncTask<String, Void, byte[]> {
-
- private static final int BUFFER_SIZE = 1024*16;
-
- @Override
- protected byte[] doInBackground(String... params) {
- Uri uri = Uri.parse(params[0]);
- byte[] data = null;
- try {
- InputStream is = getContext().getContentResolver().openInputStream(uri);
- if (is != null) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- byte[] mBuffer = new byte[BUFFER_SIZE];
-
- int size;
- while ((size = is.read(mBuffer)) != -1) {
- baos.write(mBuffer, 0, size);
- }
- data = baos.toByteArray();
- } finally {
- is.close();
- }
- } else {
- Log.v(TAG, "Cannot load photo " + uri);
- }
- } catch (IOException e) {
- Log.e(TAG, "Cannot load photo " + uri, e);
- }
-
- return data;
- }
-
- @Override
- protected void onPostExecute(byte[] data) {
- if (mContact != null) {
- mContact = new Result(mContact);
- mContact.setPhotoBinaryData(data);
- mContact.setLoadingPhoto(false);
- deliverResult(mContact);
- }
- }
- }
-
private void unregisterObserver() {
if (mObserver != null) {
getContext().getContentResolver().unregisterContentObserver(mObserver);
diff --git a/src/com/android/contacts/detail/ContactDetailDisplayUtils.java b/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
index eabd9ec..9f37899 100644
--- a/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
+++ b/src/com/android/contacts/detail/ContactDetailDisplayUtils.java
@@ -61,7 +61,6 @@
import android.view.animation.AccelerateInterpolator;
import android.view.animation.AlphaAnimation;
import android.widget.ImageView;
-import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
@@ -208,10 +207,6 @@
*/
public static OnClickListener setPhoto(Context context, Result contactData,
ImageView photoView, boolean expandPhotoOnClick) {
- if (contactData.isLoadingPhoto()) {
- photoView.setImageBitmap(null);
- return null;
- }
byte[] photo = contactData.getPhotoBinaryData();
Bitmap bitmap = photo != null ? BitmapFactory.decodeByteArray(photo, 0, photo.length)
: ContactBadgeUtil.loadDefaultAvatarPhoto(context, true, false);