Bug 1382489 - decode urls before opening them. r?mcomella draft user-entered
authorChenxia Liu <liuche@mozilla.com>
Thu, 20 Jul 2017 17:17:42 -0700
changeset 612701 a266b86e03bcf5f8799ec59a0371392091d52ce0
parent 612696 7d2e89fb92331d7e4296391213c1e63db628e046
child 638481 97ff82311d9c3786d36d20363772e9a69239318a
push id69576
push usercliu@mozilla.com
push dateFri, 21 Jul 2017 00:18:52 +0000
reviewersmcomella
bugs1382489
milestone56.0a1
Bug 1382489 - decode urls before opening them. r?mcomella MozReview-Commit-ID: 9R6ytSgajEE
mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topsites/TopSitesPageAdapter.java
@@ -14,16 +14,17 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.activitystream.ActivityStreamTelemetry;
 import org.mozilla.gecko.home.HomePager;
 import org.mozilla.gecko.activitystream.homepanel.model.TopSite;
+import org.mozilla.gecko.util.StringUtils;
 import org.mozilla.gecko.widget.RecyclerViewClickSupport;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
 /* package-local */ class TopSitesPageAdapter extends RecyclerView.Adapter<TopSitesCard> implements RecyclerViewClickSupport.OnItemClickListener {
     private List<TopSite> topSites;
@@ -82,17 +83,17 @@ import java.util.List;
                 .set(ActivityStreamTelemetry.Contract.ACTION_POSITION, absolutePosition);
 
         Telemetry.sendUIEvent(
                 TelemetryContract.Event.LOAD_URL,
                 TelemetryContract.Method.LIST_ITEM,
                 extras.build()
         );
 
-        onUrlOpenListener.onUrlOpen(topSite.getUrl(), EnumSet.noneOf(HomePager.OnUrlOpenListener.Flags.class));
+        onUrlOpenListener.onUrlOpen(StringUtils.decodeUserEnteredUrl(topSite.getUrl()), EnumSet.noneOf(HomePager.OnUrlOpenListener.Flags.class));
     }
 
     @Override
     public void onBindViewHolder(TopSitesCard holder, int position) {
         holder.bind(topSites.get(position), getTopSiteAbsolutePosition(position));
     }
 
     @Override