Merge branch 'dev' of github.com:JavaCafe01/PdfViewer into dev (02a0cae6) · Commits · e / os / PdfViewer

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

+9 −14

Original line number	Diff line number	Diff line
		@@ -118,9 +118,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen
		onFirstUpdate();
		handleIntent(getIntent());

		if (Utils.tempBool && getIntent().getStringExtra("uri") != null) {
		uri = Uri.parse(getIntent().getStringExtra("uri"));
		} else if (getIntent().getDataString() == null){
		if (uri == null) {
		pickFile();
		}

		@@ -167,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,
		@@ -205,7 +202,7 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen
		}

		void launchPicker() {
		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
		Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
		intent.setType("application/pdf");
		try {
		startActivityForResult(intent, REQUEST_CODE);
		@@ -312,10 +309,6 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen

		void displayFromUri(Uri uri) {
		pdfFileName = getFileName(uri);
		Utils.tempBool = true;
		SharedPreferences.Editor editor = prefManager.edit();
		editor.putString("uri", uri.toString());
		editor.apply();
		String scheme = uri.getScheme();

		if (scheme != null && scheme.contains("http")) {
		@@ -374,7 +367,9 @@ public class MainActivity extends ProgressActivity implements OnPageChangeListen
		}

		void navToSettings() {
		startActivity(Utils.navIntent(this, SettingsActivity.class));
		Intent intent = new Intent(this, SettingsActivity.class);
		intent.setData(uri);
		startActivity(intent);
		}

		@OnActivityResult(REQUEST_CODE)

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];

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

+6 −15

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.res.Configuration;
		import android.net.Uri;
		import android.os.Bundle;
		import android.preference.Preference;
		import android.preference.PreferenceActivity;
		@@ -57,22 +58,12 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
		button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
		@Override
		public boolean onPreferenceClick(Preference preference) {
		String uriString = "";
		try {
		SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
		uriString = prefManager.getString("uri", "");
		Log.d("Hello", "Uri = " + uriString);
		if (uriString != null) {
		Intent intent = new Intent(getApplicationContext(), MainActivity_.class);
		intent.putExtra("uri", uriString);
		Uri documentUri = getIntent().getData();
		Intent intent = new Intent(SettingsActivity.this, MainActivity_.class);
		intent.setData(documentUri);
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TASK);
		startActivity(intent);
		} else {
		Intent i = getBaseContext().getPackageManager().
		getLaunchIntentForPackage(getBaseContext().getPackageName());
		i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		startActivity(i);
		finish();
		}
		} catch (Exception e) {
		e.printStackTrace();
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ import io.github.tonnyl.whatsnew.item.WhatsNewItem;

		public class Utils {

		public static boolean tempBool = false;

		static void showLog(AppCompatActivity context) {
		WhatsNew log = WhatsNew.newInstance(
		new WhatsNewItem("File Manager", "Enable on start of the app", R.drawable.star_icon),