From: Soren Stoutner Date: Fri, 28 Mar 2025 20:49:15 +0000 (-0700) Subject: Add support for searching the logcat. https://redmine.stoutner.com/issues/1192 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;ds=inline;p=PrivacyCell.git Add support for searching the logcat. https://redmine.stoutner.com/issues/1192 --- diff --git a/app/build.gradle b/app/build.gradle index 3a14a00..cda9f4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2021-2025 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 @@ -68,11 +68,11 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.webkit:webkit:1.12.1' + implementation 'androidx.webkit:webkit:1.13.0' implementation 'androidx.work:work-runtime-ktx:2.10.0' // Include the Kotlin standard library. This should be the same version number listed in the project build.gradle. - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0' // Include the Google material library. implementation 'com.google.android.material:material:1.12.0' diff --git a/app/src/main/assets/de/changelog.html b/app/src/main/assets/de/changelog.html index cb4edab..9336277 100644 --- a/app/src/main/assets/de/changelog.html +++ b/app/src/main/assets/de/changelog.html @@ -4,7 +4,7 @@ Translation 2021-2023 Bernhard G. Keller. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/de/contributors.html b/app/src/main/assets/de/contributors.html index 1ce96aa..92ece28 100644 --- a/app/src/main/assets/de/contributors.html +++ b/app/src/main/assets/de/contributors.html @@ -4,7 +4,7 @@ Translation 2021 Bernhard G. Keller. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/de/licenses.html b/app/src/main/assets/de/licenses.html index 5e156ce..7e21791 100644 --- a/app/src/main/assets/de/licenses.html +++ b/app/src/main/assets/de/licenses.html @@ -4,7 +4,7 @@ Translation 2021-2022 Bernhard G. Keller. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -71,21 +71,26 @@ Die Origina-Icons und -Namen findend Sie unterhalb.

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/de/permissions.html b/app/src/main/assets/de/permissions.html index 33e115c..a32a926 100644 --- a/app/src/main/assets/de/permissions.html +++ b/app/src/main/assets/de/permissions.html @@ -4,7 +4,7 @@ Translation 2021-2023 Bernhard G. Keller. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/de/privacy_policy.html b/app/src/main/assets/de/privacy_policy.html index 665ef57..702e337 100644 --- a/app/src/main/assets/de/privacy_policy.html +++ b/app/src/main/assets/de/privacy_policy.html @@ -4,7 +4,7 @@ Translation 2021 Bernhard G. Keller. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/en/changelog.html b/app/src/main/assets/en/changelog.html index b22dac9..9bfbe25 100644 --- a/app/src/main/assets/en/changelog.html +++ b/app/src/main/assets/en/changelog.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/en/contributors.html b/app/src/main/assets/en/contributors.html index 65f280e..f1fcba0 100644 --- a/app/src/main/assets/en/contributors.html +++ b/app/src/main/assets/en/contributors.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/en/licenses.html b/app/src/main/assets/en/licenses.html index 9930554..a739524 100644 --- a/app/src/main/assets/en/licenses.html +++ b/app/src/main/assets/en/licenses.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -65,21 +65,26 @@ They are unchanged except for layout information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/en/permissions.html b/app/src/main/assets/en/permissions.html index ec9f5e7..53a6548 100644 --- a/app/src/main/assets/en/permissions.html +++ b/app/src/main/assets/en/permissions.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/en/privacy_policy.html b/app/src/main/assets/en/privacy_policy.html index d504657..a1f960b 100644 --- a/app/src/main/assets/en/privacy_policy.html +++ b/app/src/main/assets/en/privacy_policy.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/es/changelog.html b/app/src/main/assets/es/changelog.html index 547caef..5ae881c 100644 --- a/app/src/main/assets/es/changelog.html +++ b/app/src/main/assets/es/changelog.html @@ -4,7 +4,7 @@ Translation 2021-2023 Jose A. LeÃ³n. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/es/contributors.html b/app/src/main/assets/es/contributors.html index 3be76a2..a8d3420 100644 --- a/app/src/main/assets/es/contributors.html +++ b/app/src/main/assets/es/contributors.html @@ -4,7 +4,7 @@ Translation 2021 Jose A. LeÃ³n. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/es/licenses.html b/app/src/main/assets/es/licenses.html index 90f76a5..0f2c649 100644 --- a/app/src/main/assets/es/licenses.html +++ b/app/src/main/assets/es/licenses.html @@ -4,7 +4,7 @@ Translation 2021-2022 Jose A. LeÃ³n. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -72,21 +72,26 @@ Los iconos y nombres originales se muestran a continuaciÃ³n.

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/es/permissions.html b/app/src/main/assets/es/permissions.html index 91d6e87..85fe579 100644 --- a/app/src/main/assets/es/permissions.html +++ b/app/src/main/assets/es/permissions.html @@ -4,7 +4,7 @@ Translation 2021-2023 Jose A. LeÃ³n. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/es/privacy_policy.html b/app/src/main/assets/es/privacy_policy.html index 971352d..e22cc94 100644 --- a/app/src/main/assets/es/privacy_policy.html +++ b/app/src/main/assets/es/privacy_policy.html @@ -4,7 +4,7 @@ Translation 2021 Jose A. LeÃ³n. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/fr/changelog.html b/app/src/main/assets/fr/changelog.html index c7d3073..8d695a6 100644 --- a/app/src/main/assets/fr/changelog.html +++ b/app/src/main/assets/fr/changelog.html @@ -4,7 +4,7 @@ Translation 2021-2023 KÃ©vin L. . Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/fr/contributors.html b/app/src/main/assets/fr/contributors.html index 9002b49..0687872 100644 --- a/app/src/main/assets/fr/contributors.html +++ b/app/src/main/assets/fr/contributors.html @@ -4,7 +4,7 @@ Translation 2021 KÃ©vin L. . Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/fr/licenses.html b/app/src/main/assets/fr/licenses.html index e881ecd..2534cbf 100644 --- a/app/src/main/assets/fr/licenses.html +++ b/app/src/main/assets/fr/licenses.html @@ -4,7 +4,7 @@ Translation 2021-2022 KÃ©vin L. . Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -72,21 +72,26 @@ Les icÃ´nes et les noms originaux sont prÃ©sentÃ©s ci-dessous.

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/fr/permissions.html b/app/src/main/assets/fr/permissions.html index 7f06f28..7b1d762 100644 --- a/app/src/main/assets/fr/permissions.html +++ b/app/src/main/assets/fr/permissions.html @@ -4,7 +4,7 @@ Translation 2021-2023 KÃ©vin L. . Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/fr/privacy_policy.html b/app/src/main/assets/fr/privacy_policy.html index e231ba2..6af7400 100644 --- a/app/src/main/assets/fr/privacy_policy.html +++ b/app/src/main/assets/fr/privacy_policy.html @@ -4,7 +4,7 @@ Translation 2021 KÃ©vin L. . Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/images/antiquated.svg b/app/src/main/assets/images/antiquated.svg index e89a7a9..b026354 100644 --- a/app/src/main/assets/images/antiquated.svg +++ b/app/src/main/assets/images/antiquated.svg @@ -1,24 +1,27 @@ + This program 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 + this program. If not, see . -->

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/it/permissions.html b/app/src/main/assets/it/permissions.html index 11b9f09..1c26499 100644 --- a/app/src/main/assets/it/permissions.html +++ b/app/src/main/assets/it/permissions.html @@ -4,7 +4,7 @@ Translation 2021-2023 Francesco Buratti. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/it/privacy_policy.html b/app/src/main/assets/it/privacy_policy.html index 972c134..768f285 100644 --- a/app/src/main/assets/it/privacy_policy.html +++ b/app/src/main/assets/it/privacy_policy.html @@ -4,7 +4,7 @@ Translation 2021 Francesco Buratti. Copyright assigned to Soren Stoutner . - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/ru/changelog.html b/app/src/main/assets/ru/changelog.html index 7611bd4..0c44a1a 100644 --- a/app/src/main/assets/ru/changelog.html +++ b/app/src/main/assets/ru/changelog.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/ru/contributors.html b/app/src/main/assets/ru/contributors.html index c1e76fe..3815db4 100644 --- a/app/src/main/assets/ru/contributors.html +++ b/app/src/main/assets/ru/contributors.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/ru/licenses.html b/app/src/main/assets/ru/licenses.html index 2afcc20..1a16b60 100644 --- a/app/src/main/assets/ru/licenses.html +++ b/app/src/main/assets/ru/licenses.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -67,21 +67,26 @@ ÐÑÐ¸Ð³Ð¸Ð½Ð°Ð»ÑÐ½ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸ Ð¸ Ð¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ Ð½Ð¸Ð¶Ðµ.

