Merge pull request SpartanJ#32 from SpartanJ/dev-exoplayer-migration

ExoPlayer migration and several fixes
the-blank-x · Feb 6, 2022 · 06b0d67 · 06b0d67
2 parents 1aed348 + 5a20a9f
commit 06b0d67
Show file tree

Hide file tree

Showing 28 changed files with 397 additions and 1,155 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,21 +1,21 @@
 apply plugin: 'com.android.application'
 
 def versionMajor = 2
-def versionMinor = 2
-def versionPatch = 2
+def versionMinor = 3
+def versionPatch = 0
 // We need to use a static versionCode and versionName to support automatic updates in F-Droid
 def versionCodeNum = versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '31.0.0'
 
     defaultConfig {
         applicationId "com.ensoft.imgurviewer"
-        minSdkVersion 14
-        targetSdkVersion 30
-        versionCode 22200
-        versionName "2.2.2"
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 23000
+        versionName "2.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -37,14 +37,17 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference:1.2.0'
     implementation 'com.facebook.fresco:fresco:2.5.0'
     implementation 'com.facebook.fresco:animated-gif:2.5.0'
     implementation 'com.facebook.fresco:animated-webp:2.5.0'
     implementation 'com.facebook.fresco:webpsupport:2.5.0'
     implementation 'com.ensoft-dev.restafari:restafari:0.4.1'
     implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
-    implementation 'com.devbrackets.android:exomedia:4.3.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.16.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.16.1'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'

diff --git a/app/src/androidTest/java/com/ensoft/imgurviewer/service/ResourceSolverTest.java b/app/src/androidTest/java/com/ensoft/imgurviewer/service/ResourceSolverTest.java
@@ -111,22 +111,23 @@ public void loadFailed( Uri uri, String error )
 		});
 
 		String[] testUris = new String[] {
+			"https://www.reddit.com/gallery/pc1m7t",
+			"https://v.redd.it/zv89llsvexdz",
+			"https://v.redd.it/ulz7g757bb581",
 			"https://www.reddit.com/gallery/huxc4s",
-			"https://redgifs.com/watch/calculatingsoreemperorpenguin-lauren-summer-swimsuit-bikini-beach",
-			"https://redgifs.com/watch/grimyacademicafricanbushviper-bz-beauty",
+			"https://www.redgifs.com/watch/terrificaridbrownbutterfly",
+			"https://redgifs.com/watch/jaggedunselfishgannet",
 			"https://gfycat.com/whoppingcostlyairedale",
 			"https://clips.twitch.tv/SmoggySmallHummingbirdOSkomodo-KeUalcW_KTZl_XRH?tt_medium=redt",
 			"https://clips.twitch.tv/FaintLightGullWholeWheat",
-			"https://www.gifdeliverynetwork.com/MadWickedBinturong",
 			"http://imgur.com/gallery/fADjkcW",
 			"https://imgur.com/A61SaA1",
 			"https://i.imgur.com/jxBXAMC.gifv",
 			"https://imgur.com/gallery/YcAQlkx",
 			"http://imgur.com/topic/Aww/ll5Vk",
 			"http://imgur.com/a/j6Orj",
+			"https://www.gifdeliverynetwork.com/MadWickedBinturong",
 			"https://www.gfycat.com/temptingimpuregermanspaniel",
-			"https://www.redgifs.com/watch/grimyacademicafricanbushviper-bz-beauty",
-			"https://www.redgifs.com/watch/calculatingsoreemperorpenguin-lauren-summer-swimsuit-bikini-beach",
 			"https://ibb.co/f2D3BNg",
 			"https://gyazo.com/1eae60fbb44ba44cdcd89064ffbaacef",
 			"https://imgflip.com/i/3dhvnl",
@@ -136,7 +137,6 @@ public void loadFailed( Uri uri, String error )
 			"https://prntscr.com/10jpuxg/direct",
 			"http://gfycat.com/DeadlyDecisiveGermanpinscher",
 			"http://gfycat.com/ifr/JauntyTimelyAmazontreeboa",
-			"https://v.redd.it/zv89llsvexdz",
 			"https://streamable.com/dnd1",
 			"https://streamable.com/moo",
 			"https://instagram.com/p/aye83DjauH/?foo=bar#abc",
@@ -166,8 +166,8 @@ public void loadFailed( Uri uri, String error )
 			"https://la.spankbang.com/22xtb/video/",
 			"http://www.xvideos.com/video4588838/biker_takes_his_girl",
 			"https://xhamster.com/videos/asmr-you-know-i-like-you-xhnBhXU",
-			"https://www.pornhub.com/view_video.php?viewkey=ph5effde87227d2",
 			"https://nhentai.net/g/169217/",
+			"https://www.pornhub.com/view_video.php?viewkey=ph5effde87227d2",
 		};
 
 		for ( String testUri :testUris )

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
             android:name="com.ensoft.imgurviewer.view.activity.ImageViewer"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/AppThemeFull" >
+            android:theme="@style/AppThemeFull"
+			android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/java/com/ensoft/imgurviewer/model/VimeoVideo.java b/app/src/main/java/com/ensoft/imgurviewer/model/VimeoVideo.java
@@ -6,7 +6,7 @@ public class VimeoVideo
 {
 	protected String url;
 	protected String quality;
-	protected long id;
+	protected String id;
 	protected long width;
 	protected long height;
 
@@ -25,7 +25,7 @@ public String getQuality()
 		return quality;
 	}
 
-	public long getId()
+	public String getId()
 	{
 		return id;
 	}