Merge pull request #1565 from nextcloud/vCardURL

Fix bug if photo is URL
This commit is contained in:
Andy Scherzinger 2017-09-20 21:26:55 +02:00 committed by GitHub
commit 6dafecf753

View file

@ -66,8 +66,8 @@ import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.jobs.ContactsImportJob;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.TextDrawable;
import com.owncloud.android.ui.activity.ContactsPreferenceActivity;
import com.owncloud.android.ui.events.VCardToggleEvent;
@ -641,11 +641,13 @@ class ContactListAdapter extends RecyclerView.Adapter<ContactListFragment.Contac
if (vcard.getPhotos().size() > 0) {
byte[] data = vcard.getPhotos().get(0).getData();
if (data != null && data.length > 0) {
Bitmap thumbnail = BitmapFactory.decodeByteArray(data, 0, data.length);
RoundedBitmapDrawable drawable = BitmapUtils.bitmapToCircularBitmapDrawable(context.getResources(),
thumbnail);
holder.getBadge().setImageDrawable(drawable);
}
} else {
try {
holder.getBadge().setImageDrawable(