refactoring: use AnchorAwareLinkMovementMethod everywhere

* bad HTML input might occur in all places
* so better safe than sorry

3 files changed, 10 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index 3b76b6c..d14df7b 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -3,12 +3,12 @@ package cgeo.geocaching;
 import butterknife.InjectView;
 
 import cgeo.geocaching.activity.AbstractActivity;
+import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.utils.Version;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;
 
@@ -22,8 +22,8 @@ public class AboutActivity extends AbstractActivity {
         super.onCreate(savedInstanceState, R.layout.about_activity);
 
         version.setText(Version.getVersionName(this));
-        contributors.setMovementMethod(LinkMovementMethod.getInstance());
-        changeLog.setMovementMethod(LinkMovementMethod.getInstance());
+        contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
+        changeLog.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
     }
 
     /**
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 9a25998..46df8cd 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -72,7 +72,6 @@ import android.text.Html;
 import android.text.Spannable;
 import android.text.Spanned;
 import android.text.format.DateUtils;
-import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
@@ -1238,7 +1237,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     TextView licenseView = ((TextView) view.findViewById(R.id.license));
                     licenseView.setText(Html.fromHtml(license), BufferType.SPANNABLE);
                     licenseView.setClickable(true);
-                    licenseView.setMovementMethod(LinkMovementMethod.getInstance());
+                    licenseView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
                 } else {
                     view.findViewById(R.id.license_box).setVisibility(View.GONE);
                 }
@@ -1770,7 +1769,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             // cache personal note
             final TextView personalNoteView = (TextView) view.findViewById(R.id.personalnote);
             setPersonalNote(personalNoteView);
-            personalNoteView.setMovementMethod(LinkMovementMethod.getInstance());
+            personalNoteView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             registerForContextMenu(personalNoteView);
             final Button personalNoteEdit = (Button) view.findViewById(R.id.edit_personalnote);
             if (cache.isOffline()) {
@@ -2140,7 +2139,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     if (null == convertView) {
                         // if convertView != null then this listeners are already set
                         holder.author.setOnClickListener(userActionsClickListener);
-                        holder.text.setMovementMethod(LinkMovementMethod.getInstance());
+                        holder.text.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
                         holder.text.setOnClickListener(decryptTextClickListener);
                         registerForContextMenu(holder.text);
                     }
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 41b8b24..9b6f491 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.geopoint.Units;
 import cgeo.geocaching.network.HtmlImage;
 import cgeo.geocaching.network.Network;
 import cgeo.geocaching.ui.AbstractCachingPageViewCreator;
+import cgeo.geocaching.ui.AnchorAwareLinkMovementMethod;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.utils.BaseUtils;
@@ -26,7 +27,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.Html;
-import android.text.method.LinkMovementMethod;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -452,7 +452,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
             }
 
             TextView logView = holder.text;
-            logView.setMovementMethod(LinkMovementMethod.getInstance());
+            logView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
 
             String logText = log.log;
             if (BaseUtils.containsHtml(logText)) {
@@ -596,7 +596,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
                 TextView descView = (TextView) view.findViewById(R.id.goal);
                 descView.setVisibility(View.VISIBLE);
                 descView.setText(Html.fromHtml(trackable.getGoal(), new HtmlImage(geocode, true, 0, false), null), TextView.BufferType.SPANNABLE);
-                descView.setMovementMethod(LinkMovementMethod.getInstance());
+                descView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             }
 
             // trackable details
@@ -605,7 +605,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
                 TextView descView = (TextView) view.findViewById(R.id.details);
                 descView.setVisibility(View.VISIBLE);
                 descView.setText(Html.fromHtml(trackable.getDetails(), new HtmlImage(geocode, true, 0, false), new UnknownTagsHandler()), TextView.BufferType.SPANNABLE);
-                descView.setMovementMethod(LinkMovementMethod.getInstance());
+                descView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             }
 
             // trackable image