bug_report_rounded.

call_to_action_rounded.

chrome_reader_mode_rounded.

close_rounded.

chrome_reader_mode_rounded.

close_rounded_fill0_weight400_grade0_24px.

content_copy_outlined.

fact_checked_outlined.

format_list_bulleted_rounded.

forum_rounded.

groups_filled.

list_alt_rounded_24.

+ keyboard_arrow_down_rounded_fill0_weight400_grade0_24px.

+ keyboard_arrow_up_rounded_fill0_weight400_grade0_24px.

list_alt_rounded_24px.

map_rounded.

notification_important_rounded_filled.

payments_rounded.

phone_android_outlined.

policy_filled.

save_outlined.

settings_input_antenna_rounded.

search_rounded_fill0_weight400_grade0_24px.

settings_input_antenna_rounded.

settings_rounded.

text_snippet_outlined.

diff --git a/app/src/main/assets/ru/permissions.html b/app/src/main/assets/ru/permissions.html index 017cfb0..4817965 100644 --- a/app/src/main/assets/ru/permissions.html +++ b/app/src/main/assets/ru/permissions.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2023, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/assets/ru/privacy_policy.html b/app/src/main/assets/ru/privacy_policy.html index 0bfb39d..b46de5b 100644 --- a/app/src/main/assets/ru/privacy_policy.html +++ b/app/src/main/assets/ru/privacy_policy.html @@ -2,7 +2,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/java/com/stoutner/privacycell/activities/LogcatActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/LogcatActivity.kt index 9b2156d..070edf8 100644 --- a/app/src/main/java/com/stoutner/privacycell/activities/LogcatActivity.kt +++ b/app/src/main/java/com/stoutner/privacycell/activities/LogcatActivity.kt @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2021-2022, 2025 Soren Stoutner + * SPDX-FileCopyrightText: 2021-2025 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 @@ -22,12 +22,21 @@ package com.stoutner.privacycell.activities import android.content.ClipData import android.content.ClipboardManager import android.net.Uri +import android.os.Build import android.os.Bundle import android.provider.OpenableColumns +import android.text.Editable +import android.text.TextWatcher +import android.util.Base64 import android.util.TypedValue +import android.view.KeyEvent import android.view.Menu import android.view.MenuItem -import android.widget.ScrollView +import android.view.View +import android.view.inputmethod.InputMethodManager +import android.webkit.WebView +import android.widget.EditText +import android.widget.LinearLayout import android.widget.TextView import androidx.activity.result.contract.ActivityResultContracts @@ -52,25 +61,25 @@ import java.lang.Exception import java.nio.charset.StandardCharsets // Define the class constants. -private const val SCROLLVIEW_POSITION = "scrollview_position" +private const val SCROLL_Y = "scroll_y" class LogcatActivity : AppCompatActivity() { - // Define the class variables. - private var scrollViewYPositionInt = 0 + // Declare the class variables. + private lateinit var inputMethodManager: InputMethodManager + private lateinit var logcatPlainTextStringBuilder: StringBuilder // Define the class views. + private lateinit var logcatWebView: WebView + private lateinit var searchEditText: EditText + private lateinit var searchLinearLayout: LinearLayout private lateinit var swipeRefreshLayout: SwipeRefreshLayout - private lateinit var logcatScrollView: ScrollView - private lateinit var logcatTextView: TextView + private lateinit var toolbar: Toolbar // Define the save logcat activity result launcher. It must be defined before `onCreate()` is run or the app will crash. private val saveLogcatActivityResultLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { fileNameUri: Uri? -> // Only save the file if the URI is not null, which happens if the user exited the file picker by pressing back. if (fileNameUri != null) { try { - // Get the logcat as a string. - val logcatString = logcatTextView.text.toString() - // Open an output stream. val outputStream = contentResolver.openOutputStream(fileNameUri)!! @@ -78,7 +87,7 @@ class LogcatActivity : AppCompatActivity() { CoroutineScope(Dispatchers.Main).launch { withContext(Dispatchers.IO) { // Write the logcat string to the output stream. - outputStream.write(logcatString.toByteArray(StandardCharsets.UTF_8)) + outputStream.write(logcatPlainTextStringBuilder.toString().toByteArray(StandardCharsets.UTF_8)) // Close the output stream. outputStream.close() @@ -98,10 +107,10 @@ class LogcatActivity : AppCompatActivity() { contentResolverCursor.close() // Display a snackbar with the saved logcat information. - Snackbar.make(logcatTextView, getString(R.string.logcat_saved, fileNameString), Snackbar.LENGTH_SHORT).show() + Snackbar.make(logcatWebView, getString(R.string.logcat_saved, fileNameString), Snackbar.LENGTH_SHORT).show() } catch (exception: Exception) { // Display a snackbar with the error message. - Snackbar.make(logcatTextView, getString(R.string.error_saving_logcat, exception.toString()), Snackbar.LENGTH_INDEFINITE).show() + Snackbar.make(logcatWebView, getString(R.string.error_saving_logcat, exception.toString()), Snackbar.LENGTH_INDEFINITE).show() } } } @@ -117,17 +126,18 @@ class LogcatActivity : AppCompatActivity() { val bottomAppBar = sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false) // Set the content view. - if (bottomAppBar) { + if (bottomAppBar) setContentView(R.layout.logcat_bottom_appbar) - } else { + else setContentView(R.layout.logcat_top_appbar) - } // Get handles for the views. - val toolbar = findViewById(R.id.toolbar) + toolbar = findViewById(R.id.toolbar) + searchLinearLayout = findViewById(R.id.search_linearlayout) + searchEditText = findViewById(R.id.search_edittext) + val searchCountTextView = findViewById(R.id.search_count_textview) swipeRefreshLayout = findViewById(R.id.swiperefreshlayout) - logcatScrollView = findViewById(R.id.scrollview) - logcatTextView = findViewById(R.id.logcat_textview) + logcatWebView = findViewById(R.id.logcat_webview) // Set the toolbar as the action bar. setSupportActionBar(toolbar) @@ -140,8 +150,8 @@ class LogcatActivity : AppCompatActivity() { // Implement swipe to refresh. swipeRefreshLayout.setOnRefreshListener { - // Get the current logcat. - getLogcat() + // Populate the current logcat. + populateLogcat() } // Set the swipe refresh color scheme according to the theme. @@ -159,14 +169,65 @@ class LogcatActivity : AppCompatActivity() { // 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 a handle for the input method manager. + inputMethodManager = (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager) + + // Search for the string on the page whenever a character changes in the search edit text. + searchEditText.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(charSequence: CharSequence, start: Int, count: Int, after: Int) { + // Do nothing. + } + + override fun onTextChanged(charSequence: CharSequence, start: Int, before: Int, count: Int) { + // Do nothing. + } + + override fun afterTextChanged(editable: Editable) { + // Search for the text in the WebView. + logcatWebView.findAllAsync(searchEditText.text.toString()) + } + }) + + // Set the `check mark` button for the search edit text keyboard to close the soft keyboard. + searchEditText.setOnKeyListener { _: View?, keyCode: Int, keyEvent: KeyEvent -> + if ((keyEvent.action == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { // The `enter` key was pressed. + // Search for the text in the WebView. + logcatWebView.findAllAsync(searchEditText.text.toString()) + + // Hide the soft keyboard. + inputMethodManager.hideSoftInputFromWindow(logcatWebView.windowToken, 0) + + // Consume the event. + return@setOnKeyListener true + } else { // A different key was pressed. + // Do not consume the event. + return@setOnKeyListener false + } } - // Get the logcat. - getLogcat() + // Update the find on page count. + logcatWebView.setFindListener { activeMatchOrdinal, numberOfMatches, isDoneCounting -> + if (isDoneCounting && (numberOfMatches == 0)) { // There are no matches. + // Set the search count text view to be `0/0`. + searchCountTextView.setText(R.string.zero_of_zero) + } else if (isDoneCounting) { // There are matches. + // The active match ordinal is zero-based. + val activeMatch = activeMatchOrdinal + 1 + + // Build the match string. + val matchString = "$activeMatch/$numberOfMatches" + + // Update the search count text view. + searchCountTextView.text = matchString + } + } + + // Restore the WebView scroll position if the activity has been restarted. + if (savedInstanceState != null) + logcatWebView.scrollY = savedInstanceState.getInt(SCROLL_Y) + + // Populate the logcat. + populateLogcat() } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -180,18 +241,48 @@ class LogcatActivity : AppCompatActivity() { override fun onOptionsItemSelected(menuItem: MenuItem): Boolean { // Run the commands that correlate to the selected menu item. return when (menuItem.itemId) { + R.id.search -> { // Search was selected. + // Set the minimum height of the search linear layout to match the toolbar. + searchLinearLayout.minimumHeight = toolbar.height + + // Hide the toolbar. + toolbar.visibility = View.GONE + + // Show the search linear layout. + searchLinearLayout.visibility = View.VISIBLE + + // Display the keyboard once the UI has quiesced. + searchLinearLayout.post { + // Set the focus on the find on page edit text. + searchEditText.requestFocus() + + // Get a handle for the input method manager. + val inputMethodManager = (getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager) + + // Display the keyboard. `0` sets no input flags. + inputMethodManager.showSoftInput(searchEditText, 0) + } + + // Resume the WebView timers. For some reason they get automatically paused, which prevents searching. + logcatWebView.resumeTimers() + + // Consume the event. + return true + } + 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) + val logcatClipData = ClipData.newPlainText(getString(R.string.logcat), logcatPlainTextStringBuilder) // Place the clip data on the clipboard. clipboardManager.setPrimaryClip(logcatClipData) - // Display a snackbar. - Snackbar.make(logcatTextView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show() + // Display a snackbar if the API <= 32 (Android 12L). Beginning in Android 13 the OS displays a notification that covers up the snackbar. + if (Build.VERSION.SDK_INT <= 32) + Snackbar.make(logcatWebView, R.string.logcat_copied, Snackbar.LENGTH_SHORT).show() // Consume the event. true @@ -213,11 +304,8 @@ class LogcatActivity : AppCompatActivity() { // Wait for the process to finish. process.waitFor() - // Reset the scroll view Y position int. - scrollViewYPositionInt = 0 - // Reload the logcat. - getLogcat() + populateLogcat() } catch (exception: Exception) { // Do nothing. } @@ -237,14 +325,11 @@ class LogcatActivity : AppCompatActivity() { // Run the default commands. super.onSaveInstanceState(outState) - // Get the scrollview Y position. - val scrollViewYPositionInt = logcatScrollView.scrollY - - // Store the scrollview Y position in the bundle. - outState.putInt(SCROLLVIEW_POSITION, scrollViewYPositionInt) + // Store the scroll Y position in the bundle. + outState.putInt(SCROLL_Y, logcatWebView.scrollY) } - private fun getLogcat() { + private fun populateLogcat() { 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") @@ -252,8 +337,83 @@ class LogcatActivity : AppCompatActivity() { // Wrap the logcat in a buffered reader. val logcatBufferedReader = BufferedReader(InputStreamReader(getLogcatProcess.inputStream)) - // Display the logcat. - logcatTextView.text = logcatBufferedReader.readText() + // Reset the logcat plain text string. + logcatPlainTextStringBuilder = StringBuilder() + + // Create a logcat HTML string builder. + val logcatHtmlStringBuilder = StringBuilder() + + // Populate the initial HTML. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append("") + + // Respect dark mode. + logcatHtmlStringBuilder.append("") + + // Start the HTML body. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append("") + + // Create a logcat line string. + var logcatLineString: String? + + while (logcatBufferedReader.readLine().also { logcatLineString = it } != null) { + // Populate the logcat plain text string builder. + logcatPlainTextStringBuilder.append(logcatLineString) + + // Add a line break. + logcatPlainTextStringBuilder.append("\n") + + // Trim the string, which is necessary for correct detection of lines that start with `at`. + logcatLineString = logcatLineString!!.trim() + + // Apply syntax highlighting to the logcat. + if (logcatLineString!!.contains("crash") || logcatLineString!!.contains("Exception") ) { // Colorize crashes. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append(logcatLineString) + logcatHtmlStringBuilder.append("") + } else if (logcatLineString!!.startsWith("at") || logcatLineString!!.startsWith("Process:") || logcatLineString!!.contains("FATAL")) { // Colorize lines relating to crashes. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append(logcatLineString) + logcatHtmlStringBuilder.append("") + } else if (logcatLineString!!.startsWith("-")) { // Colorize the headers. + logcatHtmlStringBuilder.append("") + } else if (logcatLineString!!.startsWith("[ ")) { // Colorize the time stamps. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append(logcatLineString) + logcatHtmlStringBuilder.append("") + } else { // Display the standard lines. + logcatHtmlStringBuilder.append(logcatLineString) + } + + // Add a line break. + logcatHtmlStringBuilder.append("
") + } + + // Close the HTML. + logcatHtmlStringBuilder.append("") + logcatHtmlStringBuilder.append("") + + // Encode the logcat HTML. + val base64EncodedLogcatHtml: String = Base64.encodeToString(logcatHtmlStringBuilder.toString().toByteArray(Charsets.UTF_8), Base64.NO_PADDING) + + // Load the encoded logcat. + logcatWebView.loadData(base64EncodedLogcatHtml, "text/html", "base64") // Close the buffered reader. logcatBufferedReader.close() @@ -261,13 +421,37 @@ class LogcatActivity : AppCompatActivity() { // 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 view parameter cannot be removed because it is called from the layout onClick. + fun closeSearch(@Suppress("UNUSED_PARAMETER")view: View?) { + // Delete the contents of the search edit text. + searchEditText.text = null + + // Clear the highlighted phrases in the logcat WebView. + logcatWebView.clearMatches() + + // Hide the search linear layout. + searchLinearLayout.visibility = View.GONE + + // Show the toolbar. + toolbar.visibility = View.VISIBLE + + // Hide the keyboard. + inputMethodManager.hideSoftInputFromWindow(toolbar.windowToken, 0) + } + + // The view parameter cannot be removed because it is called from the layout onClick. + fun searchNext(@Suppress("UNUSED_PARAMETER")view: View?) { + // Go to the next highlighted phrase on the page. `true` goes forwards instead of backwards. + logcatWebView.findNext(true) + } + + // The view parameter cannot be removed because it is called from the layout onClick. + fun searchPrevious(@Suppress("UNUSED_PARAMETER")view: View?) { + // Go to the previous highlighted phrase on the page. `false` goes backwards instead of forwards. + logcatWebView.findNext(false) + } } diff --git a/app/src/main/java/com/stoutner/privacycell/activities/PrivacyCellActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/PrivacyCellActivity.kt index 1a23bae..f450d86 100644 --- a/app/src/main/java/com/stoutner/privacycell/activities/PrivacyCellActivity.kt +++ b/app/src/main/java/com/stoutner/privacycell/activities/PrivacyCellActivity.kt @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2021-2022 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 @@ -28,7 +28,6 @@ import android.app.ActivityManager import android.content.Context import android.content.Intent import android.content.pm.PackageManager -import android.net.Uri import android.os.Bundle import android.telephony.PhoneStateListener // This can be replaced by `TelephonyCallback` once the minimum API >= 31. import android.telephony.ServiceState @@ -46,6 +45,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.widget.Toolbar import androidx.core.app.ActivityCompat +import androidx.core.net.toUri import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.preference.PreferenceManager @@ -438,7 +438,7 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem val newsUrlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - newsUrlIntent.data = Uri.parse("https://www.stoutner.com/category/privacy-cell/") + newsUrlIntent.data = "https://www.stoutner.com/category/privacy-cell/".toUri() // Make it so. startActivity(newsUrlIntent) @@ -449,7 +449,7 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem val roadmapUrlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - roadmapUrlIntent.data = Uri.parse("https://www.stoutner.com/category/privacy-cell-roadmap/") + roadmapUrlIntent.data = "https://www.stoutner.com/category/privacy-cell-roadmap/".toUri() // Make it so. startActivity(roadmapUrlIntent) @@ -460,7 +460,7 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem val bugTrackerUrlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - bugTrackerUrlIntent.data = Uri.parse("https://redmine.stoutner.com/projects/privacy-cell/issues") + bugTrackerUrlIntent.data = "https://redmine.stoutner.com/projects/privacy-cell/issues".toUri() // Make it so. startActivity(bugTrackerUrlIntent) @@ -471,7 +471,7 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem val forumUrlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - forumUrlIntent.data = Uri.parse("https://redmine.stoutner.com/projects/privacy-cell/boards") + forumUrlIntent.data = "https://redmine.stoutner.com/projects/privacy-cell/boards".toUri() // Make it so. startActivity(forumUrlIntent) @@ -482,7 +482,7 @@ class PrivacyCellActivity : AppCompatActivity(), NavigationView.OnNavigationItem val donationsUrlIntent = Intent(Intent.ACTION_VIEW) // Add the URL to the intent. - donationsUrlIntent.data = Uri.parse("https://www.stoutner.com/donations/") + donationsUrlIntent.data = "https://www.stoutner.com/donations/".toUri() // Make it so. startActivity(donationsUrlIntent) diff --git a/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt index 6ebc9a8..c189c24 100644 --- a/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt +++ b/app/src/main/java/com/stoutner/privacycell/activities/ProtocolsActivity.kt @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2022 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 diff --git a/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt b/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt index cb8e549..3ead325 100644 --- a/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt +++ b/app/src/main/java/com/stoutner/privacycell/activities/SettingsActivity.kt @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2021-2022 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 diff --git a/app/src/main/java/com/stoutner/privacycell/adapters/ProtocolArrayAdapter.kt b/app/src/main/java/com/stoutner/privacycell/adapters/ProtocolArrayAdapter.kt index 54bfd65..d4261ef 100644 --- a/app/src/main/java/com/stoutner/privacycell/adapters/ProtocolArrayAdapter.kt +++ b/app/src/main/java/com/stoutner/privacycell/adapters/ProtocolArrayAdapter.kt @@ -1,20 +1,20 @@ -/* - * Copyright Â© 2021-2022 Soren Stoutner . +/* SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2021-2022 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * - * Privacy Cell 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. + * This program 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 Cell 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. + * This program 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 Cell. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ package com.stoutner.privacycell.adapters @@ -55,4 +55,4 @@ class ProtocolArrayAdapter(context: Context, protocolArrayList: ArrayList. The resulting image is released under the GPLv3+ license. - This file is derived from `security` and `do_not_disturb`, which are part of the Android Material icon set. They are released under the Apache License 2.0. + This file is derived from `security` and `do_not_disturb`, which are part of the Android Material icon set. They are released under the Apache License 2.0 . - This file is part of Privacy Cell . + This file is part of Privacy Cell . Privacy Cell is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/src/main/res/drawable/antiquated_3g_disabled.xml b/app/src/main/res/drawable/antiquated_3g_disabled.xml index 58361dd..06a731e 100644 --- a/app/src/main/res/drawable/antiquated_3g_disabled.xml +++ b/app/src/main/res/drawable/antiquated_3g_disabled.xml @@ -1,9 +1,9 @@ + + + + - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml new file mode 100644 index 0000000..02c4fed --- /dev/null +++ b/app/src/main/res/drawable/close.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/close_blue.xml b/app/src/main/res/drawable/close_blue.xml new file mode 100644 index 0000000..6cb599a --- /dev/null +++ b/app/src/main/res/drawable/close_blue.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/contributors.xml b/app/src/main/res/drawable/contributors.xml index a193537..ad50e21 100644 --- a/app/src/main/res/drawable/contributors.xml +++ b/app/src/main/res/drawable/contributors.xml @@ -1,4 +1,4 @@ - + + + + . The resulting image is released under the GPLv3+ license. - This file is derived from `security` and `warning_amber_rounded`, which are part of the Android Material icon set. They are released under the Apache License 2.0. + This file is derived from `security` and `warning_amber_rounded`, which are part of the Android Material icon set. They are released under the Apache License 2.0 . - This file is part of Privacy Cell . + This file is part of Privacy Cell . Privacy Cell is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/src/main/res/drawable/insecure_notification_disabled.xml b/app/src/main/res/drawable/insecure_notification_disabled.xml index 2e90c58..6c0c099 100644 --- a/app/src/main/res/drawable/insecure_notification_disabled.xml +++ b/app/src/main/res/drawable/insecure_notification_disabled.xml @@ -1,9 +1,9 @@ + + + . --> + + + + + diff --git a/app/src/main/res/drawable/notification_permission.xml b/app/src/main/res/drawable/notification_permission.xml index 24cb942..b792065 100644 --- a/app/src/main/res/drawable/notification_permission.xml +++ b/app/src/main/res/drawable/notification_permission.xml @@ -1,4 +1,4 @@ - + + + . --> + + + + + diff --git a/app/src/main/res/drawable/privacy_cell_foreground.xml b/app/src/main/res/drawable/privacy_cell_foreground.xml index 9f877bb..9e21da8 100644 --- a/app/src/main/res/drawable/privacy_cell_foreground.xml +++ b/app/src/main/res/drawable/privacy_cell_foreground.xml @@ -1,9 +1,9 @@ + + + + . --> + + + + + diff --git a/app/src/main/res/drawable/secure.xml b/app/src/main/res/drawable/secure.xml index 14972a5..5643da6 100644 --- a/app/src/main/res/drawable/secure.xml +++ b/app/src/main/res/drawable/secure.xml @@ -1,9 +1,9 @@ + - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/logcat_bottom_appbar.xml b/app/src/main/res/layout/logcat_bottom_appbar.xml index ab52c7a..41e210a 100644 --- a/app/src/main/res/layout/logcat_bottom_appbar.xml +++ b/app/src/main/res/layout/logcat_bottom_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -23,6 +23,7 @@ @@ -40,18 +41,10 @@ android:layout_width="match_parent" android:layout_weight="1" > - - - - + android:layout_width="match_parent" /> @@ -65,6 +58,79 @@ android:id="@+id/toolbar" android:layout_height="wrap_content" android:layout_width="match_parent" /> + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/logcat_top_appbar.xml b/app/src/main/res/layout/logcat_top_appbar.xml index ba31fb4..a8cf2c6 100644 --- a/app/src/main/res/layout/logcat_top_appbar.xml +++ b/app/src/main/res/layout/logcat_top_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -22,6 +22,8 @@ @@ -43,6 +45,79 @@ android:id="@+id/toolbar" android:layout_height="wrap_content" android:layout_width="match_parent" /> + + + + + + + + + + + + + + + + + + - - - - + android:layout_width="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/privacy_cell_bottom_appbar.xml b/app/src/main/res/layout/privacy_cell_bottom_appbar.xml index 064a632..e2fe4f1 100644 --- a/app/src/main/res/layout/privacy_cell_bottom_appbar.xml +++ b/app/src/main/res/layout/privacy_cell_bottom_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 @@ -181,17 +181,13 @@ - + + app:itemIconTint="@color/blue_icon" /> diff --git a/app/src/main/res/layout/privacy_cell_top_appbar.xml b/app/src/main/res/layout/privacy_cell_top_appbar.xml index 307f8f0..614c2e3 100644 --- a/app/src/main/res/layout/privacy_cell_top_appbar.xml +++ b/app/src/main/res/layout/privacy_cell_top_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/protocol_header_textview.xml b/app/src/main/res/layout/protocol_header_textview.xml index 4bd39ec..08b75ef 100644 --- a/app/src/main/res/layout/protocol_header_textview.xml +++ b/app/src/main/res/layout/protocol_header_textview.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2022 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/protocol_item_textview.xml b/app/src/main/res/layout/protocol_item_textview.xml index 3166add..69b8984 100644 --- a/app/src/main/res/layout/protocol_item_textview.xml +++ b/app/src/main/res/layout/protocol_item_textview.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2022 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/protocols_bottom_appbar.xml b/app/src/main/res/layout/protocols_bottom_appbar.xml index 7f30d51..5bd3b31 100644 --- a/app/src/main/res/layout/protocols_bottom_appbar.xml +++ b/app/src/main/res/layout/protocols_bottom_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/protocols_top_appbar.xml b/app/src/main/res/layout/protocols_top_appbar.xml index 0964cc6..6d1cda5 100644 --- a/app/src/main/res/layout/protocols_top_appbar.xml +++ b/app/src/main/res/layout/protocols_top_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/settings_bottom_appbar.xml b/app/src/main/res/layout/settings_bottom_appbar.xml index 0dd74c7..7e1b838 100644 --- a/app/src/main/res/layout/settings_bottom_appbar.xml +++ b/app/src/main/res/layout/settings_bottom_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/settings_top_appbar.xml b/app/src/main/res/layout/settings_top_appbar.xml index 6abd124..876fdd6 100644 --- a/app/src/main/res/layout/settings_top_appbar.xml +++ b/app/src/main/res/layout/settings_top_appbar.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2022, 2025 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/layout/webview_dialog.xml b/app/src/main/res/layout/webview_dialog.xml index e37ac41..a777595 100644 --- a/app/src/main/res/layout/webview_dialog.xml +++ b/app/src/main/res/layout/webview_dialog.xml @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: 2021-2022 Soren Stoutner - This file is part of Privacy Cell . + This file is part of Privacy Cell . This program 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 diff --git a/app/src/main/res/menu/logcat_options_menu.xml b/app/src/main/res/menu/logcat_options_menu.xml index 150ced2..5dd3a9d 100644 --- a/app/src/main/res/menu/logcat_options_menu.xml +++ b/app/src/main/res/menu/logcat_options_menu.xml @@ -1,27 +1,35 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + + \ No newline at end of file diff --git a/app/src/main/res/menu/navigation_menu_bottom_appbar.xml b/app/src/main/res/menu/navigation_menu_bottom_appbar.xml index a319bf1..cd09c58 100644 --- a/app/src/main/res/menu/navigation_menu_bottom_appbar.xml +++ b/app/src/main/res/menu/navigation_menu_bottom_appbar.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> @@ -145,6 +146,9 @@ + Suche + Vorheriges + NÃ¤chstes Kopieren Speichern LÃ¶schen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a839c1c..0c2ea21 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,24 +1,25 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> @@ -145,6 +146,9 @@ + Buscar + Anterior + Siguiente Copiar Guardar Limpiar diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1773a36..4876470 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,24 +1,25 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> @@ -145,6 +146,9 @@ + Rechercher + PrÃ©cÃ©dent + Suivant Copier Sauvegarder Nettoyer diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dc1dc29..6c70d09 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,24 +1,25 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> @@ -145,6 +146,9 @@ + Ricerca + Precedente + Successivo Copia Salva Cancella diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fab1a37..5e7ac58 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> @@ -142,6 +143,9 @@ + ÐÐ¾Ð¸ÑÐº + ÐÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¹ + Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ð¹ Ð¡ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐÑÐ¸ÑÑÐ¸ÑÑ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 609cde0..4a18d0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,22 +1,23 @@ + You should have received a copy of the GNU General Public License along with + this program. If not, see . --> + Search + 0/0 + Previous + Next Copy Save Clear diff --git a/build.gradle b/build.gradle index b2c93d4..081b389 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-FileCopyrightText: 2021-2025 Soren Stoutner * - * This file is part of Privacy Cell . + * This file is part of Privacy Cell . * * This program 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 @@ -25,8 +25,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.8.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21" + classpath 'com.android.tools.build:gradle:8.9.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index 582e979..6983486 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,21 @@ -# Copyright 2023-2024 Soren Stoutner . +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2023-2025 Soren Stoutner # -# This file is part of Privacy Cell . +# This file is part of Privacy Cell . # -# Privacy Cell 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. +# This program 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 Cell 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. +# This program 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 . +# You should have received a copy of the GNU General Public License along with +# this program. If not, see . + # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: @@ -46,5 +48,3 @@ android.nonTransitiveRClass=true # Use non-final resource IDs for faster incremental compilation. android.nonFinalResIds=true - -android.defaults.buildfeatures.buildconfig=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a5adda..c2db36c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,23 +1,23 @@ -# Copyright 2023 Soren Stoutner . +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2023, 2025 Soren Stoutner # -# This file is part of Privacy Cell . +# This file is part of Privacy Cell . # -# Privacy Cell 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. +# This program 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 Cell 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. +# This program 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 . +# You should have received a copy of the GNU General Public License along with +# this program. If not, see . -#Thu Aug 12 09:15:13 MST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME