From ed4b4a1a3ca0ccf570d275a07ced98555cd32105 Mon Sep 17 00:00:00 2001
From: Alec Holmes <alec@clockworkant.com>
Date: Fri, 1 Feb 2019 13:02:28 +0000
Subject: [PATCH 1/7] Updated search fragment to be amazon fire tv friendly

---
 .../java/org/schabi/newpipe/firetv/FireTvUtils.java | 11 +++++++++++
 .../fragments/list/search/SearchFragment.java       | 13 +++++++++----
 app/src/main/res/layout/toolbar_search_layout.xml   |  4 +++-
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java

diff --git a/app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java b/app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java
new file mode 100644
index 000000000..305c29ee7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java
@@ -0,0 +1,11 @@
+package org.schabi.newpipe.firetv;
+
+import android.content.Context;
+import org.schabi.newpipe.App;
+
+public class FireTvUtils {
+    public static boolean isFireTv(){
+        final String AMAZON_FEATURE_FIRE_TV = "amazon.hardware.fire_tv";
+        return App.getApp().getPackageManager().hasSystemFeature(AMAZON_FEATURE_FIRE_TV);
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 2833abb8d..0e8aad01d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -39,6 +39,7 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.search.SearchInfo;
+import org.schabi.newpipe.firetv.FireTvUtils;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -449,6 +450,9 @@ public class SearchFragment
             if (isSuggestionsEnabled && errorPanelRoot.getVisibility() != View.VISIBLE) {
                 showSuggestionsPanel();
             }
+            if(FireTvUtils.isFireTv()){
+                showKeyboardSearch();
+            }
         });
 
         searchEditText.setOnFocusChangeListener((View v, boolean hasFocus) -> {
@@ -499,7 +503,9 @@ public class SearchFragment
                     if (DEBUG) {
                         Log.d(TAG, "onEditorAction() called with: v = [" + v + "], actionId = [" + actionId + "], event = [" + event + "]");
                     }
-                    if (event != null
+                    if(actionId == EditorInfo.IME_ACTION_PREVIOUS){
+                        hideKeyboardSearch();
+                    } else if (event != null
                             && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER
                                 || event.getAction() == EditorInfo.IME_ACTION_SEARCH)) {
                         search(searchEditText.getText().toString(), new String[0], "");
@@ -541,7 +547,7 @@ public class SearchFragment
         if (searchEditText.requestFocus()) {
             InputMethodManager imm = (InputMethodManager) activity.getSystemService(
                     Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_IMPLICIT);
+            imm.showSoftInput(searchEditText, InputMethodManager.SHOW_FORCED);
         }
     }
 
@@ -551,8 +557,7 @@ public class SearchFragment
 
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(
                 Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(),
-                InputMethodManager.HIDE_NOT_ALWAYS);
+        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), InputMethodManager.RESULT_UNCHANGED_SHOWN);
 
         searchEditText.clearFocus();
     }
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
index 797eea48e..9e9e51442 100644
--- a/app/src/main/res/layout/toolbar_search_layout.xml
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -30,7 +30,9 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_gravity="right|center_vertical"
-        tools:ignore="RtlHardcoded">
+        android:focusable="true"
+        tools:ignore="RtlHardcoded"
+        android:background="?attr/selectableItemBackground">
 
         <View
             android:layout_width="28dp"

From ad354aca4e3f5e157f1b3e6813175fc7545afae2 Mon Sep 17 00:00:00 2001
From: Connectety-W <connectetyGit@yandex.com>
Date: Sat, 9 Feb 2019 12:30:14 +0100
Subject: [PATCH 2/7] added support for youtube-nocookie.com

---
 app/src/main/AndroidManifest.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06d621016..db2d5f13c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -183,6 +183,19 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
+                <data android:scheme="http"/>
+                <data android:scheme="https"/>
+                <data android:host="www.youtube-nocookie.com"/>
+                <data android:pathPrefix="/embed/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
                 <data android:scheme="vnd.youtube"/>
                 <data android:scheme="vnd.youtube.launch"/>
             </intent-filter>

