console status

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/console/ShellTermSession.java

@@ -30,10 +30,10 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 
+import jackpal.androidterm.TermSettings;
 import jackpal.androidterm.emulatorview.ColorScheme;
 import jackpal.androidterm.emulatorview.TermSession;
 import jackpal.androidterm.emulatorview.UpdateCallback;
-import jackpal.androidterm.TermSettings;
 
 public class ShellTermSession extends TermSession {
     public static final int PROCESS_EXITED = 1;
@@ -54,7 +54,7 @@ public void onUpdate() {
             setPtyUTF8Mode(getUTF8Mode());
         }
     };
-
+    private OnProcessExitListener onProcessExitListener;
     @SuppressLint("HandlerLeak")
     private Handler mMsgHandler = new Handler() {
         @Override
@@ -157,6 +157,9 @@ public void updateSize(int columns, int rows) {
     }
 
     private void onProcessExit(int result) {
+        if (onProcessExitListener != null) {
+            onProcessExitListener.onProcessExit(result);
+        }
         onProcessExit();
     }
 
@@ -234,11 +237,18 @@ void setPtyUTF8Mode(boolean utf8Mode) {
         }
     }
 
-
     /**
      * @return true, if failing to operate on file descriptor deserves an exception (never the case for ATE own shell)
      */
     boolean isFailFast() {
         return false;
     }
+
+    public void setOnProcessExitListener(OnProcessExitListener onProcessExitListener) {
+        this.onProcessExitListener = onProcessExitListener;
+    }
+
+    public interface OnProcessExitListener {
+        void onProcessExit(int exitCode);
+    }
 }

app/src/main/java/com/duy/ccppcompiler/console/TermActivity.java

@@ -28,6 +28,7 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
@@ -61,7 +62,7 @@
 import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
 import jackpal.androidterm.emulatorview.compat.KeycodeConstants;
 
-public class TermActivity extends ThemeSupportActivity implements SharedPreferences.OnSharedPreferenceChangeListener, TermSession.FinishCallback {
+public class TermActivity extends ThemeSupportActivity implements SharedPreferences.OnSharedPreferenceChangeListener, TermSession.FinishCallback, ShellTermSession.OnProcessExitListener {
     private static final String TAG = "TermActivity";
     private final static int SELECT_TEXT_ID = 0;
     private final static int COPY_ALL_ID = 1;
@@ -116,7 +117,8 @@ private ShellTermSession createShellTermSession(String cmd, String workdir) {
         TermSettings settings = new TermSettings(getResources(), PreferenceManager.getDefaultSharedPreferences(this));
 
         ShellTermSession shellTermSession = new ShellTermSession(settings, argv, envp, workdir);
-        shellTermSession.setProcessExitMessage(getString(R.string.console_finished));
+        shellTermSession.setOnProcessExitListener(this);
+//        shellTermSession.setProcessExitMessage(getString(R.string.console_finished));
 
         return shellTermSession;
     }
@@ -125,13 +127,17 @@ private ShellTermSession createShellTermSession(String cmd, String workdir) {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_term);
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setTitle(R.string.title_menu_terminal);
+            actionBar.setSubtitle(R.string.console_executing);
+        }
         String fileName = getIntent().getStringExtra(BuildConstants.EXTRA_FILE_NAME);
         String workDir = getIntent().getStringExtra(BuildConstants.EXTRA_WORK_DIR);
 
-        setTitle(R.string.title_menu_terminal);
 
         mSession = createShellTermSession(fileName, workDir);
         mSession.setFinishCallback(this);
@@ -439,6 +445,11 @@ public void onSessionFinish(TermSession session) {
         finish();
     }
 
+    @Override
+    public void onProcessExit(int exitCode) {
+        getSupportActionBar().setSubtitle(R.string.console_finished);
+    }
+
 
     private class EmulatorViewGestureListener extends GestureDetector.SimpleOnGestureListener {
         private EmulatorView view;