From 1a0e295aebb3c9f8f781451843f955133b6729c5 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@riseup.net>
Date: Tue, 2 Aug 2016 22:02:15 +0200
Subject: [PATCH] Disabled nested scrolling in webview. Fixes #28

---
 .../com/github/dfa/diaspora_android/activity/MainActivity.java   | 1 +
 .../com/github/dfa/diaspora_android/ui/ContextMenuWebView.java   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index c8e5bf51..eccd3c45 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -281,6 +281,7 @@ public class MainActivity extends AppCompatActivity
         this.registerForContextMenu(webView);
         webView.setParentActivity(this);
         webView.setOverScrollMode(WebView.OVER_SCROLL_ALWAYS);
+        webView.setNestedScrollingEnabled(false);
 
         // Setup WebView
         //TODO: Dangerous on API < 17. Can we do anything about this?
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
index 13f6c05a..b3758dad 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
@@ -44,7 +44,6 @@ import com.github.dfa.diaspora_android.activity.MainActivity;
 import com.github.dfa.diaspora_android.task.ImageDownloadTask;
 
 import java.io.File;
-import java.sql.Time;
 
 /**
  * Subclass of WebView which adds a context menu for long clicks on images or links to share, save