Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 17:43:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check granted URI permisions

Browse Source
This commit is contained in:
M66B
2023-01-18 09:01:00 +01:00
parent 241778348a
commit c7a8855cd7
5 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivitySignature.java
View File

@@ -398,6 +398,8 @@ public class ActivitySignature extends ActivityBase {
NoStreamException.check(uri, this);
getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!Helper.isPersisted(this, uri, true, false))
throw new IllegalStateException("No permission granted to access selected image " + uri);
int start = etText.getSelectionStart();
if (etText.isRaw())

2
app/src/main/java/eu/faircode/email/FragmentAnswer.java
View File

@@ -551,6 +551,8 @@ public class FragmentAnswer extends FragmentBase {
NoStreamException.check(uri, getContext());
getContext().getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!Helper.isPersisted(getContext(), uri, true, false))
throw new IllegalStateException("No permission granted to access selected image " + uri);
int start = etText.getSelectionStart();
SpannableStringBuilder ssb = new SpannableStringBuilderEx(etText.getText());

3
app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
View File

@@ -797,6 +797,9 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
if ("content".equals(uri.getScheme())) {
try {
getContext().getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!Helper.isPersisted(getContext(), uri, true, false))
Log.unexpectedError(getParentFragmentManager(),
new IllegalStateException("No permission granted to access selected sound " + uri));
} catch (Throwable ex) {
Log.w(ex);
}

3
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View File

@@ -817,6 +817,9 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
if ("content".equals(uri.getScheme())) {
try {
getContext().getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
if (!Helper.isPersisted(getContext(), uri, true, false))
Log.unexpectedError(getParentFragmentManager(),
new IllegalStateException("No permission granted to access selected sound " + uri));
} catch (Throwable ex) {
Log.w(ex);
}

18
app/src/main/java/eu/faircode/email/Helper.java
View File

@@ -41,6 +41,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.UriPermission;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -2611,6 +2612,23 @@ public class Helper {
return (Looper.myLooper() == Looper.getMainLooper());
}
static boolean isPersisted(Context context, Uri uri, boolean read, boolean write) {
try {
List<UriPermission> uperms = context.getContentResolver().getPersistedUriPermissions();
for (UriPermission uperm : uperms)
if (uperm.getUri().equals(uri)) {
boolean canRead = uperm.isReadPermission();
boolean canWrite = uperm.isWritePermission();
Log.i(uri + " read=" + read + "/" + canRead + " write=" + write + "/" + canWrite);
return (!read || canRead) && (!write || canWrite);
}
return false;
} catch (Throwable ex) {
Log.e(ex);
return !BuildConfig.DEBUG;
}
}
// Cryptography
static String sha256(String data) throws NoSuchAlgorithmException {