From e49d51423631caeda5069d0b77b5599d5b7bc552 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Tue, 21 May 2019 17:26:39 +0300
Subject: [PATCH] Revert "sessions: do not clear TMPDIR if application was not
 started"

This reverts commit bd45837d9378b04a257bb875391a1d1192310b71.
---
 .../java/com/termux/app/TermuxActivity.java   | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index 97083c12..83585bf5 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -482,7 +482,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
                         if (bundle != null) {
                             launchFailsafe = bundle.getBoolean(TERMUX_FAILSAFE_SESSION_ACTION, false);
                         }
-                        clearTemporaryDirectory();
                         addNewSession(launchFailsafe, null);
                     } catch (WindowManager.BadTokenException e) {
                         // Activity finished - ignore.
@@ -496,7 +495,6 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             Intent i = getIntent();
             if (i != null && Intent.ACTION_RUN.equals(i.getAction())) {
                 // Android 7.1 app shortcut from res/xml/shortcuts.xml.
-                clearTemporaryDirectory();
                 boolean failSafe = i.getBooleanExtra(TERMUX_FAILSAFE_SESSION_ACTION, false);
                 addNewSession(failSafe, null);
             } else {
@@ -592,6 +590,18 @@ public final class TermuxActivity extends Activity implements ServiceConnection
             new AlertDialog.Builder(this).setTitle(R.string.max_terminals_reached_title).setMessage(R.string.max_terminals_reached_message)
                 .setPositiveButton(android.R.string.ok, null).show();
         } else {
+            if (mTermService.getSessions().size() == 0 && !mTermService.isWakelockEnabled()) {
+                File termuxTmpDir = new File(TermuxService.PREFIX_PATH + "/tmp");
+                if (termuxTmpDir.exists()) {
+                    try {
+                        TermuxInstaller.deleteFolder(termuxTmpDir);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                    termuxTmpDir.mkdirs();
+                }
+            }
             String executablePath = (failSafe ? "/system/bin/sh" : null);
             TerminalSession newSession = mTermService.createTermSession(executablePath, null, null, failSafe);
             if (sessionName != null) {
@@ -836,18 +846,4 @@ public final class TermuxActivity extends Activity implements ServiceConnection
         }
     }
 
-    private void clearTemporaryDirectory() {
-        if (mTermService.getSessions().size() == 0 && !mTermService.isWakelockEnabled()) {
-            File termuxTmpDir = new File(TermuxService.PREFIX_PATH + "/tmp");
-            if (termuxTmpDir.exists()) {
-                try {
-                    TermuxInstaller.deleteFolder(termuxTmpDir);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-                termuxTmpDir.mkdirs();
-            }
-        }
-    }
 }