From 8f94b7cd3efd895447f37fab825dfa3892660a19 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Fri, 18 Aug 2023 20:59:05 +0200
Subject: [PATCH] version upgrade, dependency update, bug fix

---
 app/build.gradle                              | 26 +++++++++++--------
 .../twidda/ui/activities/MainActivity.java    |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e2fd768b..805285ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
 		applicationId 'org.nuclearfog.twidda'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 95
-		versionName '3.3.1'
+		versionCode 96
+		versionName '3.4'
 		resConfigs 'en', 'es', 'de-rDE', 'zh-rCN'
 	}
 
@@ -31,12 +31,16 @@ android {
 	}
 
 	packagingOptions {
-		jniLibs {
-			excludes += ['/META-INF/androidx.*', '/META-INF/kotlin*', '/META-INF/com.*', '/META-INF/services/**', '/META-INF/com/**', '/kotlin/**', '/Debug*']
-		}
-		resources {
-			excludes += ['/META-INF/CHANGES', '/META-INF/DEPENDENCIES', '/META-INF/README.md', '/META-INF/androidx.*', '/META-INF/kotlin*', '/META-INF/com.*', '/META-INF/services/**', '/META-INF/com/**', '/kotlin/**', '/Debug*']
-		}
+		exclude '/META-INF/CHANGES'
+		exclude '/META-INF/DEPENDENCIES'
+		exclude '/META-INF/README.md'
+		exclude '/META-INF/androidx.*'
+		exclude '/META-INF/kotlin*'
+		exclude '/META-INF/com.*'
+		exclude '/META-INF/services/**'
+		exclude '/META-INF/com/**'
+		exclude '/kotlin/**'
+		exclude '/Debug*'
 	}
 }
 
@@ -46,9 +50,9 @@ dependencies {
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.cardview:cardview:1.0.0'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-	implementation 'androidx.media3:media3-exoplayer:1.1.0'
-	implementation 'androidx.media3:media3-ui:1.1.0'
-	implementation 'androidx.media3:media3-datasource-okhttp:1.1.0'
+	implementation 'androidx.media3:media3-exoplayer:1.1.1'
+	implementation 'androidx.media3:media3-ui:1.1.1'
+	implementation 'androidx.media3:media3-datasource-okhttp:1.1.1'
 	//noinspection GradleDependency
 	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
 	//noinspection GradleDependency
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java
index dbce82a5..f281b33e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java
@@ -479,7 +479,7 @@ public class MainActivity extends AppCompatActivity implements ActivityResultCal
 				username.setText(user.getUsername());
 			}
 			Drawable placeholder = new ColorDrawable(IMAGE_PLACEHOLDER_COLOR);
-			if (!user.getProfileImageThumbnailUrl().isEmpty()) {
+			if (settings.imagesEnabled() && !user.getProfileImageThumbnailUrl().isEmpty()) {
 				Transformation roundCorner = new RoundedCornersTransformation(5, 0);
 				picasso.load(user.getProfileImageThumbnailUrl()).transform(roundCorner).placeholder(placeholder).into(profileImage);
 			} else {