Convert LogcatActivity to Kotlin. https://redmine.stoutner.com/issues/770
authorSoren Stoutner <soren@stoutner.com>
Tue, 12 Oct 2021 23:52:11 +0000 (16:52 -0700)
committerSoren Stoutner <soren@stoutner.com>
Tue, 12 Oct 2021 23:52:11 +0000 (16:52 -0700)
21 files changed:
app/build.gradle
app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java [deleted file]
app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt [new file with mode: 0644]
app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt
app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java [deleted file]
app/src/main/res/layout/logcat_bottom_appbar.xml
app/src/main/res/layout/logcat_top_appbar.xml
app/src/main/res/menu/about_version_options_menu.xml
app/src/main/res/menu/logcat_options_menu.xml
app/src/main/res/values-de/strings.xml
app/src/main/res/values-es/strings.xml
app/src/main/res/values-fr/strings.xml
app/src/main/res/values-it/strings.xml
app/src/main/res/values-night/colors.xml
app/src/main/res/values-pt-rBR/strings.xml
app/src/main/res/values-ru/strings.xml
app/src/main/res/values-tr/strings.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/strings.xml
build.gradle

index 3cc3256bfcc63af443247e4bf208c6b63cfa4732..5ce0872ceb00ae06817fbb3339e72e5ae4817941 100644 (file)
  * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 30
+    compileSdk 30
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdk 19
+        targetSdk 30
         versionCode 56
         versionName "3.8.1"
 
