mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-10-23 04:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1565 from nextcloud/vCardURL

Browse source 
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
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java
View file

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