Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-12 03:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Inline request read permissions

Browse Source
This commit is contained in:
M66B
2022-03-19 08:12:46 +01:00
parent c4b1c6a0b6
commit 40a505a252
10 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -320,7 +320,6 @@ public class FragmentCompose extends FragmentBase {
private static final int REQUEST_LINK = 12;
private static final int REQUEST_DISCARD = 13;
private static final int REQUEST_SEND = 14;
private static final int REQUEST_PERMISSION = 15;
private static ExecutorService executor = Helper.getBackgroundExecutor(1, "compose");
@@ -2679,7 +2678,7 @@ public class FragmentCompose extends FragmentBase {
pickRequest = requestCode;
pickUri = uri;
String permission = Manifest.permission.READ_CONTACTS;
requestPermissions(new String[]{permission}, REQUEST_PERMISSION);
requestPermissions(new String[]{permission}, REQUEST_PERMISSIONS);
} catch (Throwable ex1) {
Log.unexpectedError(getParentFragmentManager(), ex1);
}
@@ -2691,10 +2690,11 @@ public class FragmentCompose extends FragmentBase {
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
if (pickUri == null)
return;
for (int i = 0; i < permissions.length; i++)
if (Manifest.permission.READ_CONTACTS.equals(permissions[i]))
if (pickUri != null &&
grantResults[i] == PackageManager.PERMISSION_GRANTED)
if (grantResults[i] == PackageManager.PERMISSION_GRANTED)
onPickContact(pickRequest, new Intent().setData(pickUri));
}
@@ -2871,7 +2871,7 @@ public class FragmentCompose extends FragmentBase {
protected void onException(Bundle args, Throwable ex) {
// External app sending absolute file
if (ex instanceof NoStreamException)
((NoStreamException) ex).report(getContext());
((NoStreamException) ex).report(getActivity());
else if (ex instanceof FileNotFoundException ||
ex instanceof IllegalArgumentException ||
ex instanceof IllegalStateException) {
@@ -2966,7 +2966,7 @@ public class FragmentCompose extends FragmentBase {
@Override
protected void onException(Bundle args, Throwable ex) {
if (ex instanceof NoStreamException)
((NoStreamException) ex).report(getContext());
((NoStreamException) ex).report(getActivity());
else
Log.unexpectedError(getParentFragmentManager(), ex);
}
@@ -5335,7 +5335,7 @@ public class FragmentCompose extends FragmentBase {
if (ex instanceof MessageRemovedException)
finish();
if (ex instanceof NoStreamException)
((NoStreamException) ex).report(getContext());
((NoStreamException) ex).report(getActivity());
else if (ex instanceof FileNotFoundException ||
ex instanceof IllegalArgumentException ||
ex instanceof IllegalStateException)