Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

ErrorActivity: Use better variable names and encapsulation

Browse source 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta 2026-02-11 18:39:34 +08:00
parent 043e3b21c5
commit 4c8c110995
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/java/org/schabi/newpipe/error/ErrorActivity.kt
View file

@ -34,7 +34,7 @@ class ErrorActivity : AppCompatActivity() {
private lateinit var errorInfo: ErrorInfo private lateinit var errorInfo: ErrorInfo
private lateinit var currentTimeStamp: String private lateinit var currentTimeStamp: String
private lateinit var activityErrorBinding: ActivityErrorBinding private lateinit var binding: ActivityErrorBinding
private val contentCountryString: String private val contentCountryString: String
get() = Localization.getPreferredContentCountry(this).countryCode get() = Localization.getPreferredContentCountry(this).countryCode
@ -69,10 +69,10 @@ class ErrorActivity : AppCompatActivity() {
ThemeHelper.setDayNightMode(this) ThemeHelper.setDayNightMode(this)
ThemeHelper.setTheme(this) ThemeHelper.setTheme(this)
activityErrorBinding = ActivityErrorBinding.inflate(layoutInflater) binding = ActivityErrorBinding.inflate(layoutInflater)
setContentView(activityErrorBinding.getRoot()) setContentView(binding.getRoot())
setSupportActionBar(activityErrorBinding.toolbarLayout.toolbar) setSupportActionBar(binding.toolbarLayout.toolbar)
supportActionBar?.apply { supportActionBar?.apply {
setDisplayHomeAsUpEnabled(true) setDisplayHomeAsUpEnabled(true)
setTitle(R.string.error_report_title) setTitle(R.string.error_report_title)
@ -86,22 +86,22 @@ class ErrorActivity : AppCompatActivity() {
// print current time, as zoned ISO8601 timestamp // print current time, as zoned ISO8601 timestamp
currentTimeStamp = ZonedDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME) currentTimeStamp = ZonedDateTime.now().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
activityErrorBinding.errorReportEmailButton.setOnClickListener { _ -> binding.errorReportEmailButton.setOnClickListener { _ ->
openPrivacyPolicyDialog(this, "EMAIL") openPrivacyPolicyDialog(this, "EMAIL")
} }
activityErrorBinding.errorReportCopyButton.setOnClickListener { _ -> binding.errorReportCopyButton.setOnClickListener { _ ->
ShareUtils.copyToClipboard(this, buildMarkdown()) ShareUtils.copyToClipboard(this, buildMarkdown())
} }
activityErrorBinding.errorReportGitHubButton.setOnClickListener { _ -> binding.errorReportGitHubButton.setOnClickListener { _ ->
openPrivacyPolicyDialog(this, "GITHUB") openPrivacyPolicyDialog(this, "GITHUB")
} }
// normal bugreport // normal bugreport
buildInfo(errorInfo) buildInfo(errorInfo)
activityErrorBinding.errorMessageView.text = errorInfo.getMessage(this) binding.errorMessageView.text = errorInfo.getMessage(this)
activityErrorBinding.errorView.text = formErrorText(errorInfo.stackTraces) binding.errorView.text = formErrorText(errorInfo.stackTraces)
// print stack trace once again for debugging: // print stack trace once again for debugging:
errorInfo.stackTraces.forEach { Log.e(TAG, it) } errorInfo.stackTraces.forEach { Log.e(TAG, it) }
@ -143,12 +143,12 @@ class ErrorActivity : AppCompatActivity() {
} }
.setPositiveButton(R.string.accept) { _, _ -> .setPositiveButton(R.string.accept) { _, _ ->
if (action == "EMAIL") { // send on email if (action == "EMAIL") { // send on email
val i = Intent(Intent.ACTION_SENDTO) val intent = Intent(Intent.ACTION_SENDTO)
.setData("mailto:".toUri()) // only email apps should handle this .setData("mailto:".toUri()) // only email apps should handle this
.putExtra(Intent.EXTRA_EMAIL, arrayOf(ERROR_EMAIL_ADDRESS)) .putExtra(Intent.EXTRA_EMAIL, arrayOf(ERROR_EMAIL_ADDRESS))
.putExtra(Intent.EXTRA_SUBJECT, errorEmailSubject) .putExtra(Intent.EXTRA_SUBJECT, errorEmailSubject)
.putExtra(Intent.EXTRA_TEXT, buildJson()) .putExtra(Intent.EXTRA_TEXT, buildJson())
ShareUtils.openIntentInApp(context, i) ShareUtils.openIntentInApp(context, intent)
} else if (action == "GITHUB") { // open the NewPipe issue page on GitHub } else if (action == "GITHUB") { // open the NewPipe issue page on GitHub
ShareUtils.openUrlInApp(this, ERROR_GITHUB_ISSUE_URL) ShareUtils.openUrlInApp(this, ERROR_GITHUB_ISSUE_URL)
} }
@ -157,13 +157,13 @@ class ErrorActivity : AppCompatActivity() {
.show() .show()
} }
private fun formErrorText(el: Array<String>): String { private fun formErrorText(stacktrace: Array<String>): String {
val separator = "-------------------------------------" val separator = "-------------------------------------"
return el.joinToString(separator + "\n", separator + "\n", separator) return stacktrace.joinToString(separator + "\n", separator + "\n", separator)
} }
private fun buildInfo(info: ErrorInfo) { private fun buildInfo(info: ErrorInfo) {
activityErrorBinding.errorInfoLabelsView.text = getString(R.string.info_labels) binding.errorInfoLabelsView.text = getString(R.string.info_labels)
.replace("\\n", "\n") .replace("\\n", "\n")
val text = info.userAction.message + "\n" + val text = info.userAction.message + "\n" +
@ -177,7 +177,7 @@ class ErrorActivity : AppCompatActivity() {
BuildConfig.VERSION_NAME + "\n" + BuildConfig.VERSION_NAME + "\n" +
osString osString
activityErrorBinding.errorInfosView.text = text binding.errorInfosView.text = text
} }
private fun buildJson(): String { private fun buildJson(): String {
@ -195,7 +195,7 @@ class ErrorActivity : AppCompatActivity() {
.value("os", osString) .value("os", osString)
.value("time", currentTimeStamp) .value("time", currentTimeStamp)
.array("exceptions", errorInfo.stackTraces.toList()) .array("exceptions", errorInfo.stackTraces.toList())
.value("user_comment", activityErrorBinding.errorCommentBox.getText().toString()) .value("user_comment", binding.errorCommentBox.getText().toString())
.end() .end()
.done() .done()
} catch (error: Throwable) { } catch (error: Throwable) {
@ -208,7 +208,7 @@ class ErrorActivity : AppCompatActivity() {
private fun buildMarkdown(): String { private fun buildMarkdown(): String {
try { try {
return buildString(1024) { return buildString(1024) {
val userComment = activityErrorBinding.errorCommentBox.getText().toString() val userComment = binding.errorCommentBox.getText().toString()
if (!userComment.isEmpty()) { if (!userComment.isEmpty()) {
appendLine(userComment) appendLine(userComment)
} }
@ -261,21 +261,21 @@ class ErrorActivity : AppCompatActivity() {
private fun addGuruMeditation() { private fun addGuruMeditation() {
// just an easter egg // just an easter egg
var text = activityErrorBinding.errorSorryView.getText().toString() var text = binding.errorSorryView.text.toString()
text += "\n" + getString(R.string.guru_meditation) text += "\n" + getString(R.string.guru_meditation)
activityErrorBinding.errorSorryView.text = text binding.errorSorryView.text = text
} }
companion object { companion object {
// LOG TAGS // LOG TAGS
val TAG: String = ErrorActivity::class.java.toString() private val TAG = ErrorActivity::class.java.toString()
// BUNDLE TAGS // BUNDLE TAGS
const val ERROR_INFO: String = "error_info" const val ERROR_INFO = "error_info"
const val ERROR_EMAIL_ADDRESS: String = "crashreport@newpipe.schabi.org" private const val ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org"
const val ERROR_EMAIL_SUBJECT: String = "Exception in " private const val ERROR_EMAIL_SUBJECT = "Exception in "
const val ERROR_GITHUB_ISSUE_URL: String = "https://github.com/TeamNewPipe/NewPipe/issues" private const val ERROR_GITHUB_ISSUE_URL = "https://github.com/TeamNewPipe/NewPipe/issues"
} }
} }