TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch Glide exception when loading avatar image

Browse Source 
Workaround for #7016
// FREEIBE
This commit is contained in:
Moxie Marlinspike 2017-10-10 09:18:00 -07:00
parent c15d1a3bce
commit d40fea9423
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoFactory.java
View File

@ -9,6 +9,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread; import android.support.annotation.WorkerThread;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
@ -92,6 +93,10 @@ public class ContactPhotoFactory {
.get(); .get();
return new BitmapContactPhoto(bitmap); return new BitmapContactPhoto(bitmap);
} catch (IllegalArgumentException e) {
Log.w(TAG, e);
// XXX This is a temporary fix for #7016 until we upgrade to Glide 4 as a next step
return getDefaultContactPhoto(name);
} catch (ExecutionException e) { } catch (ExecutionException e) {
return getDefaultContactPhoto(name); return getDefaultContactPhoto(name);
} catch (InterruptedException e) { } catch (InterruptedException e) {