From 6526002a9bd78db956030fc10041534f3770e7dc Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Wed, 21 Dec 2022 11:06:03 -0700
Subject: [PATCH] new release

---
 app/build.gradle                                     |  4 ++--
 .../java/asgardius/page/s3manager/ObjectSelect.java  |  2 +-
 .../java/asgardius/page/s3manager/VideoPlayer.java   | 12 +++++++++++-
 fastlane/metadata/android/en-US/changelogs/44.txt    |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/44.txt

diff --git a/app/build.gradle b/app/build.gradle
index d8413c0..c19604d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "asgardius.page.s3manager"
         minSdk 23
         targetSdk 33
-        versionCode 43
-        versionName "0.3.4"
+        versionCode 44
+        versionName "0.3.5"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index 05190ed..3dc0524 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -323,7 +323,7 @@ public class ObjectSelect extends AppCompatActivity {
                             }
                         }
                     });
-                    if (pdfendpoint == null) {
+                    if (pdfendpoint == null || pdfendpoint.equals("")) {
                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.pdf_reader_notready), Toast.LENGTH_SHORT).show();
                     } else {
                         pdfread.start();
diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
index 495d5f9..a518400 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
@@ -14,6 +14,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.support.v4.media.session.MediaSessionCompat;
+import android.util.Rational;
 import android.view.Display;
 import android.view.View;
 import android.widget.Toast;
@@ -40,6 +41,7 @@ import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvicto
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 
 import java.io.File;
+import java.util.Objects;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
@@ -71,6 +73,7 @@ public class VideoPlayer extends AppCompatActivity {
     boolean hls;
     boolean success = false;
     String videoURL;
+    Rational ratio;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -262,7 +265,14 @@ public class VideoPlayer extends AppCompatActivity {
                 videoPosition = player.getCurrentPosition();
                 playerView.setUseController(false);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    PictureInPictureParams params = new PictureInPictureParams.Builder().build();
+                    if(player.getVideoFormat() != null) {
+                        ratio = new Rational(player.getVideoFormat().width, player.getVideoFormat().height);
+                    } else if(player.getAudioFormat() != null) {
+                        ratio = new Rational(player.getAudioFormat().width, player.getAudioFormat().height);
+                    } else {
+                        ratio = new Rational(1, 1);
+                    }
+                    PictureInPictureParams params = new PictureInPictureParams.Builder().setAspectRatio(ratio).build();
                     this.enterPictureInPictureMode(params);
                 }else {
                     this.enterPictureInPictureMode();
diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
new file mode 100644
index 0000000..3383ae5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -0,0 +1 @@
+* Fix background playback issues
\ No newline at end of file