From 03b5f4f19a5f872a28bf5b068805f27b837770be Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 27 Jul 2023 15:32:48 -0700 Subject: [PATCH] new release --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 1 + .../asgardius/page/s3music/SdcardCheck.java | 21 +++++++++++++++++++ .../asgardius/page/s3music/VideoPlayer.java | 15 +++++++++---- .../metadata/android/en-US/changelogs/10.txt | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/asgardius/page/s3music/SdcardCheck.java create mode 100644 fastlane/metadata/android/en-US/changelogs/10.txt diff --git a/app/build.gradle b/app/build.gradle index 1f5512c..31f6ed7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3music" minSdk 21 targetSdk 33 - versionCode 9 - versionName "0.1.1" + versionCode 10 + versionName "0.2.0" setProperty("archivesBaseName", "s3-music-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 47c95a3..811c9a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ diff --git a/app/src/main/java/asgardius/page/s3music/SdcardCheck.java b/app/src/main/java/asgardius/page/s3music/SdcardCheck.java new file mode 100644 index 0000000..91fd4e5 --- /dev/null +++ b/app/src/main/java/asgardius/page/s3music/SdcardCheck.java @@ -0,0 +1,21 @@ +package asgardius.page.s3music; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; + +public class SdcardCheck { + public static boolean isInstalledOnSdCard(Context context) { + + PackageManager pm = context.getPackageManager(); + try { + PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0); + ApplicationInfo ai = pi.applicationInfo; + return (ai.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) == ApplicationInfo.FLAG_EXTERNAL_STORAGE; + } catch (PackageManager.NameNotFoundException e) { + // ignore + } + return false; + } +} diff --git a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java index dc14b7d..9c86551 100644 --- a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java @@ -185,10 +185,17 @@ public class VideoPlayer extends AppCompatActivity { mediaSessionConnector.setPlayer(player); //mediaSession.setActive(true); evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); - simpleCache = new SimpleCache( - new File(this.getFilesDir(), "media"), - evictor, - standaloneDatabaseProvider); + if(SdcardCheck.isInstalledOnSdCard(this)) { + simpleCache = new SimpleCache( + new File(this.getExternalFilesDirs(null)[this.getExternalFilesDirs(null).length-1], "media"), + evictor, + standaloneDatabaseProvider); + } else { + simpleCache = new SimpleCache( + new File(this.getFilesDir(), "media"), + evictor, + standaloneDatabaseProvider); + } playerView.setPlayer(player); controlView.setPlayer(player); playerView.setUseController(false); diff --git a/fastlane/metadata/android/en-US/changelogs/10.txt b/fastlane/metadata/android/en-US/changelogs/10.txt new file mode 100644 index 0000000..9cd496b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/10.txt @@ -0,0 +1 @@ +* Allow move app to SD Card