Fix "Duplicate finish request for ActivityRecord" errors

termux · Feb 26, 2021 · f50d15d · f50d15d
1 parent edcebf1
commit f50d15d
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -414,7 +414,7 @@ public void onTitleChanged(TerminalSession updatedSession) {
             public void onSessionFinished(final TerminalSession finishedSession) {
                 if (mTermService.mWantsToStop) {
                     // The service wants to stop as soon as possible.
-                    finish();
+                    finishActivityIfNotFinishing();
                     return;
                 }
                 if (mIsVisible && finishedSession != getCurrentTermSession()) {
@@ -550,7 +550,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                 });
             } else {
                 // The service connected while not in foreground - just bail out.
-                finish();
+                finishActivityIfNotFinishing();
             }
         } else {
             Intent i = getIntent();
@@ -586,7 +586,14 @@ void renameSession(final TerminalSession sessionToRename) {
     @Override
     public void onServiceDisconnected(ComponentName name) {
         // Respect being stopped from the TermuxService notification action.
-        finish();
+        finishActivityIfNotFinishing();
+    }
+
+    public void finishActivityIfNotFinishing() {
+        // prevent duplicate calls to finish() if called from multiple places
+        if (!TermuxActivity.this.isFinishing()) {
+            finish();
+        }
     }
 
     @Nullable
@@ -627,7 +634,7 @@ public void onBackPressed() {
         if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
             getDrawer().closeDrawers();
         } else {
-            finish();
+            finishActivityIfNotFinishing();
         }
     }
 
@@ -989,7 +996,7 @@ public void removeFinishedSession(TerminalSession finishedSession) {
         mListViewAdapter.notifyDataSetChanged();
         if (mTermService.getSessions().isEmpty()) {
             // There are no sessions to show, so finish the activity.
-            finish();
+            finishActivityIfNotFinishing();
         } else {
             if (index >= service.getSessions().size()) {
                 index = service.getSessions().size() - 1;