move image related constant out of geocache class

2 files changed, 9 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 16a5023..61f13b9 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -161,10 +161,6 @@ public class Geocache implements ICache, IWaypoint {
 
     private Handler changeNotificationHandler = null;
 
-    // Images whose URL contains one of those patterns will not be available on the Images tab
-    // for opening into an external application.
-    private final static String[] NO_EXTERNAL = new String[]{"geocheck.org"};
-
     /**
      * Create a new cache. To be used everywhere except for the GPX parser
      */
@@ -1706,7 +1702,7 @@ public class Geocache implements ICache, IWaypoint {
         Html.fromHtml(getDescription(), new ImageGetter() {
             @Override
             public Drawable getDrawable(final String source) {
-                if (!urls.contains(source) && !ImageUtils.containsPattern(source, NO_EXTERNAL)) {
+                if (!urls.contains(source) && ImageUtils.canBeOpenedExternally(source)) {
                     images.add(new Image(source, geocode));
                     urls.add(source);
                 }
diff --git a/main/src/cgeo/geocaching/utils/ImageUtils.java b/main/src/cgeo/geocaching/utils/ImageUtils.java
index d2edfc6..d25d5a4 100644
--- a/main/src/cgeo/geocaching/utils/ImageUtils.java
+++ b/main/src/cgeo/geocaching/utils/ImageUtils.java
@@ -49,6 +49,10 @@ public final class ImageUtils {
     private static final int[] ROTATION = new int[] { 90, 180, 270 };
     private static final int MAX_DISPLAY_IMAGE_XY = 800;
 
+    // Images whose URL contains one of those patterns will not be available on the Images tab
+    // for opening into an external application.
+    private final static String[] NO_EXTERNAL = new String[] { "geocheck.org" };
+
     private ImageUtils() {
         // Do not let this class be instantiated, this is a utility class.
     }
@@ -341,4 +345,8 @@ public final class ImageUtils {
             drawableObservable.observeOn(AndroidSchedulers.mainThread()).subscribe(this);
         }
     }
+
+    public static boolean canBeOpenedExternally(final String source) {
+        return !containsPattern(source, NO_EXTERNAL);
+    }
 }