Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Emoji: minor bug fixes, code cleanup, logging, visibility,

Browse Source
This commit is contained in:
akwizgran
2016-09-23 16:48:07 +01:00
parent d5beca5351
commit c917110e6a
18 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/org/thoughtcrime/securesms/util/BitmapDecodingException.java
View File

@@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.util;
public class BitmapDecodingException extends Exception {
public BitmapDecodingException(String s) {
BitmapDecodingException(String s) {
super(s);
}
public BitmapDecodingException(Exception nested) {
BitmapDecodingException(Exception nested) {
super(nested);
}
}

18
briar-android/src/org/thoughtcrime/securesms/util/BitmapUtil.java
View File

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.util;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log;
import android.util.Pair;
import com.bumptech.glide.Glide;
@@ -17,10 +16,14 @@ import com.bumptech.glide.load.resource.bitmap.FitCenter;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.logging.Logger;
import static java.util.logging.Level.WARNING;
public class BitmapUtil {
private static final String TAG = BitmapUtil.class.getSimpleName();
private static final Logger LOG =
Logger.getLogger(BitmapUtil.class.getName());
private static <T> InputStream getInputStreamForModel(Context context,
T model)
@@ -40,8 +43,7 @@ public class BitmapUtil {
final Bitmap rough = Downsampler.AT_LEAST
.decode(getInputStreamForModel(context, model),
Glide.get(context).getBitmapPool(),
width, height,
DecodeFormat.PREFER_RGB_565);
width, height, DecodeFormat.PREFER_RGB_565);
final Resource<Bitmap> resource = BitmapResource
.obtain(rough, Glide.get(context).getBitmapPool());
@@ -55,8 +57,7 @@ public class BitmapUtil {
}
public static <T> Bitmap createScaledBitmap(Context context, T model,
float scale)
throws BitmapDecodingException {
float scale) throws BitmapDecodingException {
Pair<Integer, Integer> dimens =
getDimensions(getInputStreamForModel(context, model));
return createScaledBitmapInto(context, model,
@@ -72,9 +73,8 @@ public class BitmapUtil {
BitmapFactory.decodeStream(fis, null, options);
try {
fis.close();
} catch (IOException ioe) {
Log.w(TAG,
"failed to close the InputStream after reading image dimensions");
} catch (IOException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
if (options.outWidth == -1 || options.outHeight == -1) {