termux · rubinstory · May 12, 2022 · May 15, 2022 · May 15, 2022 · May 15, 2022
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Termux application
 
+Git Test for Jeon SeungYoon
+
 [![Build status](https://github.com/termux/termux-app/workflows/Build/badge.svg)](https://github.com/termux/termux-app/actions)
 [![Testing status](https://github.com/termux/termux-app/workflows/Unit%20tests/badge.svg)](https://github.com/termux/termux-app/actions)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)

diff --git a/app/src/main/java/com/termux/app/RunCommandService.java b/app/src/main/java/com/termux/app/RunCommandService.java
diff --git a/app/src/main/java/com/termux/app/TermuxInstaller.java b/app/src/main/java/com/termux/app/TermuxInstaller.java
@@ -96,7 +96,10 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         if (FileUtils.directoryFileExists(TERMUX_PREFIX_DIR_PATH, true)) {
             File[] PREFIX_FILE_LIST =  TERMUX_PREFIX_DIR.listFiles();
             // If prefix directory is empty or only contains the tmp directory
-            if(PREFIX_FILE_LIST == null || PREFIX_FILE_LIST.length == 0 || (PREFIX_FILE_LIST.length == 1 && TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH.equals(PREFIX_FILE_LIST[0].getAbsolutePath()))) {
+            boolean hasEmptyPrefixDirectory = PREFIX_FILE_LIST == null || PREFIX_FILE_LIST.length == 0;
+            boolean hasTmpDirectoryOnly = PREFIX_FILE_LIST.length == 1 && TermuxConstants.TERMUX_TMP_PREFIX_DIR_PATH.equals(PREFIX_FILE_LIST[0].getAbsolutePath());
+
+            if(hasEmptyPrefixDirectory || hasTmpDirectoryOnly) {
                 Logger.logInfo(LOG_TAG, "The termux prefix directory \"" + TERMUX_PREFIX_DIR_PATH + "\" exists but is empty or only contains the tmp directory.");
             } else {
                 whenDone.run();
@@ -110,38 +113,12 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
         new Thread() {
             @Override
             public void run() {
-                try {
-                    Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
-
-                    Error error;
-
-                    // Delete prefix staging directory or any file at its destination
-                    error = FileUtils.deleteFile("termux prefix staging directory", TERMUX_STAGING_PREFIX_DIR_PATH, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
-
-                    // Delete prefix directory or any file at its destination
-                    error = FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
+                try {Error error;
 
-                    // Create prefix staging directory if it does not already exist and set required permissions
-                    error = TermuxFileUtils.isTermuxPrefixStagingDirectoryAccessible(true, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
+                    if (hasPrefixError(activity, whenDone)) return;
+                    Logger.logInfo(LOG_TAG, "Installing " + TermuxConstants.TERMUX_APP_NAME + " bootstrap packages.");
 
-                    // Create prefix directory if it does not already exist and set required permissions
-                    error = TermuxFileUtils.isTermuxPrefixDirectoryAccessible(true, true);
-                    if (error != null) {
-                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                        return;
-                    }
+
 
                     Logger.logInfo(LOG_TAG, "Extracting bootstrap zip to prefix staging directory \"" + TERMUX_STAGING_PREFIX_DIR_PATH + "\".");
 
@@ -164,21 +141,15 @@ public void run() {
                                     symlinks.add(Pair.create(oldPath, newPath));
 
                                     error = ensureDirectoryExists(new File(newPath).getParentFile());
-                                    if (error != null) {
-                                        showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                                        return;
-                                    }
+                                    if (hasBootstrapError(error, activity, whenDone)) return;
                                 }
                             } else {
                                 String zipEntryName = zipEntry.getName();
                                 File targetFile = new File(TERMUX_STAGING_PREFIX_DIR_PATH, zipEntryName);
                                 boolean isDirectory = zipEntry.isDirectory();
 
                                 error = ensureDirectoryExists(isDirectory ? targetFile : targetFile.getParentFile());
-                                if (error != null) {
-                                    showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
-                                    return;
-                                }
+                                if (hasBootstrapError(error, activity, whenDone)) return;
 
                                 if (!isDirectory) {
                                     try (FileOutputStream outStream = new FileOutputStream(targetFile)) {
@@ -227,6 +198,36 @@ public void run() {
         }.start();
     }
 
+
+
+    private static boolean hasPrefixError(Activity activity, Runnable whenDone) {
+        Error error;
+        // Delete prefix staging directory or any file at its destination
+        error = FileUtils.deleteFile("termux prefix staging directory", TERMUX_STAGING_PREFIX_DIR_PATH, true);
+        if (hasBootstrapError(error, activity, whenDone)) return true;
+
+        // Delete prefix directory or any file at its destination
+        error = FileUtils.deleteFile("termux prefix directory", TERMUX_PREFIX_DIR_PATH, true);
+        if (hasBootstrapError(error, activity, whenDone)) return true;
+
+        // Create prefix staging directory if it does not already exist and set required permissions
+        error = TermuxFileUtils.isTermuxPrefixStagingDirectoryAccessible(true, true);
+        if (hasBootstrapError(error, activity, whenDone)) return true;
+
+        // Create prefix directory if it does not already exist and set required permissions
+        error = TermuxFileUtils.isTermuxPrefixDirectoryAccessible(true, true);
+        if (hasBootstrapError(error, activity, whenDone)) return true;
+        return false;
+    }
+
+    private static boolean hasBootstrapError(Error error, Activity activity, Runnable whenDone) {
+        if (error != null) {
+            showBootstrapErrorDialog(activity, whenDone, Error.getErrorMarkdownString(error));
+            return true;
+        }
+        return false;
+    }
+
     public static void showBootstrapErrorDialog(Activity activity, Runnable whenDone, String message) {
         Logger.logErrorExtended(LOG_TAG, "Bootstrap Error:\n" + message);
 

diff --git a/app/src/main/java/com/termux/app/TermuxService.java b/app/src/main/java/com/termux/app/TermuxService.java
@@ -137,14 +137,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
-        String action = null;
-        if (intent != null) {
-            Logger.logVerboseExtended(LOG_TAG, "Intent Received:\n" + IntentUtils.getIntentString(intent));
-            action = intent.getAction();
-        }
+        String chooseAction = null;
+
+        chooseAction = getAction(intent, chooseAction);
+        ExecuteAction(intent, chooseAction);
+
+        // If this service really do get killed, there is no point restarting it automatically - let the user do on next
+        // start of {@link Term):
+        return Service.START_NOT_STICKY;
+    }
 
-        if (action != null) {
-            switch (action) {
+    private void ExecuteAction(Intent intent, String chooseAction) {
+        boolean isAction = chooseAction != null;
+        if (isAction) {
+            switch (chooseAction) {
                 case TERMUX_SERVICE.ACTION_STOP_SERVICE:
                     Logger.logDebug(LOG_TAG, "ACTION_STOP_SERVICE intent received");
                     actionStopService();
@@ -162,24 +168,33 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     actionServiceExecute(intent);
                     break;
                 default:
-                    Logger.logError(LOG_TAG, "Invalid action: \"" + action + "\"");
+
+                    Logger.logError(LOG_TAG, "Invalid action: \"" + chooseAction + "\"");
                     break;
             }
         }
+    }
 
-        // If this service really do get killed, there is no point restarting it automatically - let the user do on next
-        // start of {@link Term):
-        return Service.START_NOT_STICKY;
+    private String getAction(Intent intent, String chooseAction) {
+        boolean isIntent = intent != null;
+        if (isIntent) {
+            String getActionMessage = "Intent Received:\n" + IntentUtils.getIntentString(intent);
+            Logger.logVerboseExtended(LOG_TAG, getActionMessage);
+            chooseAction = intent.getAction();
+        }
+        return chooseAction;
     }
 
     @Override
     public void onDestroy() {
+        boolean isStop = !mWantsToStop;
         Logger.logVerbose(LOG_TAG, "onDestroy");
 
         TermuxShellUtils.clearTermuxTMPDIR(true);
 
         actionReleaseWakeLock(false);
-        if (!mWantsToStop)
+
+        if (isStop)
             killAllTermuxExecutionCommands();
         runStopForeground();
     }
@@ -262,25 +277,19 @@ private void actionStopService() {
      *
      * We make copies of each list since items are removed inside the loop.
      */
+
+    // Need to apply Design Pattern
     private synchronized void killAllTermuxExecutionCommands() {
         boolean processResult;
 
         Logger.logDebug(LOG_TAG, "Killing TermuxSessions=" + mTermuxSessions.size() + ", TermuxTasks=" + mTermuxTasks.size() + ", PendingPluginExecutionCommands=" + mPendingPluginExecutionCommands.size());
 
-        List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
-        for (int i = 0; i < termuxSessions.size(); i++) {
-            ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
-            processResult = mWantsToStop || executionCommand.isPluginExecutionCommandWithPendingResult();
-            termuxSessions.get(i).killIfExecuting(this, processResult);
-        }
-
-        List<AppShell> termuxTasks = new ArrayList<>(mTermuxTasks);
-        for (int i = 0; i < termuxTasks.size(); i++) {
-            ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
-            if (executionCommand.isPluginExecutionCommandWithPendingResult())
-                termuxTasks.get(i).killIfExecuting(this, true);
-        }
+        killTerumxSessions();
+        killtermuxTasks();
+        killpendingPluginExecutionCommands();
+    }
 
+    private void killpendingPluginExecutionCommands() {
         List<ExecutionCommand> pendingPluginExecutionCommands = new ArrayList<>(mPendingPluginExecutionCommands);
         for (int i = 0; i < pendingPluginExecutionCommands.size(); i++) {
             ExecutionCommand executionCommand = pendingPluginExecutionCommands.get(i);
@@ -292,8 +301,27 @@ private synchronized void killAllTermuxExecutionCommands() {
         }
     }
 
+    private void killtermuxTasks() {
+        List<AppShell> termuxTasks = new ArrayList<>(mTermuxTasks);
+        for (int i = 0; i < termuxTasks.size(); i++) {
+            ExecutionCommand executionCommand = termuxTasks.get(i).getExecutionCommand();
+            if (executionCommand.isPluginExecutionCommandWithPendingResult())
+                termuxTasks.get(i).killIfExecuting(this, true);
+        }
+    }
 
+    private void killTerumxSessions() {
+        boolean processResult;
+        List<TermuxSession> termuxSessions = new ArrayList<>(mTermuxSessions);
+        for (int i = 0; i < termuxSessions.size(); i++) {
+            ExecutionCommand executionCommand = termuxSessions.get(i).getExecutionCommand();
+            processResult = mWantsToStop || executionCommand.isPluginExecutionCommandWithPendingResult();
+            termuxSessions.get(i).killIfExecuting(this, processResult);
+        }
+    }
 
+
+    //Need to apply Design Pattern
     /** Process action to acquire Power and Wi-Fi WakeLocks. */
     @SuppressLint({"WakelockTimeout", "BatteryLife"})
     private void actionAcquireWakeLock() {
@@ -304,14 +332,10 @@ private void actionAcquireWakeLock() {
 
         Logger.logDebug(LOG_TAG, "Acquiring WakeLocks");
 
-        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
-        mWakeLock.acquire();
+        powerMangerAcquireWakeLock();
 
         // http://tools.android.com/tech-docs/lint-in-studio-2-3#TOC-WifiManager-Leak
-        WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-        mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
-        mWifiLock.acquire();
+        wifiMangerAcquireWakeLock();
 
         if (!PermissionUtils.checkIfBatteryOptimizationsDisabled(this)) {
             PermissionUtils.requestDisableBatteryOptimizations(this);
@@ -323,6 +347,18 @@ private void actionAcquireWakeLock() {
 
     }
 
+    private void powerMangerAcquireWakeLock() {
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TermuxConstants.TERMUX_APP_NAME.toLowerCase() + ":service-wakelock");
+        mWakeLock.acquire();
+    }
+
+    private void wifiMangerAcquireWakeLock() {
+        WifiManager wm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        mWifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TermuxConstants.TERMUX_APP_NAME.toLowerCase());
+        mWifiLock.acquire();
+    }
+
     /** Process action to release Power and Wi-Fi WakeLocks. */
     private void actionReleaseWakeLock(boolean updateNotification) {
         if (mWakeLock == null && mWifiLock == null) {
@@ -332,6 +368,15 @@ private void actionReleaseWakeLock(boolean updateNotification) {
 
         Logger.logDebug(LOG_TAG, "Releasing WakeLocks");
 
+        releaseWakeLockAndWifiLock();
+
+        if (updateNotification)
+            updateNotification();
+
+        Logger.logDebug(LOG_TAG, "WakeLocks released successfully");
+    }
+
+    private void releaseWakeLockAndWifiLock() {
         if (mWakeLock != null) {
             mWakeLock.release();
             mWakeLock = null;
@@ -341,11 +386,6 @@ private void actionReleaseWakeLock(boolean updateNotification) {
             mWifiLock.release();
             mWifiLock = null;
         }
-
-        if (updateNotification)
-            updateNotification();
-
-        Logger.logDebug(LOG_TAG, "WakeLocks released successfully");
     }
 
     /** Process {@link TERMUX_SERVICE#ACTION_SERVICE_EXECUTE} intent to execute a shell command in
@@ -618,20 +658,23 @@ public synchronized int removeTermuxSession(TerminalSession sessionToRemove) {
     /** Callback received when a {@link TermuxSession} finishes. */
     @Override
     public void onTermuxSessionExited(final TermuxSession termuxSession) {
-        if (termuxSession != null) {
+        boolean isTermuxSession = termuxSession != null;
+        if (isTermuxSession) {
             ExecutionCommand executionCommand = termuxSession.getExecutionCommand();
 
             Logger.logVerbose(LOG_TAG, "The onTermuxSessionExited() callback called for \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession command");
 
             // If the execution command was started for a plugin, then process the results
-            if (executionCommand != null && executionCommand.isPluginExecutionCommand)
+            boolean isExecutionCommand = executionCommand != null;
+            if (isExecutionCommand && executionCommand.isPluginExecutionCommand)
                 TermuxPluginUtils.processPluginExecutionCommandResult(this, LOG_TAG, executionCommand);
 
             mTermuxSessions.remove(termuxSession);
 
             // Notify {@link TermuxSessionsListViewController} that sessions list has been updated if
             // activity in is foreground
-            if (mTermuxTerminalSessionClient != null)
+            boolean isTermuxTerminalSessionClient = mTermuxTerminalSessionClient != null;
+            if (isTermuxTerminalSessionClient)
                 mTermuxTerminalSessionClient.termuxSessionListNotifyUpdated();
         }