Minor fixes and libraries update

AndreyPavlenko · Apr 23, 2021 · 919b663 · 919b663
1 parent 589cded
commit 919b663
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 ext {
     def abi = project.properties['ABI']
-    VERSION_CODE = 85
-    VERSION_NAME = "1.7.6"
+    VERSION_CODE = 86
+    VERSION_NAME = "1.7.7"
     SDK_MIN_VERSION = 23
     SDK_TARGET_VERSION = 30
     SDK_COMPILE_VERSION = 30
@@ -12,7 +12,7 @@ ext {
     ANDROID_MATERIAL_VERSION = '1.3.0'
     ANDROID_PLAY_CORE_VERSION = '1.10.0'
     ANDROIDX_CORE_VERSION = '1.3.2'
-    ANDROIDX_MEDIA_VERSION = '1.2.1'
+    ANDROIDX_MEDIA_VERSION = '1.3.0'
     ANDROIDX_APPCOMPAT_VERSION = '1.2.0'
     ANDROIDX_CONSTRAINTLAYOUT_VERSION = '2.0.1'
     ANDROIDX_SWIPEREFRESHLAYOUT_VERSION = '1.1.0'
@@ -26,7 +26,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.google.gms:google-services:4.3.5'
     }
 }

diff --git a/depends/utils b/depends/utils
diff --git a/fermata/src/main/java/me/aap/fermata/media/lib/M3uItem.java b/fermata/src/main/java/me/aap/fermata/media/lib/M3uItem.java
@@ -67,7 +67,7 @@ private Data parse() {
 		String m3uArtist = null;
 		String m3uGenre = null;
 		String cover = null;
-		byte m3uType = isVideo(m3uFile) ? (byte) 2 : 1; // 0 - unknown, 1 - audio, 2 - video
+		byte m3uType = isVideo(m3uFile) ? (byte) 2 : 0; // 0 - unknown, 1 - audio, 2 - video
 
 		String name = null;
 		String group = null;

diff --git a/fermata/src/main/java/me/aap/fermata/ui/activity/MainActivityDelegate.java b/fermata/src/main/java/me/aap/fermata/ui/activity/MainActivityDelegate.java
@@ -171,7 +171,8 @@ public FermataActivity getAppActivity() {
 	}
 
 	public boolean isCarActivity() {
-		return getAppActivity().isCarActivity();
+		FermataActivity a = getAppActivity();
+		return (a != null) && a.isCarActivity();
 	}
 
 	@NonNull

diff --git a/fermata/src/main/java/me/aap/fermata/ui/view/MediaItemListView.java b/fermata/src/main/java/me/aap/fermata/ui/view/MediaItemListView.java
@@ -134,6 +134,8 @@ public void onPreferenceChanged(PreferenceStore store, List<PreferenceStore.Pref
 		if (prefs.contains(MainActivityPrefs.GRID_VIEW) || prefs.contains(MainActivityPrefs.MEDIA_ITEM_SCALE)) {
 			configure(getContext().getResources().getConfiguration());
 			MainActivityDelegate a = MainActivityDelegate.get(getContext());
+			if (a == null) return;
+
 			MediaLibFragment f = a.getActiveMediaLibFragment();
 
 			if ((f != null) && (f.getView() == this)) {

diff --git a/modules/vlc/build.gradle b/modules/vlc/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     implementation project(':fermata')
     implementation 'androidx.core:core:' + ANDROIDX_CORE_VERSION
     implementation 'androidx.appcompat:appcompat:' + ANDROIDX_APPCOMPAT_VERSION
-    implementation 'org.videolan.android:libvlc-all:3.3.9'
+    implementation 'org.videolan.android:libvlc-all:3.3.14'
 }
diff --git a/modules/web/src/main/java/me/aap/fermata/addon/web/FermataWebClient.java b/modules/web/src/main/java/me/aap/fermata/addon/web/FermataWebClient.java
@@ -30,7 +30,8 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
 		if (loading != null) {
 			loading.accept(true);
 		} else {
-			MainActivityDelegate.get(view.getContext()).setContentLoading(new Promise<>());
+			MainActivityDelegate a = MainActivityDelegate.get(view.getContext());
+			if (a != null) a.setContentLoading(new Promise<>());
 		}
 		super.onPageStarted(view, url, favicon);
 	}
+3 −1		src/main/java/me/aap/utils/ui/activity/ActivityDelegate.java
+3 −2		src/main/java/me/aap/utils/ui/fragment/GenericDialogFragment.java
+2 −1		src/main/java/me/aap/utils/ui/view/PrefNavBarMediator.java