Simplify logic and avoid opening file picker multiple times (3c7ac7c0) · Commits · e / os / PdfViewer

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

+10 −18

Original line number	Diff line number	Diff line
		@@ -104,10 +104,7 @@ public class MainActivity extends CyaneaAppCompatActivity {

		private final ActivityResultLauncher<Intent> settingsLauncher = registerForActivityResult(
		new StartActivityForResult(),
		result -> {
		if (uri != null)
		displayFromUri(uri);
		}
		result -> displayFromUri(uri)
		);

		@Override
		@@ -132,14 +129,11 @@ public class MainActivity extends CyaneaAppCompatActivity {
		if (savedInstanceState != null) {
		restoreInstanceState(savedInstanceState);
		} else {
		readUriFromIntent(getIntent());
		}
		if (uri == null) {
		uri = getIntent().getData();
		if (uri == null)
		pickFile();
		setTitle("");
		} else {
		displayFromUri(uri);
		}
		displayFromUri(uri);
		}

		@Override
		@@ -183,13 +177,6 @@ public class MainActivity extends CyaneaAppCompatActivity {
		pdfPassword = savedState.getString("pdfPassword");
		}

		private void readUriFromIntent(Intent intent) {
		Uri intentUri = intent.getData();
		if (intentUri != null) {
		uri = intentUri;
		}
		}

		void shareFile() {
		startActivity(Utils.emailIntent(pdfFileName, "", getResources().getString(R.string.share), uri));
		}
		@@ -319,6 +306,11 @@ public class MainActivity extends CyaneaAppCompatActivity {
		}

		void displayFromUri(Uri uri) {
		if (uri == null) {
		setTitle("");
		return;
		}

		pdfFileName = getFileName(uri);
		setTitle(pdfFileName);
		setTaskDescription(new ActivityManager.TaskDescription(pdfFileName));