update to 0.5.8 - fix unwanted tap on links

News-Android-App/News-Android-App-News-Android-App.iml

@@ -73,8 +73,8 @@
     <orderEntry type="library" exported="" name="library-0.2.0" level="project" />
     <orderEntry type="library" exported="" name="library-0.9.3" level="project" />
     <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-19.0.1" level="project" />
     <orderEntry type="library" exported="" name="actionbarsherlock-4.4.0" level="project" />
     <orderEntry type="module" module-name="MessageBar" exported="" />
     <orderEntry type="module" module-name="ChangeLogLibrary" exported="" />

News-Android-App/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.luhmer.owncloudnewsreader"
-    android:versionCode="42"
-    android:versionName="0.5.7" >
+    android:versionCode="43"
+    android:versionName="0.5.8" >
 
     <uses-sdk
         android:minSdkVersion="7"

News-Android-App/src/main/assets/LinkLongClick.js

@@ -4,14 +4,19 @@ for (var i = 0; i < links.length; i++) {
 
     (function (link) {
         var timer;
+
+
+        if(link.children.length > 0 && link.children[0].nodeName != "IMG ") {
+            //Do nothing
+        } else {
             link.addEventListener('mouseup', function() {
                 clearTimeout(timer);
             });
 
-
             link.addEventListener('mousedown', function (e) {
                 timer = window.setTimeout(function() {
                     e.preventDefault();
+                    //alert(link.children[0].nodeName);
                     Android.openLinkInBrowser(link.getAttribute('href'));
                 }, 1000);
             });
@@ -23,9 +28,14 @@ for (var i = 0; i < links.length; i++) {
                 }, 1000);
             });
 
+            link.addEventListener("touchmove", function(e){
+                clearTimeout(timer);
+            });
+
             link.addEventListener('touchend', function() {
                 clearTimeout(timer);
             });
+        }
     })(links[i]);
 
 }

News-Android-App/src/main/assets/web_template.html

@@ -34,6 +34,10 @@
 							}, 1000);
 						});
 
+						image.addEventListener("touchmove", function(e){
+                            clearTimeout(timer);
+						});
+
                         image.addEventListener('touchend', function() {
 							clearTimeout(timer);
 						});

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java

@@ -215,6 +215,12 @@ public class SettingsActivity extends SherlockPreferenceActivity {
 		}
 	}
 
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return true;
+    }
+
 	/**
 	 * A preference value change listener that updates the preference's summary
 	 * to reflect its new value.

README.md

@@ -64,10 +64,15 @@ git clone --recursive https://github.com/owncloud/News-Android-App.git -b dev
 
 Updates
 ==================================
-0.5.8 (in development)
+0.5.9 (in development)
 ---------------------
 
 
+0.5.8 (Google Play)
+---------------------
+- Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/214">#214 Scrolling within article causes unwanted tap on links</a>
+
+
 0.5.7 (Google Play - Beta)
 ---------------------
 - Bug fix - <a href="https://github.com/owncloud/News-Android-App/issues/213">#213 When using the dark theme websites with no background color are unreadable</a>
@@ -75,7 +80,7 @@ Updates
 - Improvement - <a href="https://github.com/owncloud/News-Android-App/issues/198">#198 enable auto sync configuration</a>
 
 
-0.5.6 (Google Play)
+0.5.6
 ---------------------
 - Fixed flickering of the screen when changing Feeds (in dark Theme)
 - New Pull-To-Refresh Style