Bug 1276050 - Remove duplicate code from Favicons r?sebastian draft
authorAndrzej Hunt <ahunt@mozilla.com>
Mon, 23 May 2016 13:27:26 -0700
changeset 371836 15ace5d9b9754e1cf9c63146f41d46712dec38a1
parent 371835 def937e0dda7f3e9409e3f5bd70a659c4232782f
child 522024 d040c290925f65749549e8682b7b013aa8f3a801
push id19360
push userahunt@mozilla.com
push dateThu, 26 May 2016 21:45:58 +0000
reviewerssebastian
bugs1276050
milestone49.0a1
Bug 1276050 - Remove duplicate code from Favicons r?sebastian loadUncachedFavicon does exactly the same thing. MozReview-Commit-ID: 58Yi28JZfv4
mobile/android/base/java/org/mozilla/gecko/favicons/Favicons.java
--- a/mobile/android/base/java/org/mozilla/gecko/favicons/Favicons.java
+++ b/mobile/android/base/java/org/mozilla/gecko/favicons/Favicons.java
@@ -288,25 +288,17 @@ public class Favicons {
             final Bitmap result = getSizedFaviconFromCache(targetURL, targetSize);
             if (result != null) {
                 // Victory - immediate response!
                 return dispatchResult(pageURL, targetURL, result, callback);
             }
         }
 
         // No joy using in-memory resources. Go to background thread and ask the database.
-        final LoadFaviconTask task =
-            new LoadFaviconTask(context, pageURL, targetURL, 0, callback, targetSize, true);
-        final int taskId = task.getId();
-        synchronized (loadTasks) {
-            loadTasks.put(taskId, task);
-        }
-        task.execute();
-
-        return taskId;
+        return loadUncachedFavicon(context, pageURL, targetURL, 0, targetSize, callback);
     }
 
     public static int getSizedFaviconForPageFromLocal(Context context, final String pageURL, final OnFaviconLoadedListener callback) {
         return getSizedFaviconForPageFromLocal(context, pageURL, defaultFaviconSize, callback);
     }
 
     /**
      * Helper method to determine the URL of the Favicon image for a given page URL by querying the