diff --git a/mobile/android/base/Favicons.java b/mobile/android/base/Favicons.java index 55b1f00dca34..4a70f4fe6783 100644 --- a/mobile/android/base/Favicons.java +++ b/mobile/android/base/Favicons.java @@ -6,6 +6,7 @@ package org.mozilla.gecko; import org.mozilla.gecko.db.BrowserDB; +import org.mozilla.gecko.util.GeckoJarReader; import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpGet; diff --git a/mobile/android/base/GeckoJarReader.java b/mobile/android/base/GeckoJarReader.java index 2bd5452c76bc..ad7017d79c2f 100644 --- a/mobile/android/base/GeckoJarReader.java +++ b/mobile/android/base/GeckoJarReader.java @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko; +package org.mozilla.gecko.util; import android.graphics.drawable.BitmapDrawable; import android.util.Log; @@ -20,9 +20,11 @@ import java.util.zip.ZipInputStream; /* Reads out of a multiple level deep jar file such as * jar:jar:file:///data/app/org.mozilla.fennec.apk!/omni.ja!/chrome/chrome/content/branding/favicon32.png */ -public class GeckoJarReader { +public final class GeckoJarReader { private static String LOGTAG = "GeckoJarReader"; + private GeckoJarReader() {} + public static BitmapDrawable getBitmapDrawable(String url) { Stack jarUrls = parseUrl(url); InputStream inputStream = null; diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 693c85b6ccb8..e7e732206331 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -23,6 +23,7 @@ MOZGLUE_JAVA_FILES := \ UTIL_JAVA_FILES := \ ActivityResultHandler.java \ ActivityResultHandlerMap.java \ + GeckoJarReader.java \ INIParser.java \ INISection.java \ util/FloatUtils.java \ @@ -72,7 +73,6 @@ FENNEC_JAVA_FILES = \ GeckoEventResponder.java \ GeckoHalDefines.java \ GeckoInputConnection.java \ - GeckoJarReader.java \ GeckoMenu.java \ GeckoMenuInflater.java \ GeckoMenuItem.java \ diff --git a/mobile/android/base/tests/testJarReader.java.in b/mobile/android/base/tests/testJarReader.java.in index a3b105c1eb8b..c1157ca8d6b5 100644 --- a/mobile/android/base/tests/testJarReader.java.in +++ b/mobile/android/base/tests/testJarReader.java.in @@ -27,7 +27,7 @@ public class testJarReader extends BaseTest { public void testJarReader() { try { ClassLoader classLoader = getActivity().getClassLoader(); - Class gjrClass = classLoader.loadClass("org.mozilla.gecko.GeckoJarReader"); + Class gjrClass = classLoader.loadClass("org.mozilla.gecko.util.GeckoJarReader"); Method getStreamMethod = gjrClass.getMethod("getStream", String.class); String appPath = getActivity().getApplication().getPackageResourcePath();