/*
- * Copyright © 2019-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2019-2021 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
package com.stoutner.privacybrowser.activities;
-import android.Manifest;
import android.app.Activity;
import android.app.Dialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
import android.content.res.Configuration;
-import android.media.MediaScannerConnection;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.ScrollView;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
import androidx.fragment.app.DialogFragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.stoutner.privacybrowser.R;
import com.stoutner.privacybrowser.asynctasks.GetLogcat;
-import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog;
-import com.stoutner.privacybrowser.dialogs.SaveLogcatDialog;
-import com.stoutner.privacybrowser.helpers.FileNameHelper;
+import com.stoutner.privacybrowser.dialogs.SaveDialog;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialog.SaveLogcatListener, StoragePermissionDialog.StoragePermissionDialogListener {
- // Initialize the saved instance state constants.
+public class LogcatActivity extends AppCompatActivity implements SaveDialog.SaveListener {
+ // Declare the class constants.
private final String SCROLLVIEW_POSITION = "scrollview_position";
- // Define the class variables.
- private String filePathString;
-
// Define the class views.
private TextView logcatTextView;
// Get a handle for the shared preferences.
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
- // Get the screenshot preference.
- boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false);
+ // Get the preferences.
+ boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false);
+ boolean bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false);
// Disable screenshots if not allowed.
if (!allowScreenshots) {
super.onCreate(savedInstanceState);
// Set the content view.
- setContentView(R.layout.logcat_coordinatorlayout);
+ if (bottomAppBar) {
+ setContentView(R.layout.logcat_bottom_appbar);
+ } else {
+ setContentView(R.layout.logcat_top_appbar);
+ }
- // Set the toolbar as the action bar.
+ // Get handles for the views.
Toolbar toolbar = findViewById(R.id.logcat_toolbar);
+ SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.logcat_swiperefreshlayout);
+
+ // Set the toolbar as the action bar.
setSupportActionBar(toolbar);
// Get a handle for the action bar.
logcatTextView = findViewById(R.id.logcat_textview);
// Implement swipe to refresh.
- SwipeRefreshLayout swipeRefreshLayout = findViewById(R.id.logcat_swiperefreshlayout);
swipeRefreshLayout.setOnRefreshListener(() -> {
// Get the current logcat.
new GetLogcat(this, 0).execute();
int currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
// Set the refresh color scheme according to the theme.
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- swipeRefreshLayout.setColorSchemeResources(R.color.blue_500);
- } else {
+ if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
swipeRefreshLayout.setColorSchemeResources(R.color.blue_700);
+ } else {
+ swipeRefreshLayout.setColorSchemeResources(R.color.blue_500);
}
// Initialize a color background typed value.
int menuItemId = menuItem.getItemId();
// Run the commands that correlate to the selected menu item.
- switch (menuItemId) {
- case R.id.copy:
- // Get a handle for the clipboard manager.
- ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-
- // Save the logcat in a ClipData.
- ClipData logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatTextView.getText());
-
- // Remove the incorrect lint error that `clipboardManager.setPrimaryClip()` might produce a null pointer exception.
- assert clipboardManager != null;
-
- // Place the ClipData on the clipboard.
- clipboardManager.setPrimaryClip(logcatClipData);
-
- // Display a snackbar.
- Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show();
-
- // Consume the event.
- return true;
+ if (menuItemId == R.id.copy) { // Copy was selected.
+ // Get a handle for the clipboard manager.
+ ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
- case R.id.save:
- // Instantiate the save alert dialog.
- DialogFragment saveDialogFragment = new SaveLogcatDialog();
+ // Remove the incorrect lint error below that the clipboard manager might be null.
+ assert clipboardManager != null;
- // Show the save alert dialog.
- saveDialogFragment.show(getSupportFragmentManager(), getString(R.string.save_logcat));
+ // Save the logcat in a clip data.
+ ClipData logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatTextView.getText());
- // Consume the event.
- return true;
+ // Place the clip data on the clipboard.
+ clipboardManager.setPrimaryClip(logcatClipData);
- case R.id.clear:
- try {
- // Clear the logcat. `-c` clears the logcat. `-b all` clears all the buffers (instead of just crash, main, and system).
- Process process = Runtime.getRuntime().exec("logcat -b all -c");
-
- // Wait for the process to finish.
- process.waitFor();
-
- // Reload the logcat.
- new GetLogcat(this, 0).execute();
- } catch (IOException|InterruptedException exception) {
- // Do nothing.
- }
-
- // Consume the event.
- return true;
+ // Display a snackbar.
+ Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show();
+
+ // Consume the event.
+ return true;
+ } else if (menuItemId == R.id.save) { // Save was selected.
+ // Instantiate the save alert dialog.
+ DialogFragment saveDialogFragment = SaveDialog.save(SaveDialog.SAVE_LOGCAT);
+
+ // Show the save alert dialog.
+ saveDialogFragment.show(getSupportFragmentManager(), getString(R.string.save_logcat));
+
+ // Consume the event.
+ return true;
+ } else if (menuItemId == R.id.clear) { // Clear was selected.
+ try {
+ // Clear the logcat. `-c` clears the logcat. `-b all` clears all the buffers (instead of just crash, main, and system).
+ Process process = Runtime.getRuntime().exec("logcat -b all -c");
+
+ // Wait for the process to finish.
+ process.waitFor();
+
+ // Reload the logcat.
+ new GetLogcat(this, 0).execute();
+ } catch (IOException | InterruptedException exception) {
+ // Do nothing.
+ }
- default:
- // Don't consume the event.
- return super.onOptionsItemSelected(menuItem);
+ // Consume the event.
+ return true;
+ } else { // The home button was pushed.
+ // Do not consume the event. The system will process the home command.
+ return super.onOptionsItemSelected(menuItem);
}
}
savedInstanceState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt);
}
+ // The activity result is called after browsing for a file in the save alert dialog.
@Override
- public void onSaveLogcat(DialogFragment dialogFragment) {
- // Get a handle for the dialog fragment.
- Dialog dialog = dialogFragment.getDialog();
+ public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) {
+ // Run the default commands.
+ super.onActivityResult(requestCode, resultCode, returnedIntent);
- // Remove the lint warning below that the dialog fragment might be null.
- assert dialog != null;
+ // Only do something if the user didn't press back from the file picker.
+ if (resultCode == Activity.RESULT_OK) {
+ // Get a handle for the save dialog fragment.
+ DialogFragment saveDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.save_logcat));
- // Get a handle for the file name edit text.
- EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext);
+ // Only update the file name if the dialog still exists.
+ if (saveDialogFragment != null) {
+ // Get a handle for the save dialog.
+ Dialog saveDialog = saveDialogFragment.getDialog();
- // Get the file path string.
- filePathString = fileNameEditText.getText().toString();
-
- // Check to see if the storage permission is needed.
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { // The storage permission has been granted.
- // Save the logcat.
- saveLogcat(filePathString);
- } else { // The storage permission has not been granted.
- // Get the external private directory `File`.
- File externalPrivateDirectoryFile = getExternalFilesDir(null);
-
- // Remove the incorrect lint error below that the file might be null.
- assert externalPrivateDirectoryFile != null;
-
- // Get the external private directory string.
- String externalPrivateDirectory = externalPrivateDirectoryFile.toString();
-
- // Check to see if the file path is in the external private directory.
- if (filePathString.startsWith(externalPrivateDirectory)) { // The file path is in the external private directory.
- // Save the logcat.
- saveLogcat(filePathString);
- } else { // The file path in in a public directory.
- // Check if the user has previously denied the storage permission.
- if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { // Show a dialog explaining the request first.
- // Instantiate the storage permission alert dialog.
- DialogFragment storagePermissionDialogFragment = StoragePermissionDialog.displayDialog(0);
-
- // Show the storage permission alert dialog. The permission will be requested when the dialog is closed.
- storagePermissionDialogFragment.show(getSupportFragmentManager(), getString(R.string.storage_permission));
- } else { // Show the permission request directly.
- // Request the write external storage permission. The logcat will be saved when it finishes.
- ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
-
- }
+ // Remove the lint warning below that the save dialog might be null.
+ assert saveDialog != null;
+
+ // Get a handle for the file name edit text.
+ EditText fileNameEditText = saveDialog.findViewById(R.id.file_name_edittext);
+
+ // Get the file name URI from the intent.
+ Uri fileNameUri = returnedIntent.getData();
+
+ // Get the file name string from the URI.
+ String fileNameString = fileNameUri.toString();
+
+ // Set the file name text.
+ fileNameEditText.setText(fileNameString);
+
+ // Move the cursor to the end of the file name edit text.
+ fileNameEditText.setSelection(fileNameString.length());
}
}
}
@Override
- public void onCloseStoragePermissionDialog(int type) {
- // Request the write external storage permission. The logcat will be saved when it finishes.
- ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
- }
+ public void onSave(int saveType, DialogFragment dialogFragment) {
+ // Get a handle for the dialog.
+ Dialog dialog = dialogFragment.getDialog();
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
- // Check to see if the storage permission was granted. If the dialog was canceled the grant result will be empty.
- if ((grantResults.length > 0) && (grantResults[0] == PackageManager.PERMISSION_GRANTED)) { // The storage permission was granted.
- // Save the logcat.
- saveLogcat(filePathString);
- } else { // The storage permission was not granted.
- // Display an error snackbar.
- Snackbar.make(logcatTextView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show();
- }
- }
+ // Remove the lint warning below that the dialog might be null.
+ assert dialog != null;
+
+ // Get a handle for the file name edit text.
+ EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext);
+
+ // Get the file path string.
+ String fileNameString = fileNameEditText.getText().toString();
- private void saveLogcat(String fileNameString) {
try {
// Get the logcat as a string.
String logcatString = logcatTextView.getText().toString();
// Create a logcat buffered reader.
BufferedReader logcatBufferedReader = new BufferedReader(new InputStreamReader(logcatInputStream));
- // Create a file from the file name string.
- File saveFile = new File(fileNameString);
+ // Open an output stream.
+ OutputStream outputStream = getContentResolver().openOutputStream(Uri.parse(fileNameString));
// Create a file buffered writer.
- BufferedWriter fileBufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(saveFile)));
+ BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream));
// Create a transfer string.
String transferString;
// Use the transfer string to copy the logcat from the buffered reader to the buffered writer.
while ((transferString = logcatBufferedReader.readLine()) != null) {
// Append the line to the buffered writer.
- fileBufferedWriter.append(transferString);
+ bufferedWriter.append(transferString);
// Append a line break.
- fileBufferedWriter.append("\n");
+ bufferedWriter.append("\n");
}
- // Close the buffered reader and writer.
- logcatBufferedReader.close();
- fileBufferedWriter.close();
+ // Flush the buffered writer.
+ bufferedWriter.flush();
- // Add the file to the list of recent files. This doesn't currently work, but maybe it will someday.
- MediaScannerConnection.scanFile(this, new String[] {fileNameString}, new String[] {"text/plain"}, null);
+ // Close the inputs and outputs.
+ logcatBufferedReader.close();
+ logcatInputStream.close();
+ bufferedWriter.close();
+ outputStream.close();
- // Display a snackbar.
- Snackbar.make(logcatTextView, getString(R.string.file_saved_successfully), Snackbar.LENGTH_SHORT).show();
+ // Display a snackbar with the saved logcat information.
+ Snackbar.make(logcatTextView, getString(R.string.file_saved) + " " + fileNameString, Snackbar.LENGTH_SHORT).show();
} catch (Exception exception) {
// Display a snackbar with the error message.
- Snackbar.make(logcatTextView, getString(R.string.save_failed) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show();
- }
- }
-
- // The activity result is called after browsing for a file in the save alert dialog.
- @Override
- public void onActivityResult(int requestCode, int resultCode, Intent data) {
- // Run the default commands.
- super.onActivityResult(requestCode, resultCode, data);
-
- // Don't do anything if the user pressed back from the file picker.
- if (resultCode == Activity.RESULT_OK) {
- // Get a handle for the save dialog fragment.
- DialogFragment saveDialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(getString(R.string.save_logcat));
-
- // Only update the file name if the dialog still exists.
- if (saveDialogFragment != null) {
- // Get a handle for the save dialog.
- Dialog saveDialog = saveDialogFragment.getDialog();
-
- // Remove the lint warning below that the save dialog might be null.
- assert saveDialog != null;
-
- // Get a handle for the dialog views.
- EditText fileNameEditText = saveDialog.findViewById(R.id.file_name_edittext);
- TextView fileExistsWarningTextView = saveDialog.findViewById(R.id.file_exists_warning_textview);
-
- // Instantiate the file name helper.
- FileNameHelper fileNameHelper = new FileNameHelper();
-
- // Get the file name URI from the intent.
- Uri fileNameUri= data.getData();
-
- // Process the file name URI if it is not null.
- if (fileNameUri != null) {
- // Convert the file name URI to a file name path.
- String fileNamePath = fileNameHelper.convertUriToFileNamePath(fileNameUri);
-
- // Set the file name path as the text of the file name edit text.
- fileNameEditText.setText(fileNamePath);
-
- // Move the cursor to the end of the file name edit text.
- fileNameEditText.setSelection(fileNamePath.length());
-
- // Hide the file exists warning.
- fileExistsWarningTextView.setVisibility(View.GONE);
- }
- }
+ Snackbar.make(logcatTextView, getString(R.string.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show();
}
}
}
\ No newline at end of file
projects / PrivacyBrowserAndroid.git / blobdiff