fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed: Do not recreate TermuxActivity enabled in 6631599f when TermuxService starts a session

Browse Source 
Activity will only be recreated when `termux-reload-settings` is run or `night-mode` config does not equal current system mode when TermuxActivity is initially started. Running `termux-reload-settings` can cause some problems if some variable whose state should be maintained or reset is not being done so correctly, like termux session shortcuts weren't before 4fd48a5a. It requires further testing and any bugs should be reported.
This commit is contained in:
agnostic-apollo
2022-01-28 03:51:52 +05:00
parent 4fd48a5aed
commit 172a75e578
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/termux/app/TermuxActivity.java
View File

@@ -180,7 +180,6 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Logger.logDebug(LOG_TAG, "onCreate"); Logger.logDebug(LOG_TAG, "onCreate");
isOnResumeAfterOnCreate = true; isOnResumeAfterOnCreate = true;
@@ -846,9 +845,10 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
public static void updateTermuxActivityStyling(Context context) { public static void updateTermuxActivityStyling(Context context, boolean recreateActivity) {
// Make sure that terminal styling is always applied. // Make sure that terminal styling is always applied.
Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE); Intent stylingIntent = new Intent(TERMUX_ACTIVITY.ACTION_RELOAD_STYLE);
stylingIntent.putExtra(TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY, recreateActivity);
context.sendBroadcast(stylingIntent); context.sendBroadcast(stylingIntent);
} }
@@ -889,7 +889,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
return; return;
case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE: case TERMUX_ACTIVITY.ACTION_RELOAD_STYLE:
Logger.logDebug(LOG_TAG, "Received intent to reload styling"); Logger.logDebug(LOG_TAG, "Received intent to reload styling");
reloadActivityStyling(); reloadActivityStyling(intent.getBooleanExtra(TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY, true));
return; return;
default: default:
} }
@@ -897,7 +897,7 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
} }
} }
private void reloadActivityStyling() { private void reloadActivityStyling(boolean recreateActivity) {
if (mProperties != null) { if (mProperties != null) {
mProperties.loadTermuxPropertiesFromDisk(); mProperties.loadTermuxPropertiesFromDisk();
@@ -925,7 +925,10 @@ public final class TermuxActivity extends AppCompatActivity implements ServiceCo
// To change the activity and drawer theme, activity needs to be recreated. // To change the activity and drawer theme, activity needs to be recreated.
// It will destroy the activity, including all stored variables and views, and onCreate() // It will destroy the activity, including all stored variables and views, and onCreate()
// will be called again. Extra keys input text, terminal sessions and transcripts will be preserved. // will be called again. Extra keys input text, terminal sessions and transcripts will be preserved.
TermuxActivity.this.recreate(); if (recreateActivity) {
Logger.logDebug(LOG_TAG, "Recreating activity");
TermuxActivity.this.recreate();
}
} }

4
app/src/main/java/com/termux/app/TermuxService.java
View File

@@ -540,7 +540,9 @@ public final class TermuxService extends Service implements AppShell.AppShellCli
mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated(); mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
updateNotification(); updateNotification();
TermuxActivity.updateTermuxActivityStyling(this);
// No need to recreate the activity since it likely just started and theme should already have applied
TermuxActivity.updateTermuxActivityStyling(this, false);
return newTermuxSession; return newTermuxSession;
} }

8
termux-shared/src/main/java/com/termux/shared/termux/TermuxConstants.java
View File

@@ -8,7 +8,7 @@ import java.util.Formatter;
import java.util.List; import java.util.List;
/* /*
* Version: v0.34.0 * Version: v0.35.0
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
* Changelog * Changelog
@@ -214,6 +214,9 @@ import java.util.List;
* *
* - 0.34.0 (2021-10-26) * - 0.34.0 (2021-10-26)
* - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`. * - Move `RESULT_SENDER` to `com.termux.shared.shell.command.ShellCommandConstants`.
*
* - 0.35.0 (2022-01-28)
* - Add `TERMUX_APP.TERMUX_ACTIVITY.EXTRA_RECREATE_ACTIVITY`.
*/ */
/** /**
@@ -864,6 +867,9 @@ public final class TermuxConstants {
@Deprecated @Deprecated
public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style" public static final String EXTRA_RELOAD_STYLE = TermuxConstants.TERMUX_PACKAGE_NAME + ".app.reload_style"; // Default: "com.termux.app.reload_style"
/** Intent {@code boolean} extra for whether to recreate activity for the TERMUX_ACTIVITY.ACTION_RELOAD_STYLE intent. */
public static final String EXTRA_RECREATE_ACTIVITY = TERMUX_APP.TERMUX_ACTIVITY_NAME + ".EXTRA_RECREATE_ACTIVITY"; // Default: "com.termux.app.TermuxActivity.EXTRA_RECREATE_ACTIVITY"
} }