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

Commit 52509243 authored by Fs00's avatar Fs00
Browse files

Make URI passing via Intent actually work and make uri field non-static

parent 4f5990b9

app/src/main/java/com/gsnathan/pdfviewer/MainActivity.java

+5 −6
Original line number Diff line number Diff line
@@ -165,21 +165,20 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
        StrictMode.setVmPolicy(builder.build());



        Uri appLinkData = intent.getData();

        String appLinkAction = intent.getAction();

        if (Intent.ACTION_VIEW.equals(appLinkAction) && appLinkData != null) {

        if (appLinkData != null) {

            uri = appLinkData;

        }

    }



    @NonConfigurationInstance

    static Uri uri;

    Uri uri;



    @NonConfigurationInstance

    Integer pageNumber = 0;



    String pdfFileName;

    private String pdfFileName;



    String pdfTempFilePath;

    private String pdfTempFilePath;



    private void pickFile() {

        int permissionCheck = ContextCompat.checkSelfPermission(this,
@@ -493,7 +492,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen 
                    case R.id.printFile:

                        if (uri != null)

                            print(pdfFileName,

                                    new PdfDocumentAdapter(getApplicationContext()),

                                    new PdfDocumentAdapter(getApplicationContext(), uri),

                                    new PrintAttributes.Builder().build());

                        break;

                    default:

app/src/main/java/com/gsnathan/pdfviewer/PdfDocumentAdapter.java

+6 −3
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ import java.io.OutputStream; 


class PdfDocumentAdapter extends ThreadedPrintDocumentAdapter {



    PdfDocumentAdapter(Context ctxt) {

    private final Uri documentUri;



    PdfDocumentAdapter(Context ctxt, Uri documentUri) {

        super(ctxt);

        this.documentUri = documentUri;

    }



    @Override
@@ -66,7 +69,7 @@ class PdfDocumentAdapter extends ThreadedPrintDocumentAdapter { 
        }

    }



    private static class PdfWriteJob extends WriteJob {

    private class PdfWriteJob extends WriteJob {



        PdfWriteJob(PageRange[] pages, ParcelFileDescriptor destination,

                    CancellationSignal cancellationSignal,
@@ -80,7 +83,7 @@ class PdfDocumentAdapter extends ThreadedPrintDocumentAdapter { 
            OutputStream out=null;



            try {

                in= ctxt.getContentResolver().openInputStream(MainActivity.uri);

                in= ctxt.getContentResolver().openInputStream(documentUri);

                out=new FileOutputStream(destination.getFileDescriptor());



                byte[] buf=new byte[16384];