TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-23 17:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check result of bitmap size operation for failure

Browse Source 
Fixes #5046
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-01-30 15:22:55 -08:00
parent 1b97756b05
commit 4a261bcf68
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
View File

@@ -21,6 +21,7 @@ import android.util.SparseArray;
import android.widget.TextView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.BitmapDecodingException;
import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
@@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.util.Util;
import java.io.IOException;
import java.lang.ref.SoftReference;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -221,7 +221,7 @@ public class EmojiProvider {
try {
Log.w(TAG, "loading page " + model.getSprite());
return loadPage();
} catch (IOException | ExecutionException ioe) {
} catch (IOException ioe) {
Log.w(TAG, ioe);
}
return null;
@@ -242,7 +242,7 @@ public class EmojiProvider {
return task;
}
private Bitmap loadPage() throws IOException, ExecutionException {
private Bitmap loadPage() throws IOException {
if (bitmapReference != null && bitmapReference.get() != null) return bitmapReference.get();
try {
@@ -252,9 +252,9 @@ public class EmojiProvider {
bitmapReference = new SoftReference<>(bitmap);
Log.w(TAG, "onPageLoaded(" + model.getSprite() + ")");
return bitmap;
} catch (ExecutionException e) {
} catch (BitmapDecodingException e) {
Log.w(TAG, e);
throw e;
throw new IOException(e);
}
}