From 2e39f81c3664ec3b1c53f0ded1da5633b2b9c2be Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Mon, 8 Jul 2024 14:36:14 +0200
Subject: [PATCH] fix: show profile picture in share sheet

Shows the profile picture of the shared account in the share sheet. This
was already done upstream and intended here, but was bugged due to an
additional file provider.
---
 mastodon/src/main/AndroidManifest.xml                  | 10 ----------
 .../org/joinmastodon/android/ui/utils/UiUtils.java     |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml
index 08ab4ec89..9a378c3f8 100644
--- a/mastodon/src/main/AndroidManifest.xml
+++ b/mastodon/src/main/AndroidManifest.xml
@@ -105,16 +105,6 @@
 			</intent-filter>
 		</receiver>
 
-		<provider
-			android:name="org.joinmastodon.android.utils.FileProvider"
-			android:authorities="${applicationId}.fileprovider"
-			android:exported="false"
-			android:grantUriPermissions="true">
-			<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/file_paths" />
-		</provider>
-
 		<provider
 			android:authorities="${applicationId}.fileprovider"
 			android:name=".TweakedFileProvider"
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 4fdaf795b..6628bdd79 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -1769,9 +1769,9 @@ public class UiUtils {
 		ImageCache cache=ImageCache.getInstance(context);
 		try{
 			File ava=cache.getFile(new UrlImageLoaderRequest(account.avatarStatic));
-			if(!ava.exists())
+			if(ava==null || !ava.exists())
 				ava=cache.getFile(new UrlImageLoaderRequest(account.avatar));
-			if(ava.exists()){
+			if(ava!=null && ava.exists()){
 				intent.setClipData(ClipData.newRawUri(null, getFileProviderUri(context, ava)));
 				intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 			}