From f693418d64b4ef3a8775cb118e39eb986c286e2e Mon Sep 17 00:00:00 2001
From: massimilianoLe <44651815+massimilianoLe@users.noreply.github.com>
Date: Sat, 1 Dec 2018 17:12:04 +0100
Subject: [PATCH] Make youtube links open external, by @massimilianoLe (#220)

---
 .../com/github/dfa/diaspora_android/util/AppSettings.java | 4 ++++
 .../github/dfa/diaspora_android/web/BrowserFragment.java  | 6 +++---
 .../dfa/diaspora_android/web/CustomWebViewClient.java     | 8 ++++++++
 .../main/res/drawable/ic_open_yt_external_black_24px.xml  | 5 +++++
 app/src/main/res/values/strings-not_translatable.xml      | 3 ++-
 app/src/main/res/values/strings.xml                       | 2 ++
 app/src/main/res/xml/preferences__master.xml              | 7 +++++++
 7 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_open_yt_external_black_24px.xml

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
index 8d3bb655..8ae76fea 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
@@ -359,6 +359,10 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
         return getBool(R.string.pref_key__topbar_stream_shortcut, false);
     }
 
+    public boolean isOpenYoutubeExternalEnabled() {
+        return getBool(R.string.pref_key__open_youtube_external_enabled, true);
+    }
+
     public String getScreenRotation() {
         return getString(R.string.pref_key__screen_rotation, R.string.rotation_val_system);
     }
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
index 32a1e83a..d28716d4 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/BrowserFragment.java
@@ -94,9 +94,9 @@ public class BrowserFragment extends ThemedFragment {
         this.setRetainInstance(true);
 
         //pull to refresh
-  swipe = view.findViewById(R.id.swipe);
-  swipe.setOnRefreshListener(() -> reloadUrl());
-  swipe.setDistanceToTriggerSync(20000);
+    swipe = view.findViewById(R.id.swipe);
+    swipe.setOnRefreshListener(() -> reloadUrl());
+    swipe.setDistanceToTriggerSync(2000);
     }
 
     @Override
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
index c6af6f85..848e1b65 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/web/CustomWebViewClient.java
@@ -19,7 +19,9 @@
 package com.github.dfa.diaspora_android.web;
 
 import android.annotation.TargetApi;
+import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.support.v4.content.LocalBroadcastManager;
 import android.webkit.CookieManager;
@@ -38,6 +40,7 @@ public class CustomWebViewClient extends WebViewClient {
     private final App app;
     private String lastLoadUrl = "";
     private boolean isAdBlockEnabled = false;
+    AppSettings appSettings = AppSettings.get();
 
     public CustomWebViewClient(App app, WebView webView) {
         this.app = app;
@@ -56,6 +59,11 @@ public class CustomWebViewClient extends WebViewClient {
                 || (host != null && (url.startsWith("https://" + host)
                 || url.startsWith("http://" + host)))) {
             return false;
+        }//make youtube links open external-->never customtab
+        else if (appSettings.isOpenYoutubeExternalEnabled()&&(url.startsWith("https://youtube.com/") || url.startsWith("https://www.youtube.com/") || url.startsWith("https://m.youtube.com/") || url.startsWith("https://youtu.be/"))){
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            view.getContext().startActivity(intent);
+            return true;
         } else {
             Intent i = new Intent(MainActivity.ACTION_OPEN_EXTERNAL_URL);
             i.putExtra(MainActivity.EXTRA_URL, url);
diff --git a/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml b/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml
new file mode 100644
index 00000000..14e620e1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_yt_external_black_24px.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000"
+        android:pathData="M19.0447,29.8394 L32.0088,23.143 19.0447,16.3663ZM24,6.7503c10.0981,0 16.7945,0.4821 16.7945,0.4821 0.9375,0.1071 3,0.1071 4.8214,2.0357 0,0 1.4732,1.4464 1.9018,4.7678 0.5089,3.8839 0.4821,7.7678 0.4821,7.7678v3.6428c0,0 0.0268,3.8839 -0.4821,7.7678 -0.4286,3.2946 -1.9018,4.7678 -1.9018,4.7678 -1.8214,1.9018 -3.8839,1.9018 -4.8214,2.0089C40.7945,39.9911 34.0981,40.5 24,40.5 11.518,40.3929 7.6877,40.0179 7.6877,40.0179 6.6162,39.8304 4.2056,39.8839 2.3841,37.9822c0,0 -1.4732,-1.4732 -1.9018,-4.7678C-0.0265,29.3305 0.0002,25.4466 0.0002,25.4466v-3.6428c0,0 -0.0268,-3.8839 0.4821,-7.7678C0.9109,10.7146 2.3841,9.2682 2.3841,9.2682 4.2056,7.3396 6.268,7.3396 7.2055,7.2325c0,0 6.6964,-0.4821 16.7945,-0.4821z" android:strokeWidth="0.02678544"/>
+</vector>
diff --git a/app/src/main/res/values/strings-not_translatable.xml b/app/src/main/res/values/strings-not_translatable.xml
index aaa5137a..c66a18d4 100644
--- a/app/src/main/res/values/strings-not_translatable.xml
+++ b/app/src/main/res/values/strings-not_translatable.xml
@@ -148,4 +148,5 @@
     <string name="pref_key__show_title" translatable="false">pref_key__show_title</string>
     <string name="pdf" translatable="false">PDF</string>
     <string name="gsantner" translatable="false">gsantner</string>
-</resources>
+    <string name="pref_key__open_youtube_external_enabled" translatable="false">pref_key__open_youtube_external_enabled</string>
+  </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d61d659c..6c542f21 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -253,5 +253,7 @@
     <string name="the_following_libraries_are_used">The following libraries are used:</string>
     <string name="inspiration_from_leafpic__appspecific">We took some inspiration and code from LeafPic. Go check it out, it\'s free software as well!</string>
     <string name="tell_me_more">Tell me more</string>
+    <string name="open_youtube_external_tabs_description">Enable to open Youtube links on external app</string>
+    <string name="pref_title__open_youtube_external">Youtube links</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences__master.xml b/app/src/main/res/xml/preferences__master.xml
index 7bb330f9..c1ab7939 100644
--- a/app/src/main/res/xml/preferences__master.xml
+++ b/app/src/main/res/xml/preferences__master.xml
@@ -73,6 +73,13 @@
             android:summary="@string/open_external_links_with_chrome_custom_tabs_description"
             android:title="@string/pref_title__chrome_custom_tabs_enabled"/>
 
+        <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_open_yt_external_black_24px"
+            android:key="@string/pref_key__open_youtube_external_enabled"
+            android:summary="@string/open_youtube_external_tabs_description"
+            android:title="@string/pref_title__open_youtube_external"/>
+
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:icon="@drawable/ic_touch_app_black_24px"