Fixed some warnings

ThugKd · Dec 3, 2017 · da5fff7 · da5fff7
1 parent 3b0a9d1
commit da5fff7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java b/library/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java
@@ -7,6 +7,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.support.annotation.Keep;
 import android.text.TextUtils;
 
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
@@ -28,10 +29,13 @@ public class SkiaImageDecoder implements ImageDecoder {
 
     private final Bitmap.Config bitmapConfig;
 
+    @Keep
+    @SuppressWarnings("unused")
     public SkiaImageDecoder() {
         this(null);
     }
 
+    @SuppressWarnings("WeakerAccess")
     public SkiaImageDecoder(Bitmap.Config bitmapConfig) {
         Bitmap.Config globalBitmapConfig = SubsamplingScaleImageView.getPreferredBitmapConfig();
         if (bitmapConfig != null) {
@@ -86,7 +90,7 @@ public Bitmap decode(Context context, Uri uri) throws Exception {
                 bitmap = BitmapFactory.decodeStream(inputStream, null, options);
             } finally {
                 if (inputStream != null) {
-                    try { inputStream.close(); } catch (Exception e) { }
+                    try { inputStream.close(); } catch (Exception e) { /* Ignore */ }
                 }
             }
         }

diff --git a/...ary/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java b/...ary/src/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaImageRegionDecoder.java
@@ -8,6 +8,7 @@
 import android.graphics.*;
 import android.net.Uri;
 import android.os.Build;
+import android.support.annotation.Keep;
 import android.text.TextUtils;
 
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
@@ -40,10 +41,13 @@ public class SkiaImageRegionDecoder implements ImageRegionDecoder {
 
     private final Bitmap.Config bitmapConfig;
 
+    @Keep
+    @SuppressWarnings("unused")
     public SkiaImageRegionDecoder() {
         this(null);
     }
 
+    @SuppressWarnings("WeakerAccess")
     public SkiaImageRegionDecoder(Bitmap.Config bitmapConfig) {
         Bitmap.Config globalBitmapConfig = SubsamplingScaleImageView.getPreferredBitmapConfig();
         if (bitmapConfig != null) {
@@ -95,7 +99,7 @@ public Point init(Context context, Uri uri) throws Exception {
                 decoder = BitmapRegionDecoder.newInstance(inputStream, false);
             } finally {
                 if (inputStream != null) {
-                    try { inputStream.close(); } catch (Exception e) { }
+                    try { inputStream.close(); } catch (Exception e) { /* Ignore */ }
                 }
             }
         }

diff --git a/...c/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaPooledImageRegionDecoder.java b/...c/main/java/com/davemorrissey/labs/subscaleview/decoder/SkiaPooledImageRegionDecoder.java
@@ -14,6 +14,7 @@
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
+import android.support.annotation.Keep;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -74,10 +75,13 @@ public class SkiaPooledImageRegionDecoder implements ImageRegionDecoder {
     private Point imageDimensions = new Point(0, 0);
     private final AtomicBoolean lazyInited = new AtomicBoolean(false);
 
+    @Keep
+    @SuppressWarnings("unused")
     public SkiaPooledImageRegionDecoder() {
         this(null);
     }
 
+    @SuppressWarnings("WeakerAccess")
     public SkiaPooledImageRegionDecoder(Bitmap.Config bitmapConfig) {
         Bitmap.Config globalBitmapConfig = SubsamplingScaleImageView.getPreferredBitmapConfig();
         if (bitmapConfig != null) {
@@ -214,7 +218,7 @@ private void initialiseDecoder() throws Exception {
                 }
             } finally {
                 if (inputStream != null) {
-                    try { inputStream.close(); } catch (Exception e) { }
+                    try { inputStream.close(); } catch (Exception e) { /* Ignore */ }
                 }
             }
         }
@@ -308,6 +312,7 @@ public synchronized void recycle() {
      * @param fileLength the size of the image file in bytes. Creating another decoder will use approximately this much native memory.
      * @return true if another decoder can be created.
      */
+    @SuppressWarnings("WeakerAccess")
     protected boolean allowAdditionalDecoder(int numberOfDecoders, long fileLength) {
         if (numberOfDecoders >= 4) {
             debug("No additional decoders allowed, reached hard limit (4)");