From 13d64cc50729fb03c727e3461d566cff33d34b6c Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 14:20:54 -0700 Subject: [PATCH 001/168] test release --- app/build.gradle | 4 ++-- app/src/main/java/asgardius/page/s3manager/Settings.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b05c95a..0edb6b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 33 - versionCode 24 - versionName "0.1.22" + versionCode 25 + versionName "0.1.23" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/asgardius/page/s3manager/Settings.java b/app/src/main/java/asgardius/page/s3manager/Settings.java index 942d6d3..c87255b 100644 --- a/app/src/main/java/asgardius/page/s3manager/Settings.java +++ b/app/src/main/java/asgardius/page/s3manager/Settings.java @@ -87,10 +87,12 @@ public class Settings extends AppCompatActivity { videotime = vtimepick.getText().toString(); if (videocache.equals("") || videotime.equals("")) { Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_null), Toast.LENGTH_SHORT).show(); + }else if (Integer.parseInt(videotime) > 168) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show(); } else { db = dbHelper.getWritableDatabase(); - db.execSQL("UPDATE preferences SET value='"+videocache+"' where setting='videocache'"); - db.execSQL("UPDATE preferences SET value='"+videotime+"' where setting='videotime'"); + db.execSQL("UPDATE preferences SET value='" + videocache + "' where setting='videocache'"); + db.execSQL("UPDATE preferences SET value='" + videotime + "' where setting='videotime'"); db.close(); mainmenu(); } -- 2.39.2 From 53e3f3dced18431f40493b8de7ceed0a9903e573 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 15:50:38 -0700 Subject: [PATCH 002/168] new release --- fastlane/metadata/android/en-US/changelogs/25.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/25.txt diff --git a/fastlane/metadata/android/en-US/changelogs/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt new file mode 100644 index 0000000..3d4af03 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/25.txt @@ -0,0 +1 @@ +Add settings menu \ No newline at end of file -- 2.39.2 From 5d63342f73c2d8f1aed82848dbee5a4298cce0e6 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 16:33:09 -0700 Subject: [PATCH 003/168] videocache fix --- .../asgardius/page/s3manager/VideoPlayer.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java index 3dad90d..e7f6c52 100644 --- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java @@ -14,11 +14,14 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; +import com.google.android.exoplayer2.database.StandaloneDatabaseProvider; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.ui.StyledPlayerView; +import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource; +import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor; import com.google.android.exoplayer2.upstream.cache.SimpleCache; @@ -36,8 +39,11 @@ public class VideoPlayer extends AppCompatActivity { private PowerManager.WakeLock mWakeLock; private PowerManager powerManager; private long maxCacheSize; + LeastRecentlyUsedCacheEvictor evictor; + StandaloneDatabaseProvider standaloneDatabaseProvider; SimpleCache simpleCache; int videocache; + ProgressiveMediaSource mediaSource; ExoPlayer player; @@ -52,17 +58,23 @@ public class VideoPlayer extends AppCompatActivity { //Get media url String videoURL = getIntent().getStringExtra("video_url"); videocache = getIntent().getIntExtra("videocache", 40); + standaloneDatabaseProvider = new StandaloneDatabaseProvider(this); maxCacheSize = (long)videocache * 1024 * 1024; playerView = findViewById(R.id.player_view); // creating a variable for exoplayer player = new ExoPlayer.Builder(this).build(); - LeastRecentlyUsedCacheEvictor evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); - simpleCache = new SimpleCache(new File(this.getCacheDir(), "media"), evictor); - MediaSource mediaSource = new ProgressiveMediaSource.Factory(new CacheDataSourceFactory(this, simpleCache, maxCacheSize)) - .createMediaSource(MediaItem.fromUri(Uri.parse(videoURL))); - //MediaSource audioSource = new ProgressiveMediaSource(Uri.parse("url"), - // new CacheDataSourceFactory(this, 100 * 1024 * 1024, 5 * 1024 * 1024), new DefaultExtractorsFactory(), null, null); - // Attach player to the view. + evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); + simpleCache = new SimpleCache( + new File(this.getCacheDir(), "media"), + evictor, + standaloneDatabaseProvider); + mediaSource = new ProgressiveMediaSource.Factory( + new CacheDataSource.Factory() + .setCache(simpleCache) + .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory() + .setUserAgent("ExoplayerDemo")) + .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR) + ).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL))); playerView.setPlayer(player); //MediaItem mediaItem = MediaItem.fromUri(videoURL); -- 2.39.2 From 1668c84570db3a2a529968de7823ad3c02967202 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 6 Oct 2022 18:00:58 -0700 Subject: [PATCH 004/168] new release --- app/build.gradle | 6 +-- app/src/main/assets/about.htm | 2 +- .../s3manager/CacheDataSourceFactory.java | 43 ------------------- .../metadata/android/en-US/changelogs/26.txt | 1 + 4 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 app/src/main/java/asgardius/page/s3manager/CacheDataSourceFactory.java create mode 100644 fastlane/metadata/android/en-US/changelogs/26.txt diff --git a/app/build.gradle b/app/build.gradle index 0edb6b8..5d8726a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 33 - versionCode 25 - versionName "0.1.23" + versionCode 26 + versionName "0.1.24" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -39,7 +39,7 @@ dependencies { implementation 'com.google.android.exoplayer:exoplayer:2.18.1' implementation 'androidx.recyclerview:recyclerview:1.2.1' // BEGIN AWS DEPENDENCIES - def aws_version = "2.53.0" + def aws_version = "2.54.0" implementation "com.amazonaws:aws-android-sdk-s3:$aws_version" implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true } // END AWS DEPENDENCIES diff --git a/app/src/main/assets/about.htm b/app/src/main/assets/about.htm index 37ada69..ef226cb 100644 --- a/app/src/main/assets/about.htm +++ b/app/src/main/assets/about.htm @@ -9,7 +9,7 @@

Created by Page Asgardius

Libraries used in this app