X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FLogcatActivity.java;h=8e54bb43a119d6e16c5d9e425d1d0e2854650f6b;hp=9f433632419b622ba129178ded8f3f2429c7ca44;hb=d4f39c36beb5e6c3568a1e075274ad66defd8e8e;hpb=a87ea266a0df9aca50f9bc8a58066a4c962ea515 diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java index 9f433632..8e54bb43 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019-2020 Soren Stoutner . + * Copyright © 2019-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,77 +19,69 @@ 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.media.MediaScannerConnection; +import android.content.res.Configuration; import android.net.Uri; -import android.os.AsyncTask; 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 android.widget.TextView; import androidx.annotation.NonNull; 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.google.android.material.snackbar.Snackbar; import com.stoutner.privacybrowser.R; -import com.stoutner.privacybrowser.dialogs.StoragePermissionDialog; -import com.stoutner.privacybrowser.dialogs.SaveLogcatDialog; -import com.stoutner.privacybrowser.helpers.FileNameHelper; +import com.stoutner.privacybrowser.asynctasks.GetLogcat; +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.lang.ref.WeakReference; import java.nio.charset.StandardCharsets; -public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialog.SaveLogcatListener, StoragePermissionDialog.StoragePermissionDialogListener { - private String filePathString; +public class LogcatActivity extends AppCompatActivity implements SaveDialog.SaveListener { + // Declare the class constants. + private final String SCROLLVIEW_POSITION = "scrollview_position"; + + // Define the class views. + private TextView logcatTextView; @Override public void onCreate(Bundle savedInstanceState) { // Get a handle for the shared preferences. SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - // Get the theme and screenshot preferences. - boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); - boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Get the screenshot preference. + boolean allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false); // Disable screenshots if not allowed. if (!allowScreenshots) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - // Set the activity theme. - if (darkTheme) { - setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); - } else { - setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); - } + // Set the theme. + setTheme(R.style.PrivacyBrowser); // Run the default commands. super.onCreate(savedInstanceState); @@ -97,8 +89,11 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // Set the content view. setContentView(R.layout.logcat_coordinatorlayout); - // The AndroidX toolbar must be used until the minimum API is >= 21. + // 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. @@ -110,23 +105,48 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // Display the the back arrow in the action bar. actionBar.setDisplayHomeAsUpEnabled(true); + // Populate the class views. + 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).execute(); + new GetLogcat(this, 0).execute(); }); - // Set the swipe to refresh color according to the theme. - if (darkTheme) { - swipeRefreshLayout.setColorSchemeResources(R.color.blue_600); - swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.gray_800); - } else { + // Get the current theme status. + 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_NO) { swipeRefreshLayout.setColorSchemeResources(R.color.blue_700); + } else { + swipeRefreshLayout.setColorSchemeResources(R.color.blue_500); + } + + // Initialize a color background typed value. + TypedValue colorBackgroundTypedValue = new TypedValue(); + + // Get the color background from the theme. + getTheme().resolveAttribute(android.R.attr.colorBackground, colorBackgroundTypedValue, true); + + // Get the color background int from the typed value. + int colorBackgroundInt = colorBackgroundTypedValue.data; + + // Set the swipe refresh background color. + swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt); + + // Initialize the scrollview Y position int. + int scrollViewYPositionInt = 0; + + // Check to see if the activity has been restarted. + if (savedInstanceState != null) { + // Get the saved scrollview position. + scrollViewYPositionInt = savedInstanceState.getInt(SCROLLVIEW_POSITION); } // Get the logcat. - new GetLogcat(this).execute(); + new GetLogcat(this, scrollViewYPositionInt).execute(); } @Override @@ -144,186 +164,77 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo 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); - - // Get a handle for the logcat text view. - TextView logcatTextView = findViewById(R.id.logcat_textview); - - // 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); + if (menuItemId == R.id.copy) { // Copy was selected. + // Get a handle for the clipboard manager. + ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); - // Display a snackbar. - Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show(); + // Remove the incorrect lint error below that the clipboard manager might be null. + assert clipboardManager != null; - // Consume the event. - return true; + // Save the logcat in a clip data. + ClipData logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatTextView.getText()); - case R.id.save: - // Instantiate the save alert dialog. - DialogFragment saveDialogFragment = new SaveLogcatDialog(); + // Place the clip data on the clipboard. + clipboardManager.setPrimaryClip(logcatClipData); - // Show the save alert dialog. - saveDialogFragment.show(getSupportFragmentManager(), getString(R.string.save_logcat)); - - // Consume the event. - return true; - - 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(); + // Display a snackbar. + Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show(); - // Reload the logcat. - new GetLogcat(this).execute(); - } catch (IOException|InterruptedException exception) { - // Do nothing. - } + // 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); - // Consume the event. - return true; + // Show the save alert dialog. + saveDialogFragment.show(getSupportFragmentManager(), getString(R.string.save_logcat)); - default: - // Don't consume the event. - return super.onOptionsItemSelected(menuItem); - } - } + // 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"); - @Override - public void onSaveLogcat(DialogFragment dialogFragment) { - // Get a handle for the dialog fragment. - Dialog dialog = dialogFragment.getDialog(); + // Wait for the process to finish. + process.waitFor(); - // Remove the lint warning below that the dialog fragment 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. - 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); - - } + // Reload the logcat. + new GetLogcat(this, 0).execute(); + } catch (IOException | InterruptedException exception) { + // Do nothing. } - } - } - - @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); - } - @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. - // Get a handle for the logcat text view. - TextView logcatTextView = findViewById(R.id.logcat_textview); - - // Display an error snackbar. - Snackbar.make(logcatTextView, getString(R.string.cannot_use_location), Snackbar.LENGTH_LONG).show(); + // 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); } } - private void saveLogcat(String fileNameString) { - // Get a handle for the logcat text view. - TextView logcatTextView = findViewById(R.id.logcat_textview); - - try { - // Get the logcat as a string. - String logcatString = logcatTextView.getText().toString(); - - // Create an input stream with the contents of the logcat. - InputStream logcatInputStream = new ByteArrayInputStream(logcatString.getBytes(StandardCharsets.UTF_8)); - - // 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); - - // Create a file buffered writer. - BufferedWriter fileBufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(saveFile))); - - // 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); - - // Append a line break. - fileBufferedWriter.append("\n"); - } + @Override + public void onSaveInstanceState(@NonNull Bundle savedInstanceState) { + // Run the default commands. + super.onSaveInstanceState(savedInstanceState); - // Close the buffered reader and writer. - logcatBufferedReader.close(); - fileBufferedWriter.close(); + // Get a handle for the logcat scrollview. + ScrollView logcatScrollView = findViewById(R.id.logcat_scrollview); - // 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); + // Get the scrollview Y position. + int scrollViewYPositionInt = logcatScrollView.getScrollY(); - // Display a snackbar. - Snackbar.make(logcatTextView, getString(R.string.file_saved_successfully), 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(); - } + // Store the scrollview Y position in the bundle. + savedInstanceState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt); } // 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) { + public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) { // Run the default commands. - super.onActivityResult(requestCode, resultCode, data); + super.onActivityResult(requestCode, resultCode, returnedIntent); - // Don't do anything if the user pressed back from the file picker. + // 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)); @@ -336,106 +247,80 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // Remove the lint warning below that the save dialog might be null. assert saveDialog != null; - // Get a handle for the dialog views. + // Get a handle for the file name edit text. 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(); + Uri fileNameUri = returnedIntent.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); + // Get the file name string from the URI. + String fileNameString = fileNameUri.toString(); - // Set the file name path as the text of the file name edit text. - fileNameEditText.setText(fileNamePath); + // Set the file name text. + fileNameEditText.setText(fileNameString); - // 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); - } + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNameString.length()); } } } - // `Void` does not declare any parameters. `Void` does not declare progress units. `String` contains the results. - private static class GetLogcat extends AsyncTask { - // Create a weak reference to the calling activity. - private final WeakReference activityWeakReference; - - // Populate the weak reference to the calling activity. - GetLogcat(Activity activity) { - activityWeakReference = new WeakReference<>(activity); - } - - @Override - protected String doInBackground(Void... parameters) { - // Get a handle for the activity. - Activity activity = activityWeakReference.get(); + @Override + public void onSave(int saveType, DialogFragment dialogFragment) { + // Get a handle for the dialog. + Dialog dialog = dialogFragment.getDialog(); - // Abort if the activity is gone. - if ((activity == null) || activity.isFinishing()) { - return ""; - } + // Remove the lint warning below that the dialog might be null. + assert dialog != null; - // Create a log string builder. - StringBuilder logStringBuilder = new StringBuilder(); + // Get a handle for the file name edit text. + EditText fileNameEditText = dialog.findViewById(R.id.file_name_edittext); - try { - // Get the logcat. `-b all` gets all the buffers (instead of just crash, main, and system). `-v long` produces more complete information. `-d` dumps the logcat and exits. - Process process = Runtime.getRuntime().exec("logcat -b all -v long -d"); + // Get the file path string. + String fileNameString = fileNameEditText.getText().toString(); - // Wrap the logcat in a buffered reader. - BufferedReader logBufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream())); + try { + // Get the logcat as a string. + String logcatString = logcatTextView.getText().toString(); - // Create a log transfer string. - String logTransferString; + // Create an input stream with the contents of the logcat. + InputStream logcatInputStream = new ByteArrayInputStream(logcatString.getBytes(StandardCharsets.UTF_8)); - // Use the log transfer string to copy the logcat from the buffered reader to the string builder. - while ((logTransferString = logBufferedReader.readLine()) != null) { - // Append a line. - logStringBuilder.append(logTransferString); + // Create a logcat buffered reader. + BufferedReader logcatBufferedReader = new BufferedReader(new InputStreamReader(logcatInputStream)); - // Append a line break. - logStringBuilder.append("\n"); - } + // Open an output stream. + OutputStream outputStream = getContentResolver().openOutputStream(Uri.parse(fileNameString)); - // Close the buffered reader. - logBufferedReader.close(); - } catch (IOException exception) { - // Do nothing. - } + // Create a file buffered writer. + BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream)); - // Return the logcat. - return logStringBuilder.toString(); - } + // Create a transfer string. + String transferString; - // `onPostExecute()` operates on the UI thread. - @Override - protected void onPostExecute(String logcatString) { - // Get a handle for the activity. - Activity activity = activityWeakReference.get(); + // 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. + bufferedWriter.append(transferString); - // Abort if the activity is gone. - if ((activity == null) || activity.isFinishing()) { - return; + // Append a line break. + bufferedWriter.append("\n"); } - // Get handles for the views. - TextView logcatTextView = activity.findViewById(R.id.logcat_textview); - SwipeRefreshLayout swipeRefreshLayout = activity.findViewById(R.id.logcat_swiperefreshlayout); + // Flush the buffered writer. + bufferedWriter.flush(); - // Display the logcat. - logcatTextView.setText(logcatString); + // Close the inputs and outputs. + logcatBufferedReader.close(); + logcatInputStream.close(); + bufferedWriter.close(); + outputStream.close(); - // Stop the swipe to refresh animation if it is displayed. - swipeRefreshLayout.setRefreshing(false); + // 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.error_saving_file) + " " + exception.toString(), Snackbar.LENGTH_INDEFINITE).show(); } } } \ No newline at end of file