Generate potentially long running reports in background threads inste…

…ad of main UI thread
termux · May 14, 2021 · 2f82825 · 2f82825
1 parent 339b2a2
commit 2f82825
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -69,19 +69,24 @@ private void configureAboutPreference(@NonNull Context context) {
  Preference aboutPreference = findPreference("about");
  if (aboutPreference != null) {
  aboutPreference.setOnPreferenceClickListener(preference -> {
- String title = "About";
+ new Thread() {
+ @Override
+ public void run() {
+ String title = "About";
 
- StringBuilder aboutString = new StringBuilder();
- aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, false));
+  StringBuilder aboutString = new StringBuilder();
+  aboutString.append(TermuxUtils.getAppInfoMarkdownString(context, false));
 
- String termuxPluginAppsInfo = TermuxUtils.getTermuxPluginAppsInfoMarkdownString(context);
- if (termuxPluginAppsInfo != null)
- aboutString.append("\n\n").append(termuxPluginAppsInfo);
+  String termuxPluginAppsInfo = TermuxUtils.getTermuxPluginAppsInfoMarkdownString(context);
+  if (termuxPluginAppsInfo != null)
+  aboutString.append("\n\n").append(termuxPluginAppsInfo);
 
- aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
- aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
+  aboutString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(context));
+  aboutString.append("\n\n").append(TermuxUtils.getImportantLinksMarkdownString(context));
 
- ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+ ReportActivity.startReportActivity(context, new ReportInfo(UserAction.ABOUT, TermuxConstants.TERMUX_APP.TERMUX_SETTINGS_ACTIVITY_NAME, title, null, aboutString.toString(), null, false));
+ }
+ }.start();
 
  return true;
  });

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -494,26 +494,34 @@ public void reportIssueFromTranscript() {
  TerminalSession session = mActivity.getCurrentSession();
  if (session == null) return;
 
- String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
+ final String transcriptText = ShellUtils.getTerminalSessionTranscriptText(session, false, true);
  if (transcriptText == null) return;
 
- transcriptText = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
+ Logger.showToast(mActivity, mActivity.getString(R.string.msg_generating_report), true);
+
+ new Thread() {
+ @Override
+ public void run() {
 
- StringBuilder reportString = new StringBuilder();
+  String transcriptTextTruncated = DataUtils.getTruncatedCommandOutput(transcriptText, DataUtils.TRANSACTION_SIZE_LIMIT_IN_BYTES, false, true, false).trim();
 
- String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
+  StringBuilder reportString = new StringBuilder();
 
- reportString.append("## Transcript\n");
- reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptText, true));
+ String title = TermuxConstants.TERMUX_APP_NAME + " Report Issue";
 
- reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
- reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
+  reportString.append("## Transcript\n");
+  reportString.append("\n").append(MarkdownUtils.getMarkdownCodeForString(transcriptTextTruncated, true));
 
- String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
- if (termuxAptInfo != null)
- reportString.append("\n\n").append(termuxAptInfo);
+ reportString.append("\n\n").append(TermuxUtils.getAppInfoMarkdownString(mActivity, true));
+ reportString.append("\n\n").append(TermuxUtils.getDeviceInfoMarkdownString(mActivity));
 
- ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT, TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false));
+ String termuxAptInfo = TermuxUtils.geAPTInfoMarkdownString(mActivity);
+ if (termuxAptInfo != null)
+ reportString.append("\n\n").append(termuxAptInfo);
+
+ ReportActivity.startReportActivity(mActivity, new ReportInfo(UserAction.REPORT_ISSUE_FROM_TRANSCRIPT, TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY_NAME, title, null, reportString.toString(), "\n\n" + TermuxUtils.getReportIssueMarkdownString(mActivity), false));
+ }
+ }.start();
  }
 
  public void doPaste() {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -66,7 +66,7 @@
  <string name="action_autofill_password">Autofill password</string>
 
  <string name="action_reset_terminal">Reset</string>
- <string name="msg_terminal_reset">Terminal reset.</string>
+ <string name="msg_terminal_reset">Terminal reset</string>
 
  <string name="action_kill_process">Kill process (%d)</string>
  <string name="title_confirm_kill_process">Really kill this session?</string>
@@ -75,7 +75,9 @@
  <string name="action_toggle_keep_screen_on">Keep screen on</string>
  <string name="action_open_help">Help</string>
  <string name="action_open_settings">Settings</string>
+
  <string name="action_report_issue">Report Issue</string>
+ <string name="msg_generating_report">Generating Report</string>
 
  <string name="error_styling_not_installed">The &TERMUX_STYLING_APP_NAME; Plugin App is not installed.</string>
  <string name="action_styling_install">Install</string>