diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index 6ec5e9b3..b7ad1e40 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -38,8 +38,8 @@ import com.termux.app.activities.SettingsActivity; import com.termux.shared.settings.preferences.TermuxAppSharedPreferences; import com.termux.app.terminal.TermuxSessionsListViewController; import com.termux.app.terminal.io.TerminalToolbarViewPager; -import com.termux.app.terminal.TermuxSessionClient; -import com.termux.app.terminal.TermuxViewClient; +import com.termux.app.terminal.TermuxTerminalSessionClient; +import com.termux.app.terminal.TermuxTerminalViewClient; import com.termux.app.terminal.io.extrakeys.ExtraKeysView; import com.termux.app.settings.properties.TermuxAppSharedProperties; import com.termux.shared.interact.DialogUtils; @@ -86,13 +86,13 @@ public final class TermuxActivity extends Activity implements ServiceConnection * The {@link TerminalViewClient} interface implementation to allow for communication between * {@link TerminalView} and {@link TermuxActivity}. */ - TermuxViewClient mTermuxViewClient; + TermuxTerminalViewClient mTermuxTerminalViewClient; /** * The {@link TerminalSessionClient} interface implementation to allow for communication between * {@link TerminalSession} and {@link TermuxActivity}. */ - TermuxSessionClient mTermuxSessionClient; + TermuxTerminalSessionClient mTermuxTerminalSessionClient; /** * Termux app shared preferences manager. @@ -218,7 +218,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection // The service has connected, but data may have changed since we were last in the foreground. // Get the session stored in shared preferences stored by {@link #onStop} if its valid, // otherwise get the last session currently running. - mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast()); + mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast()); termuxSessionListNotifyUpdated(); } @@ -264,7 +264,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection if (bundle != null) { launchFailsafe = bundle.getBoolean(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false); } - mTermuxSessionClient.addNewSession(launchFailsafe, null); + mTermuxTerminalSessionClient.addNewSession(launchFailsafe, null); } catch (WindowManager.BadTokenException e) { // Activity finished - ignore. } @@ -278,14 +278,14 @@ public final class TermuxActivity extends Activity implements ServiceConnection if (i != null && Intent.ACTION_RUN.equals(i.getAction())) { // Android 7.1 app shortcut from res/xml/shortcuts.xml. boolean isFailSafe = i.getBooleanExtra(TERMUX_ACTIVITY.ACTION_FAILSAFE_SESSION, false); - mTermuxSessionClient.addNewSession(isFailSafe, null); + mTermuxTerminalSessionClient.addNewSession(isFailSafe, null); } else { - mTermuxSessionClient.setCurrentSession(mTermuxSessionClient.getCurrentStoredSessionOrLast()); + mTermuxTerminalSessionClient.setCurrentSession(mTermuxTerminalSessionClient.getCurrentStoredSessionOrLast()); } } // Update the {@link TerminalSession} and {@link TerminalEmulator} clients. - mTermuxService.setTermuxSessionClient(mTermuxSessionClient); + mTermuxService.setTermuxTerminalSessionClient(mTermuxTerminalSessionClient); } @Override @@ -307,7 +307,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection // Store current session in shared preferences so that it can be restored later in // {@link #onStart} if needed. - mTermuxSessionClient.setCurrentStoredSession(); + mTermuxTerminalSessionClient.setCurrentStoredSession(); unregisterReceiver(mTermuxActivityBroadcastReceiever); getDrawer().closeDrawers(); @@ -321,7 +321,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection if (mTermuxService != null) { // Do not leave service and session clients with references to activity. - mTermuxService.unsetTermuxSessionClient(); + mTermuxService.unsetTermuxTerminalSessionClient(); mTermuxService = null; } unbindService(this); @@ -406,11 +406,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection private void setNewSessionButtonView() { View newSessionButton = findViewById(R.id.new_session_button); - newSessionButton.setOnClickListener(v -> mTermuxSessionClient.addNewSession(false, null)); + newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null)); newSessionButton.setOnLongClickListener(v -> { DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null, - R.string.action_create_named_session_confirm, text -> mTermuxSessionClient.addNewSession(false, text), - R.string.action_new_session_failsafe, text -> mTermuxSessionClient.addNewSession(true, text), + R.string.action_create_named_session_confirm, text -> mTermuxTerminalSessionClient.addNewSession(false, text), + R.string.action_new_session_failsafe, text -> mTermuxTerminalSessionClient.addNewSession(true, text), -1, null, null); return true; }); @@ -447,12 +447,12 @@ public final class TermuxActivity extends Activity implements ServiceConnection private void setTermuxTerminalViewAndClients() { // Set termux terminal view and session clients - mTermuxSessionClient = new TermuxSessionClient(this); - mTermuxViewClient = new TermuxViewClient(this, mTermuxSessionClient); + mTermuxTerminalSessionClient = new TermuxTerminalSessionClient(this); + mTermuxTerminalViewClient = new TermuxTerminalViewClient(this, mTermuxTerminalSessionClient); // Set termux terminal view mTerminalView = findViewById(R.id.terminal_view); - mTerminalView.setTerminalViewClient(mTermuxViewClient); + mTerminalView.setTerminalViewClient(mTermuxTerminalViewClient); mTerminalView.setTextSize(mPreferences.getFontSize()); mTerminalView.setKeepScreenOn(mPreferences.getKeepScreenOn()); @@ -462,7 +462,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection mTerminalView.requestFocus(); - mTermuxSessionClient.checkForFontAndColors(); + mTermuxTerminalSessionClient.checkForFontAndColors(); } private void setTermuxSessionsListView() { @@ -543,10 +543,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection switch (item.getItemId()) { case CONTEXT_MENU_SELECT_URL_ID: - mTermuxViewClient.showUrlSelection(); + mTermuxTerminalViewClient.showUrlSelection(); return true; case CONTEXT_MENU_SHARE_TRANSCRIPT_ID: - mTermuxViewClient.shareSessionTranscript(); + mTermuxTerminalViewClient.shareSessionTranscript(); return true; case CONTEXT_MENU_AUTOFILL_ID: requestAutoFill(); @@ -570,7 +570,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection startActivity(new Intent(this, SettingsActivity.class)); return true; case CONTEXT_MENU_REPORT_ID: - mTermuxViewClient.reportIssueFromTranscript(); + mTermuxTerminalViewClient.reportIssueFromTranscript(); return true; default: return super.onContextItemSelected(item); @@ -690,8 +690,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection return mTerminalView; } - public TermuxSessionClient getTermuxSessionClient() { - return mTermuxSessionClient; + public TermuxTerminalSessionClient getTermuxTerminalSessionClient() { + return mTermuxTerminalSessionClient; } @Nullable @@ -732,8 +732,8 @@ public final class TermuxActivity extends Activity implements ServiceConnection return; } - if(mTermuxSessionClient!= null) { - mTermuxSessionClient.checkForFontAndColors(); + if(mTermuxTerminalSessionClient != null) { + mTermuxTerminalSessionClient.checkForFontAndColors(); } if(mProperties!= null) { diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java index ab02156c..26e89309 100644 --- a/app/src/main/java/com/termux/app/TermuxService.java +++ b/app/src/main/java/com/termux/app/TermuxService.java @@ -20,14 +20,14 @@ import android.provider.Settings; import android.widget.ArrayAdapter; import com.termux.R; -import com.termux.app.terminal.TermuxSessionClient; +import com.termux.app.terminal.TermuxTerminalSessionClient; import com.termux.app.utils.PluginUtils; import com.termux.shared.termux.TermuxConstants; import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY; import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE; import com.termux.shared.settings.preferences.TermuxAppSharedPreferences; import com.termux.shared.shell.TermuxSession; -import com.termux.shared.shell.TermuxSessionClientBase; +import com.termux.shared.shell.TermuxTerminalSessionClientBase; import com.termux.shared.logger.Logger; import com.termux.shared.notification.NotificationUtils; import com.termux.shared.packages.PermissionUtils; @@ -92,12 +92,12 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas * that holds activity references for activity related functions. * Note that the service may often outlive the activity, so need to clear this reference. */ - com.termux.app.terminal.TermuxSessionClient mTermuxSessionClient; + TermuxTerminalSessionClient mTermuxTerminalSessionClient; /** The basic implementation of the {@link TerminalSessionClient} interface to be used by {@link TerminalSession} * that does not hold activity references. */ - final TermuxSessionClientBase mTermuxSessionClientBase = new TermuxSessionClientBase(); + final TermuxTerminalSessionClientBase mTermuxTerminalSessionClientBase = new TermuxTerminalSessionClientBase(); /** The wake lock and wifi lock are always acquired and released together. */ private PowerManager.WakeLock mWakeLock; @@ -178,8 +178,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas // Since we cannot rely on {@link TermuxActivity.onDestroy()} to always complete, // we unset clients here as well if it failed, so that we do not leave service and session // clients with references to the activity. - if (mTermuxSessionClient != null) - unsetTermuxSessionClient(); + if (mTermuxTerminalSessionClient != null) + unsetTermuxTerminalSessionClient(); return false; } @@ -476,7 +476,7 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas /** * Create a {@link TermuxSession}. - * Currently called by {@link TermuxSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}. + * Currently called by {@link TermuxTerminalSessionClient#addNewSession(boolean, String)} to add a new {@link TermuxSession}. */ @Nullable public TermuxSession createTermuxSession(String executablePath, String[] arguments, String workingDirectory, boolean isFailSafe, String sessionName) { @@ -501,7 +501,7 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas // If the execution command was started for a plugin, only then will the stdout be set // Otherwise if command was manually started by the user like by adding a new terminal session, // then no need to set stdout - TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxSessionClient(), this, sessionName, executionCommand.isPluginExecutionCommand); + TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand, getTermuxTerminalSessionClient(), this, sessionName, executionCommand.isPluginExecutionCommand); if (newTermuxSession == null) { Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString()); return null; @@ -516,8 +516,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if // activity in is foreground - if (mTermuxSessionClient != null) - mTermuxSessionClient.termuxSessionListNotifyUpdated(); + if (mTermuxTerminalSessionClient != null) + mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated(); updateNotification(); TermuxActivity.updateTermuxActivityStyling(this); @@ -551,8 +551,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if // activity in is foreground - if (mTermuxSessionClient != null) - mTermuxSessionClient.termuxSessionListNotifyUpdated(); + if (mTermuxTerminalSessionClient != null) + mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated(); } updateNotification(); @@ -569,8 +569,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas switch (sessionAction) { case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_OPEN_ACTIVITY: setCurrentStoredTerminalSession(newTerminalSession); - if (mTermuxSessionClient != null) - mTermuxSessionClient.setCurrentSession(newTerminalSession); + if (mTermuxTerminalSessionClient != null) + mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession); startTermuxActivity(); break; case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_OPEN_ACTIVITY: @@ -580,8 +580,8 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas break; case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_SWITCH_TO_NEW_SESSION_AND_DONT_OPEN_ACTIVITY: setCurrentStoredTerminalSession(newTerminalSession); - if (mTermuxSessionClient != null) - mTermuxSessionClient.setCurrentSession(newTerminalSession); + if (mTermuxTerminalSessionClient != null) + mTermuxTerminalSessionClient.setCurrentSession(newTerminalSession); break; case TERMUX_SERVICE.VALUE_EXTRA_SESSION_ACTION_KEEP_CURRENT_SESSION_AND_DONT_OPEN_ACTIVITY: if (getTermuxSessionsSize() == 1) @@ -610,46 +610,46 @@ public final class TermuxService extends Service implements TermuxTask.TermuxTas /** If {@link TermuxActivity} has not bound to the {@link TermuxService} yet or is destroyed, then * interface functions requiring the activity should not be available to the terminal sessions, - * so we just return the {@link #mTermuxSessionClientBase}. Once {@link TermuxActivity} bind - * callback is received, it should call {@link #setTermuxSessionClient} to set the - * {@link TermuxService#mTermuxSessionClient} so that further terminal sessions are directly - * passed the {@link TermuxSessionClient} object which fully implements the + * so we just return the {@link #mTermuxTerminalSessionClientBase}. Once {@link TermuxActivity} bind + * callback is received, it should call {@link #setTermuxTerminalSessionClient} to set the + * {@link TermuxService#mTermuxTerminalSessionClient} so that further terminal sessions are directly + * passed the {@link TermuxTerminalSessionClient} object which fully implements the * {@link TerminalSessionClient} interface. * - * @return Returns the {@link TermuxSessionClient} if {@link TermuxActivity} has bound with - * {@link TermuxService}, otherwise {@link TermuxSessionClientBase}. + * @return Returns the {@link TermuxTerminalSessionClient} if {@link TermuxActivity} has bound with + * {@link TermuxService}, otherwise {@link TermuxTerminalSessionClientBase}. */ - public synchronized TermuxSessionClientBase getTermuxSessionClient() { - if (mTermuxSessionClient != null) - return mTermuxSessionClient; + public synchronized TermuxTerminalSessionClientBase getTermuxTerminalSessionClient() { + if (mTermuxTerminalSessionClient != null) + return mTermuxTerminalSessionClient; else - return mTermuxSessionClientBase; + return mTermuxTerminalSessionClientBase; } /** This should be called when {@link TermuxActivity#onServiceConnected} is called to set the - * {@link TermuxService#mTermuxSessionClient} variable and update the {@link TerminalSession} - * and {@link TerminalEmulator} clients in case they were passed {@link TermuxSessionClientBase} + * {@link TermuxService#mTermuxTerminalSessionClient} variable and update the {@link TerminalSession} + * and {@link TerminalEmulator} clients in case they were passed {@link TermuxTerminalSessionClientBase} * earlier. * - * @param termuxSessionClient The {@link TermuxSessionClient} object that fully + * @param termuxTerminalSessionClient The {@link TermuxTerminalSessionClient} object that fully * implements the {@link TerminalSessionClient} interface. */ - public synchronized void setTermuxSessionClient(TermuxSessionClient termuxSessionClient) { - mTermuxSessionClient = termuxSessionClient; + public synchronized void setTermuxTerminalSessionClient(TermuxTerminalSessionClient termuxTerminalSessionClient) { + mTermuxTerminalSessionClient = termuxTerminalSessionClient; for (int i = 0; i < mTermuxSessions.size(); i++) - mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClient); + mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClient); } /** This should be called when {@link TermuxActivity} has been destroyed and in {@link #onUnbind(Intent)} * so that the {@link TermuxService} and {@link TerminalSession} and {@link TerminalEmulator} * clients do not hold an activity references. */ - public synchronized void unsetTermuxSessionClient() { + public synchronized void unsetTermuxTerminalSessionClient() { for (int i = 0; i < mTermuxSessions.size(); i++) - mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxSessionClientBase); + mTermuxSessions.get(i).getTerminalSession().updateTerminalSessionClient(mTermuxTerminalSessionClientBase); - mTermuxSessionClient = null; + mTermuxTerminalSessionClient = null; } diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java index a87780ec..76c79309 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java @@ -93,14 +93,14 @@ public class TermuxSessionsListViewController extends ArrayAdapter parent, View view, int position, long id) { TermuxSession clickedSession = getItem(position); - mActivity.getTermuxSessionClient().setCurrentSession(clickedSession.getTerminalSession()); + mActivity.getTermuxTerminalSessionClient().setCurrentSession(clickedSession.getTerminalSession()); mActivity.getDrawer().closeDrawers(); } @Override public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { final TermuxSession selectedSession = getItem(position); - mActivity.getTermuxSessionClient().renameSession(selectedSession.getTerminalSession()); + mActivity.getTermuxTerminalSessionClient().renameSession(selectedSession.getTerminalSession()); return true; } diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java similarity index 97% rename from app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java rename to app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java index ec4020b2..13d5934e 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxSessionClient.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java @@ -16,7 +16,7 @@ import com.termux.R; import com.termux.shared.shell.TermuxSession; import com.termux.shared.interact.DialogUtils; import com.termux.app.TermuxActivity; -import com.termux.shared.shell.TermuxSessionClientBase; +import com.termux.shared.shell.TermuxTerminalSessionClientBase; import com.termux.shared.termux.TermuxConstants; import com.termux.app.TermuxService; import com.termux.shared.settings.properties.TermuxPropertyConstants; @@ -31,7 +31,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.Properties; -public class TermuxSessionClient extends TermuxSessionClientBase { +public class TermuxTerminalSessionClient extends TermuxTerminalSessionClientBase { private final TermuxActivity mActivity; @@ -43,9 +43,9 @@ public class TermuxSessionClient extends TermuxSessionClientBase { private final int mBellSoundId; - private static final String LOG_TAG = "TermuxSessionClient"; + private static final String LOG_TAG = "TermuxTerminalSessionClient"; - public TermuxSessionClient(TermuxActivity activity) { + public TermuxTerminalSessionClient(TermuxActivity activity) { this.mActivity = activity; mBellSoundId = mBellSoundPool.load(activity, R.raw.bell, 1); diff --git a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java similarity index 93% rename from app/src/main/java/com/termux/app/terminal/TermuxViewClient.java rename to app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java index 7c19aa78..b0e5bf6a 100644 --- a/app/src/main/java/com/termux/app/terminal/TermuxViewClient.java +++ b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java @@ -44,18 +44,18 @@ import java.util.List; import androidx.drawerlayout.widget.DrawerLayout; -public class TermuxViewClient implements TerminalViewClient { +public class TermuxTerminalViewClient implements TerminalViewClient { final TermuxActivity mActivity; - final TermuxSessionClient mTermuxSessionClient; + final TermuxTerminalSessionClient mTermuxTerminalSessionClient; /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */ boolean mVirtualControlKeyDown, mVirtualFnKeyDown; - public TermuxViewClient(TermuxActivity activity, TermuxSessionClient termuxSessionClient) { + public TermuxTerminalViewClient(TermuxActivity activity, TermuxTerminalSessionClient termuxTerminalSessionClient) { this.mActivity = activity; - this.mTermuxSessionClient = termuxSessionClient; + this.mTermuxTerminalSessionClient = termuxTerminalSessionClient; } @Override @@ -107,16 +107,16 @@ public class TermuxViewClient implements TerminalViewClient { if (handleVirtualKeys(keyCode, e, true)) return true; if (keyCode == KeyEvent.KEYCODE_ENTER && !currentSession.isRunning()) { - mTermuxSessionClient.removeFinishedSession(currentSession); + mTermuxTerminalSessionClient.removeFinishedSession(currentSession); return true; } else if (e.isCtrlPressed() && e.isAltPressed()) { // Get the unmodified code point: int unicodeChar = e.getUnicodeChar(0); if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN || unicodeChar == 'n'/* next */) { - mTermuxSessionClient.switchToSession(true); + mTermuxTerminalSessionClient.switchToSession(true); } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP || unicodeChar == 'p' /* previous */) { - mTermuxSessionClient.switchToSession(false); + mTermuxTerminalSessionClient.switchToSession(false); } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) { mActivity.getDrawer().openDrawer(Gravity.LEFT); } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) { @@ -127,9 +127,9 @@ public class TermuxViewClient implements TerminalViewClient { } else if (unicodeChar == 'm'/* menu */) { mActivity.getTerminalView().showContextMenu(); } else if (unicodeChar == 'r'/* rename */) { - mTermuxSessionClient.renameSession(currentSession); + mTermuxTerminalSessionClient.renameSession(currentSession); } else if (unicodeChar == 'c'/* create */) { - mTermuxSessionClient.addNewSession(false, null); + mTermuxTerminalSessionClient.addNewSession(false, null); } else if (unicodeChar == 'u' /* urls */) { showUrlSelection(); } else if (unicodeChar == 'v') { @@ -142,7 +142,7 @@ public class TermuxViewClient implements TerminalViewClient { changeFontSize(false); } else if (unicodeChar >= '1' && unicodeChar <= '9') { int index = unicodeChar - '1'; - mTermuxSessionClient.switchToSession(index); + mTermuxTerminalSessionClient.switchToSession(index); } return true; } @@ -297,7 +297,7 @@ public class TermuxViewClient implements TerminalViewClient { return true; } else if (ctrlDown) { if (codePoint == 106 /* Ctrl+j or \n */ && !session.isRunning()) { - mTermuxSessionClient.removeFinishedSession(session); + mTermuxTerminalSessionClient.removeFinishedSession(session); return true; } @@ -309,16 +309,16 @@ public class TermuxViewClient implements TerminalViewClient { if (codePointLowerCase == shortcut.codePoint) { switch (shortcut.shortcutAction) { case TermuxPropertyConstants.ACTION_SHORTCUT_CREATE_SESSION: - mTermuxSessionClient.addNewSession(false, null); + mTermuxTerminalSessionClient.addNewSession(false, null); return true; case TermuxPropertyConstants.ACTION_SHORTCUT_NEXT_SESSION: - mTermuxSessionClient.switchToSession(true); + mTermuxTerminalSessionClient.switchToSession(true); return true; case TermuxPropertyConstants.ACTION_SHORTCUT_PREVIOUS_SESSION: - mTermuxSessionClient.switchToSession(false); + mTermuxTerminalSessionClient.switchToSession(false); return true; case TermuxPropertyConstants.ACTION_SHORTCUT_RENAME_SESSION: - mTermuxSessionClient.renameSession(mActivity.getCurrentSession()); + mTermuxTerminalSessionClient.renameSession(mActivity.getCurrentSession()); return true; } } diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java index dd194d8c..06bdfe19 100644 --- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java +++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java @@ -69,7 +69,7 @@ public class TerminalToolbarViewPager { if (textToSend.length() == 0) textToSend = "\r"; session.write(textToSend); } else { - mActivity.getTermuxSessionClient().removeFinishedSession(session); + mActivity.getTermuxTerminalSessionClient().removeFinishedSession(session); } editText.setText(""); } diff --git a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java similarity index 92% rename from termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java rename to termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java index 194c8aab..ac5014c9 100644 --- a/termux-shared/src/main/java/com/termux/shared/shell/TermuxSessionClientBase.java +++ b/termux-shared/src/main/java/com/termux/shared/shell/TermuxTerminalSessionClientBase.java @@ -4,9 +4,9 @@ import com.termux.shared.logger.Logger; import com.termux.terminal.TerminalSession; import com.termux.terminal.TerminalSessionClient; -public class TermuxSessionClientBase implements TerminalSessionClient { +public class TermuxTerminalSessionClientBase implements TerminalSessionClient { - public TermuxSessionClientBase() { + public TermuxTerminalSessionClientBase() { } @Override