@@ -62,13 +64,7 @@ android {
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-
     // Include the following AndroidX libraries.
     implementation 'androidx.arch.core:core-common:2.1.0'
     implementation 'androidx.arch.core:core-runtime:2.1.0'
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.java
deleted file mode 100644 (file)
index 87bb0a3..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright © 2019-2021 Soren Stoutner <soren@stoutner.com>.
- *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
- *
- * Privacy Browser is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Privacy Browser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.stoutner.privacybrowser.activities;
-
-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.res.Configuration;
-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.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.fragment.app.DialogFragment;
-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.SaveDialog;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-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 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 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) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-        }
-
-        // Set the theme.
-        setTheme(R.style.PrivacyBrowser);
-
-        // Run the default commands.
-        super.onCreate(savedInstanceState);
-
-        // Set the content view.
-        if (bottomAppBar) {
-            setContentView(R.layout.logcat_bottom_appbar);
-        } else {
-            setContentView(R.layout.logcat_top_appbar);
-        }
-
-        // 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.
-        ActionBar actionBar = getSupportActionBar();
-
-        // Remove the incorrect lint warning that the action bar might be null.
-        assert actionBar != null;
-
-        // 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.setOnRefreshListener(() -> {
-            // Get the current logcat.
-            new GetLogcat(this, 0).execute();
-        });
-
-        // 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, scrollViewYPositionInt).execute();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu.  This adds items to the action bar.
-        getMenuInflater().inflate(R.menu.logcat_options_menu, menu);
-
-        // Display the menu.
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
-        // Get the selected menu item ID.
-        int menuItemId = menuItem.getItemId();
-
-        // Run the commands that correlate to the selected menu item.
-        if (menuItemId == R.id.copy) {  // Copy was selected.
-            // Get a handle for the clipboard manager.
-            ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-
-            // Remove the incorrect lint error below that the clipboard manager might be null.
-            assert clipboardManager != null;
-
-            // Save the logcat in a clip data.
-            ClipData logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatTextView.getText());
-
-            // Place the clip data 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;
-        } 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.
-            }
-
-            // 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);
-        }
-    }
-
-    @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);
-    }
-
-    // The activity result is called after browsing for a file in the save alert dialog.
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent returnedIntent) {
-        // Run the default commands.
-        super.onActivityResult(requestCode, resultCode, returnedIntent);
-
-        // 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));
-
-            // 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 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 onSave(int saveType, DialogFragment dialogFragment) {
-        // Get a handle for the dialog.
-        Dialog dialog = dialogFragment.getDialog();
-
-        // 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();
-
-        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));
-
-            // Open an output stream.
-            OutputStream outputStream = getContentResolver().openOutputStream(Uri.parse(fileNameString));
-
-            // Create a file buffered writer.
-            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.
-                bufferedWriter.append(transferString);
-
-                // Append a line break.
-                bufferedWriter.append("\n");
-            }
-
-            // Flush the buffered writer.
-            bufferedWriter.flush();
-
-            // Close the inputs and outputs.
-            logcatBufferedReader.close();
-            logcatInputStream.close();
-            bufferedWriter.close();
-            outputStream.close();
-
-            // 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
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/LogcatActivity.kt
new file mode 100644 (file)
index 0000000..23e6d52
--- /dev/null
@@ -0,0 +1,321 @@
+/*
+ * Copyright © 2019-2021 Soren Stoutner <soren@stoutner.com>.
+ *
+ * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+ *
+ * Privacy Browser is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Privacy Browser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.stoutner.privacybrowser.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.OpenableColumns
+import android.util.TypedValue
+import android.view.Menu
+import android.view.MenuItem
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.ScrollView
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.DialogFragment
+import androidx.preference.PreferenceManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+
+import com.google.android.material.snackbar.Snackbar
+
+import com.stoutner.privacybrowser.R
+import com.stoutner.privacybrowser.dialogs.SaveDialog
+
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.lang.Exception
+import java.nio.charset.StandardCharsets
+
+// Define the class constants.
+private const val SCROLLVIEW_POSITION = "scrollview_position"
+
+class LogcatActivity : AppCompatActivity(), SaveDialog.SaveListener {
+    // Define the class variables.
+    private var scrollViewYPositionInt = 0
+
+    // Define the class views.
+    private lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    private lateinit var logcatScrollView: ScrollView
+    private lateinit var logcatTextView: TextView
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        // Get a handle for the shared preferences.
+        val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+
+        // Get the preferences.
+        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
+        val bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false)
+
+        // Disable screenshots if not allowed.
+        if (!allowScreenshots) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        }
+
+        // Set the theme.
+        setTheme(R.style.PrivacyBrowser)
+
+        // Run the default commands.
+        super.onCreate(savedInstanceState)
+
+        // Set the content view.
+        if (bottomAppBar) {
+            setContentView(R.layout.logcat_bottom_appbar)
+        } else {
+            setContentView(R.layout.logcat_top_appbar)
+        }
+
+        // Get handles for the views.
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        swipeRefreshLayout = findViewById(R.id.swiperefreshlayout)
+        logcatScrollView = findViewById(R.id.scrollview)
+        logcatTextView = findViewById(R.id.logcat_textview)
+
+        // Set the toolbar as the action bar.
+        setSupportActionBar(toolbar)
+
+        // Get a handle for the action bar.
+        val actionBar = supportActionBar!!
+
+        // Display the back arrow in the action bar.
+        actionBar.setDisplayHomeAsUpEnabled(true)
+
+        // Implement swipe to refresh.
+        swipeRefreshLayout.setOnRefreshListener {
+            // Get the current logcat.
+            getLogcat()
+        }
+
+        // Set the swipe refresh color scheme according to the theme.
+        swipeRefreshLayout.setColorSchemeResources(R.color.blue_text)
+
+        // Initialize a color background typed value.
+        val colorBackgroundTypedValue = TypedValue()
+
+        // Get the color background from the theme.
+        theme.resolveAttribute(android.R.attr.colorBackground, colorBackgroundTypedValue, true)
+
+        // Get the color background int from the typed value.
+        val colorBackgroundInt = colorBackgroundTypedValue.data
+
+        // Set the swipe refresh background color.
+        swipeRefreshLayout.setProgressBackgroundColorSchemeColor(colorBackgroundInt)
+
+        // 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.
+        getLogcat()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        // Inflate the menu.  This adds items to the action bar.
+        menuInflater.inflate(R.menu.logcat_options_menu, menu)
+
+        // Display the menu.
+        return true
+    }
+
+    override fun onOptionsItemSelected(menuItem: MenuItem): Boolean {
+        // Run the commands that correlate to the selected menu item.
+        return when (menuItem.itemId) {
+            R.id.copy -> {  // Copy was selected.
+                // Get a handle for the clipboard manager.
+                val clipboardManager = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
+
+                // Save the logcat in a clip data.
+                val logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatTextView.text)
+
+                // Place the clip data on the clipboard.
+                clipboardManager.setPrimaryClip(logcatClipData)
+
+                // Display a snackbar.
+                Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show()
+
+                // Consume the event.
+                true
+            }
+
+            R.id.save -> {  // Save was selected.
+                // Instantiate the save alert dialog.
+                val saveDialogFragment: DialogFragment = SaveDialog.save(SaveDialog.SAVE_LOGCAT)
+
+                // Show the save alert dialog.
+                saveDialogFragment.show(supportFragmentManager, getString(R.string.save_logcat))
+
+                // Consume the event.
+                true
+            }
+
+            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).
+                    val process = Runtime.getRuntime().exec("logcat -b all -c")
+
+                    // Wait for the process to finish.
+                    process.waitFor()
+
+                    // Reset the scroll view Y position int.
+                    scrollViewYPositionInt = 0
+
+                    // Reload the logcat.
+                    getLogcat()
+                } catch (exception: Exception) {
+                    // Do nothing.
+                }
+
+                // Consume the event.
+                true
+            }
+
+            else -> {  // The home button was pushed.
+                // Do not consume the event.  The system will process the home command.
+                super.onOptionsItemSelected(menuItem)
+            }
+        }
+    }
+
+    public override fun onSaveInstanceState(savedInstanceState: Bundle) {
+        // Run the default commands.
+        super.onSaveInstanceState(savedInstanceState)
+
+        // Get the scrollview Y position.
+        val scrollViewYPositionInt = logcatScrollView.scrollY
+
+        // Store the scrollview Y position in the bundle.
+        savedInstanceState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt)
+    }
+
+    private fun getLogcat() {
+        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.
+            val getLogcatProcess = Runtime.getRuntime().exec("logcat -b all -v long -d")
+
+            // Wrap the logcat in a buffered reader.
+            val logcatBufferedReader = BufferedReader(InputStreamReader(getLogcatProcess.inputStream))
+
+            // Display the logcat.
+            logcatTextView.text = logcatBufferedReader.readText()
+
+            // Close the buffered reader.
+            logcatBufferedReader.close()
+        } catch (exception: IOException) {
+            // Do nothing.
+        }
+
+        // Update the scroll position after the text is populated.
+        logcatTextView.post {
+            // Set the scroll position.
+            logcatScrollView.scrollY = scrollViewYPositionInt
+        }
+
+        // Stop the swipe to refresh animation if it is displayed.
+        swipeRefreshLayout.isRefreshing = false
+    }
+
+    // The activity result is called after browsing for a file in the save alert dialog.
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, returnedIntent: Intent?) {
+        // Run the default commands.
+        super.onActivityResult(requestCode, resultCode, returnedIntent)
+
+        // Only do something if the user didn't press back from the file picker.
+        if (resultCode == RESULT_OK) {
+            // Get a handle for the save dialog fragment.
+            val saveDialogFragment = supportFragmentManager.findFragmentByTag(getString(R.string.save_logcat)) as DialogFragment?
+
+            // Only update the file name if the dialog still exists.
+            if (saveDialogFragment != null) {
+                // Get a handle for the save dialog.
+                val saveDialog = saveDialogFragment.dialog!!
+
+                // Get a handle for the file name edit text.
+                val fileNameEditText = saveDialog.findViewById<EditText>(R.id.file_name_edittext)
+
+                // Get the file name URI from the intent.
+                val fileNameUri = returnedIntent!!.data
+
+                // Get the file name string from the URI.
+                val 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 fun onSave(saveType: Int, dialogFragment: DialogFragment) {
+        // Get a handle for the dialog.
+        val dialog = dialogFragment.dialog!!
+
+        // Get a handle for the file name edit text.
+        val fileNameEditText = dialog.findViewById<EditText>(R.id.file_name_edittext)
+
+        // Get the file path string.
+        var fileNameString = fileNameEditText.text.toString()
+
+        try {
+            // Get the logcat as a string.
+            val logcatString = logcatTextView.text.toString()
+
+            // Open an output stream.
+            val outputStream = contentResolver.openOutputStream(Uri.parse(fileNameString))!!
+
+            // Write the logcat string to the output stream.
+            outputStream.write(logcatString.toByteArray(StandardCharsets.UTF_8))
+
+            // Close the output stream.
+            outputStream.close()
+
+            // Get the actual file name if the API >= 26.
+            if (Build.VERSION.SDK_INT >= 26) {
+                // Get a cursor from the content resolver.
+                val contentResolverCursor = contentResolver.query(Uri.parse(fileNameString), null, null, null)!!
+
+                // Move to the first row.
+                contentResolverCursor.moveToFirst()
+
+                // Get the file name from the cursor.
+                fileNameString = contentResolverCursor.getString(contentResolverCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+
+                // Close the cursor.
+                contentResolverCursor.close()
+            }
+
+            // 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
index 38fae2ed2702872414432600b6e744418a2c6e9d..498b034edc4897c9bfd9ad2802f31071603df430 100644 (file)
@@ -3434,11 +3434,7 @@ public class MainWebViewActivity extends AppCompatActivity implements CreateBook
         defaultProgressViewEndOffset = swipeRefreshLayout.getProgressViewEndOffset();
 
         // 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.violet_500);
-        }
+        swipeRefreshLayout.setColorSchemeResources(R.color.blue_text);
 
         // Initialize a color background typed value.
         TypedValue colorBackgroundTypedValue = new TypedValue();
index 532eda553eb258e2c0809f8a14f762214b5a41b1..759b79c0fb00ebbbe91fc20bb21e002392c4bfb7 100644 (file)
@@ -186,11 +186,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener {
         }
 
         // 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.violet_500)
-        }
+        swipeRefreshLayout.setColorSchemeResources(R.color.blue_text)
 
         // Initialize a color background typed value.
         val colorBackgroundTypedValue = TypedValue()
diff --git a/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java b/app/src/main/java/com/stoutner/privacybrowser/asynctasks/GetLogcat.java
deleted file mode 100644 (file)
index 8abd75a..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright © 2020-2021 Soren Stoutner <soren@stoutner.com>.
- *
- * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
- *
- * Privacy Browser is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Privacy Browser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.stoutner.privacybrowser.asynctasks;
-
-import android.app.Activity;
-import android.os.AsyncTask;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.stoutner.privacybrowser.R;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.ref.WeakReference;
-
-// `Void` does not declare any parameters.  `Void` does not declare progress units.  `String` contains the results.
-public class GetLogcat extends AsyncTask<Void, Void, String> {
-    // Define the class variables.
-    private final WeakReference<Activity> activityWeakReference;
-    private final int scrollViewYPositionInt;
-
-    // The public constructor.
-    public GetLogcat(Activity activity, int scrollViewYPositionInt) {
-        // Populate the weak reference to the calling activity.
-        activityWeakReference = new WeakReference<>(activity);
-
-        // Store the scrollview Y position.
-        this.scrollViewYPositionInt = scrollViewYPositionInt;
-    }
-
-    @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()));
-
-            // 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");
-            }
-
-            // 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);
-        ScrollView scrollView = activity.findViewById(R.id.logcat_scrollview);
-
-        // Display the logcat.
-        logcatTextView.setText(logcatString);
-
-        // Update the scroll position after the text is populated.
-        logcatTextView.post(() -> {
-            // Set the scroll position.
-            scrollView.setScrollY(scrollViewYPositionInt);
-        });
-
-        // Stop the swipe to refresh animation if it is displayed.
-        swipeRefreshLayout.setRefreshing(false);
-    }
-}
\ No newline at end of file
index e7e4051a70cbd1c86ef3dfc0209d0cc22387e017..9637997d1425e54e432fdc0bcfd4a6b9731f6292 100644 (file)
@@ -19,7 +19,6 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-    android:id="@+id/logcat_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
         app:layout_dodgeInsetEdges="bottom" >
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/logcat_swiperefreshlayout"
+            android:id="@+id/swiperefreshlayout"
             android:layout_height="0dp"
             android:layout_width="match_parent"
             android:layout_weight="1" >
 
             <ScrollView
-                android:id="@+id/logcat_scrollview"
+                android:id="@+id/scrollview"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" >
 
 
         <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/logcat_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
             <androidx.appcompat.widget.Toolbar
-                android:id="@+id/logcat_toolbar"
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
index 8179fa8c1e3999d49eeebc425b5c06dcb09cce50..005c2f560d9572c2ba7492fca7e9aef9d9d48147 100644 (file)
@@ -19,7 +19,6 @@
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout
-    android:id="@+id/logcat_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent" >
 
         <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/logcat_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
             <androidx.appcompat.widget.Toolbar
-                android:id="@+id/logcat_toolbar"
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/logcat_swiperefreshlayout"
+            android:id="@+id/swiperefreshlayout"
             android:layout_height="match_parent"
             android:layout_width="match_parent" >
 
             <ScrollView
-                android:id="@+id/logcat_scrollview"
+                android:id="@+id/scrollview"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" >
 
index c434633f33996d7e44dd50b49b0c5659c89f1e80..3e1914afc0fec260e736052050c0c04a9dbdb5c7 100644 (file)
@@ -25,7 +25,7 @@
     <!-- `android:iconTint` can be used once the minimum API >= 26 instead of including a separate drawable for each theme. -->
     <item
         android:id="@+id/copy"
-        android:title="@string/copy_string"
+        android:title="@string/copy"
         android:orderInCategory="10"
         android:icon="?attr/copyIcon"
         app:showAsAction="ifRoom" />
index f8c8dd1180e7f263ea9fed41f3e2675a8421d36b..c85245473ecef7f4e83442f58b95888604d37808 100644 (file)
 
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <!-- `android:iconTint` can be used once the minimum API >= 26 instead of including a separate drawable for each theme. -->
     <item
         android:id="@+id/copy"
-        android:title="@string/copy_string"
+        android:title="@string/copy"
         android:orderInCategory="10"
         android:icon="?attr/copyIcon"
         app:showAsAction="always" />
index 3fe0972436942011497f473d1df2c177fad945c7..4a9bf34f4456db94fea8081a5c064b13dcdcd485 100644 (file)
     <string name="import_failed">Import fehlgeschlagen:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">kopieren</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">kopieren</string>
     <string name="logcat_copied">Logcat kopiert.</string>
     <string name="clear">leeren</string>
 
index c6d2247529ba1d9b6ffa80d303b2ca492bd0c162..fd26948d3f83607491ca260d322bf7db2fc01115 100644 (file)
     <string name="import_failed">Importación fallida:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Copiar</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Copiar</string>
     <string name="logcat_copied">Logcat copiado.</string>
     <string name="clear">Borrar</string>
 
index 525cb0f8ac44b1d1a895d21a1767737d6db6e708..77e29dec2fbc1eb8ee56f4581bde17e81091a171 100644 (file)
     <string name="import_failed">L\'import a échoué :</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Copie</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Copie</string>
     <string name="logcat_copied">Journal système copié.</string>
     <string name="clear">Vider</string>
 
index c6fd08424182484dba18d9d4992710656e62a9ee..336db91723b897cc3fd38d73be5cca91c28a1b9c 100644 (file)
     <string name="import_failed">Importazione fallita:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Copia</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Copia</string>
     <string name="logcat_copied">Logcat copiato.</string>
     <string name="clear">Cancella</string>
 
index 8ba568fca2f5628f776fd06560b85a8d3fc5f58d..eeeb5f79c9a6c7d8e4d629aed61ed65207f54ba9 100644 (file)
 
 <!-- Colors are currently hardcoded in the vector drawables.  Once the minimum API is >= 22 the hardcoded colors can be removed and they can reference these entries instead. -->
 <resources>
-    <!-- Named colors. -->
-    <color name="disabled_tint">#FF9E9E9E</color>  <!-- gray_500 -->
-    <color name="ghosted_tint">#FF616161</color>  <!-- gray_700 -->
-    <color name="red_tint">#FFB71C1C</color>  <!-- red_900 -->
+    <!-- Nicknamed colors. -->
+    <color name="blue_text">@color/violet_500</color>
 
     <!-- Raw colors. -->
     <color name="semi_transparent_black">#66000000</color>
index 6387356d336a5cf9f97f6af760b70ef0aff80f92..8bc85358b380a3159a666a941bb060490fd3e453 100644 (file)
     <string name="import_failed">A importação falhou:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Cópia</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Cópia</string>
     <string name="logcat_copied">Logcat copiado.</string>
     <string name="clear">Limpar</string>
 
index ec1a4028a30589950f38624cb60902740b79cb6d..c8bbd363d914c699e011470e1e35db2ee58595e8 100644 (file)
     <string name="import_failed">Сбой при импорте:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Копировать</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Копировать</string>
     <string name="logcat_copied">Logcat скопирован.</string>
     <string name="clear">Очистить</string>
 
index 5fdea5c471b8a18b215a399387cc2cbe4bc3f72e..9318cbfd5c86302de51ec3548e0a59b1af60c754 100644 (file)
     <string name="import_failed">İçe aktarım başarısız:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Kopyala</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Kopyala</string>
     <string name="logcat_copied">Logcat kopyalandı.</string>
     <string name="clear">Temizle</string>
 
index 4a24aff2946eb89fa88e6e99016c70f92ff9487c..69bf0664df2d0bb21628ff90fa8ff9433ed32c25 100644 (file)
 
 <!-- Colors are currently hardcoded in the vector drawables.  Once the minimum API is >= 22 the hardcoded colors can be removed and they can reference these entries instead. -->
 <resources>
-    <!-- Named colors. -->
-    <color name="disabled_tint">#FF757575</color>  <!-- gray_600 -->
-    <color name="ghosted_tint">#FFB7B7B7</color>  <!-- gray_425 -->
-    <color name="red_tint">#FFB71C1C</color>  <!-- red_900 -->
+    <!-- Nicknamed colors. -->
+    <color name="blue_text">@color/blue_700</color>
 
     <!-- Raw colors. -->
     <color name="semi_transparent_black">#66000000</color>
index 01508721223182dbf34b951d8c7bda79f32f507f..74ec28b9f1c4eadaafe597c482be19d5818f34ae 100644 (file)
     <string name="import_failed">Import failed:</string>
 
     <!-- Logcat. -->
-    <string name="copy_string">Copy</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="copy">Copy</string>
     <string name="logcat_copied">Logcat copied.</string>
     <string name="clear">Clear</string>
 
index ded459404d8a1cd9a57a995177c96e5ff4557a5b..d384f0f0c29e6347f96fb4a6ed566705dd1e48bc 100644 (file)
@@ -26,7 +26,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
 
         // NOTE: Do not place your application dependencies here; they belong