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=7878f985ab5609841867b0554e966a2df869d132;hp=c38181a60239d81e190b1274ba8e94422ac73de8;hb=b82022327701273b1b56419e8d6042895c0bc7b9;hpb=5d3cafb4a4fbb2bf851d36f973cc1e8b23ecebab 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 c38181a6..7878f985 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 Soren Stoutner . + * Copyright © 2019-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -27,21 +27,24 @@ 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.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; // The AndroidX toolbar must be used until the minimum API is >= 21. +import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; @@ -50,6 +53,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.google.android.material.snackbar.Snackbar; 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; @@ -63,19 +67,24 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; -import java.lang.ref.WeakReference; import java.nio.charset.StandardCharsets; public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialog.SaveLogcatListener, StoragePermissionDialog.StoragePermissionDialogListener { + // Initialize the saved instance state constants. + private final String SCROLLVIEW_POSITION = "scrollview_position"; + + // Define the class variables. private String filePathString; + // 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); + // Get the screenshot preference. boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); // Disable screenshots if not allowed. @@ -83,12 +92,8 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo 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); @@ -96,7 +101,7 @@ 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. + // Set the toolbar as the action bar. Toolbar toolbar = findViewById(R.id.logcat_toolbar); setSupportActionBar(toolbar); @@ -109,23 +114,49 @@ 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); + // 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_YES) { + swipeRefreshLayout.setColorSchemeResources(R.color.blue_500); } else { swipeRefreshLayout.setColorSchemeResources(R.color.blue_700); } + // 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 @@ -148,9 +179,6 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // 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()); @@ -185,7 +213,7 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo process.waitFor(); // Reload the logcat. - new GetLogcat(this).execute(); + new GetLogcat(this, 0).execute(); } catch (IOException|InterruptedException exception) { // Do nothing. } @@ -199,6 +227,21 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo } } + @Override + public void onSaveInstanceState(@NonNull Bundle savedInstanceState) { + // Run the default commands. + super.onSaveInstanceState(savedInstanceState); + + // Get a handle for the logcat scrollview. + ScrollView logcatScrollView = findViewById(R.id.logcat_scrollview); + + // Get the scrollview Y position. + int scrollViewYPositionInt = logcatScrollView.getScrollY(); + + // Store the scrollview Y position in the bundle. + savedInstanceState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt); + } + @Override public void onSaveLogcat(DialogFragment dialogFragment) { // Get a handle for the dialog fragment. @@ -261,18 +304,12 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // 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(); } } 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(); @@ -335,8 +372,9 @@ 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 file name edit text. + // 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(); @@ -351,83 +389,14 @@ public class LogcatActivity extends AppCompatActivity implements SaveLogcatDialo // Set the file name path as the text of the file name edit text. fileNameEditText.setText(fileNamePath); - } - } - } - } - - // `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(); - - // Abort if the activity is gone. - if ((activity == null) || activity.isFinishing()) { - return ""; - } - - // Create a log string builder. - StringBuilder logStringBuilder = new StringBuilder(); - - 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"); - // Wrap the logcat in a buffered reader. - BufferedReader logBufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream())); + // Move the cursor to the end of the file name edit text. + fileNameEditText.setSelection(fileNamePath.length()); - // Create a log transfer string. - String logTransferString; - - // 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); - - // Append a line break. - logStringBuilder.append("\n"); + // Hide the file exists warning. + fileExistsWarningTextView.setVisibility(View.GONE); } - - // Close the buffered reader. - logBufferedReader.close(); - } catch (IOException exception) { - // Do nothing. } - - // Return the logcat. - return logStringBuilder.toString(); - } - - // `onPostExecute()` operates on the UI thread. - @Override - protected void onPostExecute(String logcatString) { - // Get a handle for the activity. - Activity activity = activityWeakReference.get(); - - // Abort if the activity is gone. - if ((activity == null) || activity.isFinishing()) { - return; - } - - // Get handles for the views. - TextView logcatTextView = activity.findViewById(R.id.logcat_textview); - SwipeRefreshLayout swipeRefreshLayout = activity.findViewById(R.id.logcat_swiperefreshlayout); - - // Display the logcat. - logcatTextView.setText(logcatString); - - // Stop the swipe to refresh animation if it is displayed. - swipeRefreshLayout.setRefreshing(false); } } } \ No newline at end of file