Merge pull request #3369 from nextcloud/backport/3365/stable-3.4.x

[stable-3.4.x] Trashbin: do UI changes of async only if activity is still up and running
nextcloud · Dec 14, 2018 · e613c01 · e613c01
2 parents d5a107d + 7ca15a2
commit e613c01
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java b/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java
@@ -85,6 +85,8 @@ public class TrashbinActivity extends FileActivity implements TrashbinActivityIn
     private TrashbinListAdapter trashbinListAdapter;
     private TrashbinPresenter trashbinPresenter;
 
+    private boolean active = false;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -107,6 +109,8 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onStart() {
         super.onStart();
 
+        active = true;
+
         setupContent();
     }
 
@@ -229,6 +233,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     protected void onPause() {
         super.onPause();
+        active = false;
+
         trashbinListAdapter.cancelAllPendingTasks();
     }
 
@@ -253,13 +259,17 @@ public void onSortingOrderChosen(FileSortOrder sortOrder) {
 
     @Override
     public void showTrashbinFolder(List<Object> trashbinFiles) {
-        trashbinListAdapter.setTrashbinFiles(trashbinFiles, true);
-        swipeListRefreshLayout.setRefreshing(false);
+        if (active) {
+            trashbinListAdapter.setTrashbinFiles(trashbinFiles, true);
+            swipeListRefreshLayout.setRefreshing(false);
+        }
     }
 
     @Override
     public void removeFile(TrashbinFile file) {
-        trashbinListAdapter.removeFile(file);
+        if (active) {
+            trashbinListAdapter.removeFile(file);
+        }
     }
 
     @Override
@@ -269,23 +279,26 @@ public void removeAllFiles() {
 
     @Override
     public void showSnackbarError(int message, TrashbinFile file) {
-        swipeListRefreshLayout.setRefreshing(false);
-        Snackbar.make(recyclerView, String.format(getString(message), file.getFileName()), Snackbar.LENGTH_LONG).show();
+        if (active) {
+            swipeListRefreshLayout.setRefreshing(false);
+            Snackbar.make(recyclerView, String.format(getString(message), file.getFileName()), Snackbar.LENGTH_LONG)
+                .show();
+        }
     }
 
     @Override
     public void showError(int message) {
-        if (swipeListRefreshLayout != null) {
+        if (active) {
             swipeListRefreshLayout.setRefreshing(false);
-        }
 
-        if (emptyContentMessage != null && emptyContentHeadline != null && emptyContentIcon != null) {
-            emptyContentHeadline.setText(R.string.common_error);
-            emptyContentIcon.setImageDrawable(getResources().getDrawable(R.drawable.ic_list_empty_error));
-            emptyContentMessage.setText(message);
+            if (emptyContentMessage != null) {
+                emptyContentHeadline.setText(R.string.common_error);
+                emptyContentIcon.setImageDrawable(getResources().getDrawable(R.drawable.ic_list_empty_error));
+                emptyContentMessage.setText(message);
 
-            emptyContentMessage.setVisibility(View.VISIBLE);
-            emptyContentIcon.setVisibility(View.VISIBLE);
+                emptyContentMessage.setVisibility(View.VISIBLE);
+                emptyContentIcon.setVisibility(View.VISIBLE);
+            }
         }
     }
 }