Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 83dad228 authored by gokul swaminathan's avatar gokul swaminathan Committed by GitHub
Browse files

Merge pull request #77 from Fs00/no-permission-saf

Do not ask for storage permission when opening file picker
parents 8b084038 b94a8fba
Loading
Loading
Loading
Loading
+2 −27
Original line number Diff line number Diff line
@@ -91,9 +91,7 @@ public class MainActivity extends ProgressActivity {
    private PrintManager mgr = null;

    private final static int REQUEST_CODE = 42;

    public static final int PERMISSION_WRITE = 42041;
    public static final int PERMISSION_READ = 42042;
    private final static int PERMISSION_WRITE = 42041;

    private static String PDF_PASSWORD = "";
    private SharedPreferences prefManager;
@@ -179,28 +177,11 @@ public class MainActivity extends ProgressActivity {

    private String pdfTempFilePath;

    private void pickFile() {
        int permissionCheck = ContextCompat.checkSelfPermission(this,
                Manifest.permission.READ_EXTERNAL_STORAGE);

        if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
            ActivityCompat.requestPermissions(
                    this,
                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
                    PERMISSION_READ
            );

            return;
        }

        launchPicker();
    }

    void shareFile() {
        startActivity(Utils.emailIntent(pdfFileName, "", getResources().getString(R.string.share), uri));
    }

    void launchPicker() {
    private void pickFile() {
        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
        intent.setType("application/pdf");
        try {
@@ -451,12 +432,6 @@ public class MainActivity extends ProgressActivity {
                                           @NonNull int[] grantResults) {
        int indexPermission;
        switch (requestCode) {
            case PERMISSION_READ:
                indexPermission = Arrays.asList(permissions).indexOf(Manifest.permission.READ_EXTERNAL_STORAGE);
                if (indexPermission != -1 && grantResults[indexPermission] == PackageManager.PERMISSION_GRANTED) {
                    launchPicker();
                }
                break;
            case PERMISSION_WRITE:
                indexPermission = Arrays.asList(permissions).indexOf(Manifest.permission.WRITE_EXTERNAL_STORAGE);
                if (indexPermission != -1 && grantResults[indexPermission] == PackageManager.PERMISSION_GRANTED) {