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

Added TERMUX_SERVICE#ACTION_SERVICE_EXECUTE Intent Logging

Browse Source
This commit is contained in:
agnostic-apollo
2021-03-19 18:42:12 +05:00
parent b4995ef9a7
commit 5d6a98452a
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.PowerManager; import android.os.PowerManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import com.termux.R; import com.termux.R;
@@ -27,6 +28,7 @@ import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
import com.termux.app.terminal.TermuxSessionClient; import com.termux.app.terminal.TermuxSessionClient;
import com.termux.app.terminal.TermuxSessionClientBase; import com.termux.app.terminal.TermuxSessionClientBase;
import com.termux.app.utils.Logger; import com.termux.app.utils.Logger;
import com.termux.app.utils.PluginUtils;
import com.termux.app.utils.TextDataUtils; import com.termux.app.utils.TextDataUtils;
import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalEmulator;
import com.termux.terminal.TerminalSession; import com.termux.terminal.TerminalSession;
@@ -34,6 +36,8 @@ import com.termux.terminal.TerminalSessionClient;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
@@ -291,7 +295,15 @@ public final class TermuxService extends Service {
private void executeBackgroundCommand(String executablePath, String[] arguments, String cwd, PendingIntent pendingIntent) { private void executeBackgroundCommand(String executablePath, String[] arguments, String cwd, PendingIntent pendingIntent) {
Logger.logDebug(LOG_TAG, "Starting background command"); Logger.logDebug(LOG_TAG, "Starting background command");
final String pendingIntentCreator;
if(pendingIntent != null) pendingIntentCreator = pendingIntent.getCreatorPackage(); else pendingIntentCreator = null;
PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, true, new HashMap<String, Object>() {{
put("pendingIntentCreator", pendingIntentCreator);
}});
BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, pendingIntent); BackgroundJob task = new BackgroundJob(cwd, executablePath, arguments, this, pendingIntent);
mBackgroundTasks.add(task); mBackgroundTasks.add(task);
updateNotification(); updateNotification();
} }
@@ -309,6 +321,12 @@ public final class TermuxService extends Service {
Logger.logDebug(LOG_TAG, "Starting foreground command"); Logger.logDebug(LOG_TAG, "Starting foreground command");
boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false); boolean failsafe = intent.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false);
PluginUtils.dumpExecutionIntentToLog(Log.DEBUG, LOG_TAG, null, executablePath, Arrays.asList(arguments), cwd, false, new HashMap<String, Object>() {{
put("sessionAction", sessionAction);
put("failsafe", failsafe);
}});
TerminalSession newSession = createTerminalSession(executablePath, arguments, cwd, failsafe); TerminalSession newSession = createTerminalSession(executablePath, arguments, cwd, failsafe);
// Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh". // Transform executable path to session name, e.g. "/bin/do-something.sh" => "do something.sh".