From 3dd652d5d2fa4694b7a3c949437e2665dd1ebf83 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 5 Apr 2020 10:25:20 +0200
Subject: [PATCH] Update with player

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../nitterizeme/TransformActivity.java        |  3 +++
 .../nitterizeme/WebviewPlayerActivity.java    | 24 ++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3c62b4..7fad7d0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -186,7 +186,7 @@
         <activity android:name="app.fedilab.nitterizeme.WebviewPlayerActivity"
             android:label="@string/app_name"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.NoActionBar.FullScreen"/>
+            android:theme="@style/AppTheme"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
index 28ff835..252e734 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/TransformActivity.java
@@ -429,6 +429,9 @@ public class TransformActivity extends Activity {
         if (Arrays.asList(invidious_instances).contains(Objects.requireNonNull(i.getData()).getHost()) && embedded_player) {
             if( !i.getData().toString().contains("videoplayback")){
                 Intent intentPlayer = new Intent(TransformActivity.this, WebviewPlayerActivity.class);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    intentPlayer.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT|Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+                }
                 intentPlayer.putExtra("url", i.getData().toString());
                 startActivity(intentPlayer);
             }else{
diff --git a/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java b/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java
index cdb24a8..77a281a 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/WebviewPlayerActivity.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -56,6 +57,12 @@ public class WebviewPlayerActivity extends AppCompatActivity {
         }
         setContentView(R.layout.activity_webview_player);
 
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayShowHomeEnabled(true);
+        }
+
         final ViewGroup videoLayout = findViewById(R.id.videoLayout);
         webView = findViewById(R.id.webview);
         loader = findViewById(R.id.loader);
@@ -92,12 +99,6 @@ public class WebviewPlayerActivity extends AppCompatActivity {
                     webView.loadUrl(streaming_url);
                     loader.setVisibility(View.GONE);
                     webview_container.setVisibility(View.VISIBLE);
-                    videoLayout.setVisibility(View.VISIBLE);
-                    WindowManager.LayoutParams attrs = getWindow().getAttributes();
-                    attrs.flags |= WindowManager.LayoutParams.FLAG_FULLSCREEN;
-                    attrs.flags |= WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-                    getWindow().setAttributes(attrs);
-                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
                 }
             }
         };
@@ -126,6 +127,17 @@ public class WebviewPlayerActivity extends AppCompatActivity {
         });
     }
 
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
     @Override
     public void onPause(){
         super.onPause();