From 9437f057d0e2a5f242cf8aae9ce5376c8b3b4f72 Mon Sep 17 00:00:00 2001
From: Redirion <redirion@web.de>
Date: Thu, 14 Feb 2019 09:52:46 +0100
Subject: [PATCH 3/7] Fix delayed ducking of Audio

Scenario: listening to a video on NewPipe over Bluetooth and a Notification Sound causes audio focus event AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK.

Problem: With the current implementation animateAudio would cause the audio to reach the target volume AFTER the notification sound is played, which is irritating and annoying.

Solution: animateAudio should just be used on focusGain where it is sensible to increase audio gradually. On ducking event the reaction should be immediate.

This very simple fix does this. Please approve.
---
 .../java/org/schabi/newpipe/player/helper/AudioReactor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index 46d20c7e1..f148aed27 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -131,7 +131,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
     private void onAudioFocusLossCanDuck() {
         Log.d(TAG, "onAudioFocusLossCanDuck() called");
         // Set the volume to 1/10 on ducking
-        animateAudio(player.getVolume(), DUCK_AUDIO_TO);
+        player.setVolume(DUCK_AUDIO_TO);
     }
 
     private void animateAudio(final float from, final float to) {

From db9cf9564820fbf1bbd6087d3e6b3189d69d2e13 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply@github.com>
Date: Sun, 17 Feb 2019 09:52:05 +0100
Subject: [PATCH 4/7] Remove old player from the manifest

See https://github.com/TeamNewPipe/NewPipe/pull/1884 for more info
---
 app/src/main/AndroidManifest.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06d621016..af6dda798 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,12 +35,6 @@
             </intent-filter>
         </receiver>
 
-        <activity
-            android:name=".player.old.PlayVideoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/OldVideoPlayerTheme"
-            tools:ignore="UnusedAttribute"/>
-
         <service
             android:name=".player.BackgroundPlayer"
             android:exported="false">

From 4dd572063ef5b38d9c31e66b306e47727702e106 Mon Sep 17 00:00:00 2001
From: kapodamy <kapo.damy@yahoo.com.ar>
Date: Sun, 17 Feb 2019 16:59:35 -0300
Subject: [PATCH 5/7] fix crash while switching from popup to fullscreen
 player, or closing the popup player.

---
 .../main/java/org/schabi/newpipe/player/PopupVideoPlayer.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index f5c731ed9..8ea3d509c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -626,6 +626,7 @@ public final class PopupVideoPlayer extends Service {
         @Override
         public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
             super.onLoadingComplete(imageUri, view, loadedImage);
+            if (playerImpl == null) return;
             // rebuild notification here since remote view does not release bitmaps,
             // causing memory leaks
             resetNotification();

From 4b5591d8844a3255e3e83eada605cd3b4b781f29 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 19 Feb 2019 14:57:49 +0100
Subject: [PATCH 6/7] move firetv utils into utils package

---
 .../schabi/newpipe/fragments/list/search/SearchFragment.java   | 2 +-
 .../java/org/schabi/newpipe/{firetv => util}/FireTvUtils.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/{firetv => util}/FireTvUtils.java (80%)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 87ebf14d2..e20d6bad3 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -39,7 +39,7 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.search.SearchInfo;
-import org.schabi.newpipe.firetv.FireTvUtils;
+import org.schabi.newpipe.util.FireTvUtils;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
diff --git a/app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java b/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
similarity index 80%
rename from app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java
rename to app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
index 305c29ee7..69666463e 100644
--- a/app/src/main/java/org/schabi/newpipe/firetv/FireTvUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/FireTvUtils.java
@@ -1,6 +1,5 @@
-package org.schabi.newpipe.firetv;
+package org.schabi.newpipe.util;
 
-import android.content.Context;
 import org.schabi.newpipe.App;
 
 public class FireTvUtils {

From 7981f9dc9129f232d5dce75e7277d19f55316e40 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 19 Feb 2019 16:03:10 +0100
Subject: [PATCH 7/7] add database doc in dia

---
 assets/db.dia | Bin 0 -> 2520 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 assets/db.dia

diff --git a/assets/db.dia b/assets/db.dia
new file mode 100644
index 0000000000000000000000000000000000000000..59b090c882231a47746e961a41c36b1c82b238b0
GIT binary patch
literal 2520
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

literal 0
HcmV?d00001