Merge pull request #260 from iFixit/fix-html-injection

Fix html injection
iFixit · Feb 18, 2016 · 4a7627c · 4a7627c
2 parents 3985019 + 836e41f
commit 4a7627c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/App/build.gradle b/App/build.gradle
@@ -3,7 +3,7 @@ buildscript {
       mavenCentral()
    }
    dependencies {
-      classpath 'com.android.tools.build:gradle:1.0.0'
+      classpath 'com.android.tools.build:gradle:1.5.0'
    }
 }
 
@@ -48,8 +48,8 @@ android {
    buildToolsVersion "21.1.2"
 
    defaultConfig {
-      versionCode 59
-      versionName "2.9.1"
+      versionCode 60 
+      versionName "2.9.2"
       minSdkVersion 9
       targetSdkVersion 21
       applicationId "com.dozuki.ifixit"

diff --git a/App/src/com/dozuki/ifixit/model/search/GuideSearchResult.java b/App/src/com/dozuki/ifixit/model/search/GuideSearchResult.java
@@ -45,7 +45,7 @@ public void onClick(View v) {
          }
       });
 
-      ((TextView)v.findViewById(R.id.guide_title)).setText(Html.fromHtml(mGuideInfo.mTitle));
+      ((TextView)v.findViewById(R.id.guide_title)).setText(mGuideInfo.mTitle);
       ((TextView)v.findViewById(R.id.guide_author)).setText(
        App.get().getString(R.string.by_author, mGuideInfo.mAuthorName));
 

diff --git a/App/src/com/dozuki/ifixit/ui/GuideItemView.java b/App/src/com/dozuki/ifixit/ui/GuideItemView.java
@@ -34,8 +34,7 @@ public GuideItemView(Context context, boolean shortTitle) {
    }
 
    public void setGuideItem(GuideInfo guide) {
-      mTitleView.setText(mShortTitle && guide.hasSubject() ?
-       guide.mSubject : Html.fromHtml(guide.mTitle));
+      mTitleView.setText(mShortTitle && guide.hasSubject() ? guide.mSubject : guide.mTitle);
 
       Transformation transform = new RoundedTransformation(4, 0);
 

diff --git a/App/src/com/dozuki/ifixit/ui/guide/create/GuideListItem.java b/App/src/com/dozuki/ifixit/ui/guide/create/GuideListItem.java
@@ -173,7 +173,7 @@ public void setRowData(GuideInfo guideInfo) {
       mGuideInfo = guideInfo;
       setTag(mGuideInfo.mGuideid);
 
-      mTitleView.setText(Html.fromHtml(mGuideInfo.mTitle));
+      mTitleView.setText(mGuideInfo.mTitle);
 
       if (mThumbnail != null) {
          Picasso picasso = PicassoUtils.with(mContext);

diff --git a/App/src/com/dozuki/ifixit/ui/guide/create/OfflineGuideListItem.java b/App/src/com/dozuki/ifixit/ui/guide/create/OfflineGuideListItem.java
@@ -89,7 +89,7 @@ public void setRowData(GuideMediaProgress guideMedia, boolean displayLiveImages,
     boolean isSyncing) {
       mGuideMedia = guideMedia;
 
-      mTitleView.setText(Html.fromHtml(mGuideMedia.mGuideInfo.mTitle));
+      mTitleView.setText(mGuideMedia.mGuideInfo.mTitle);
       mProgressButton.setPinned(true);
       mProgressButton.setCircleColor(getResources().getColor(
        R.color.progress_button_background));

diff --git a/App/src/com/dozuki/ifixit/ui/guide/view/GuideIntroViewFragment.java b/App/src/com/dozuki/ifixit/ui/guide/view/GuideIntroViewFragment.java
@@ -76,7 +76,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
       mIntro.setMovementMethod(method);
 
       if (mGuide != null) {
-         mTitle.setText(Html.fromHtml(mGuide.getTitle()));
+         mTitle.setText(mGuide.getTitle());
 
          String introductionText = mGuide.getIntroductionRendered();
 
@@ -159,7 +159,11 @@ public void onGlobalLayout() {
             }
          }
 
-         mIntro.setText(Utils.correctLinkPaths(Html.fromHtml(introductionText, null, new WikiHtmlTagHandler())));
+         if (introductionText.length() > 0) {
+            mIntro.setText(Utils.correctLinkPaths(Html.fromHtml(introductionText, null, new WikiHtmlTagHandler())));
+         } else {
+            mIntro.setText(introductionText);
+         }
 
          // Authors and Difficulty are not relevant on teardowns.
          if (mGuide.getType().equalsIgnoreCase("teardown")) {