Backed out 2 changesets (bug 1390203) to help back out another patch a=backout
authorWes Kocher <wkocher@mozilla.com>
Wed, 23 Aug 2017 14:08:12 -0700
changeset 376413 54d1572562d18dbb56db5204647082ad31f06a65
parent 376412 956d6d351f292d92de17660baba0454578086eab
child 376414 8edd99a178f115fe5ecfeed3854b9631ca4da312
push id49459
push userkwierso@gmail.com
push dateWed, 23 Aug 2017 21:09:10 +0000
treeherderautoland@8edd99a178f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1390203
milestone57.0a1
backs outb1779a4ff84a20a9dff5895f46847a04d6f52099
772283005b0d7a4eeed629bfacc21d8530fd0089
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1390203) to help back out another patch a=backout Backed out changeset b1779a4ff84a (bug 1390203) Backed out changeset 772283005b0d (bug 1390203) MozReview-Commit-ID: AS7NfLgQfq9
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamOverridablePageIconLayout.java
mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamOverridablePageIconLayout.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/stream/StreamOverridablePageIconLayout.java
@@ -14,17 +14,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import com.squareup.picasso.Picasso;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.icons.IconCallback;
 import org.mozilla.gecko.icons.IconResponse;
 import org.mozilla.gecko.icons.Icons;
-import org.mozilla.gecko.util.NetworkUtils;
 import org.mozilla.gecko.widget.FaviconView;
 
 import java.util.concurrent.Future;
 
 /**
  * A layout that represents page icons in Activity Stream, which can be overridden with a custom URL.
  *
  * Under the hood, it switches between multiple icon views because favicons (in FaviconView)
@@ -54,20 +53,17 @@ public class StreamOverridablePageIconLa
 
     /**
      * Updates the icon for the view. If a non-null overrideImageURL is provided, this image will be shown.
      * Otherwise, a favicon will be retrieved for the given pageURL.
      */
     public void updateIcon(@NonNull final String pageURL, @Nullable final String overrideImageURL) {
         cancelPendingRequests();
 
-        // We don't know how the large the non-favicon images could be (bug 1388415) so for now we're only going
-        // to download them on wifi. Alternatively, we could get these from the Gecko cache (see below).
-        if (NetworkUtils.isWifi(getContext()) &&
-                !TextUtils.isEmpty(overrideImageURL)) {
+        if (!TextUtils.isEmpty(overrideImageURL)) {
             setUIMode(UIMode.NONFAVICON_IMAGE);
 
             // TODO (bug 1322501): Optimization: since we've already navigated to these pages, there's a chance
             // Gecko has the image in its cache: we should try to get it first before making this network request.
             Picasso.with(getContext())
                     .load(Uri.parse(overrideImageURL))
                     .fit()
                     .centerCrop()
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/NetworkUtils.java
@@ -105,21 +105,16 @@ public class NetworkUtils {
                 return ConnectionSubType.WIMAX;
             case ConnectivityManager.TYPE_WIFI:
                 return ConnectionSubType.WIFI;
             default:
                 return ConnectionSubType.UNKNOWN;
         }
     }
 
-    public static boolean isWifi(@NonNull final Context context) {
-        final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return getConnectionType(connectivityManager) == ConnectionType.WIFI;
-    }
-
     public static ConnectionType getConnectionType(ConnectivityManager connectivityManager) {
         if (connectivityManager == null) {
             return ConnectionType.NONE;
         }
 
         final NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
         if (networkInfo == null) {
             return ConnectionType.NONE;