Merge branch 'master' into 1330-material-31330-material-3

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java

5 files changed, 16 insertions, 9 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 56d2c3bfc..8d91048cd 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -1117,10 +1117,14 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen
     @AnyThread
     private void showSyncFailedSnackbar(@NonNull Throwable throwable) {
         if (!(throwable instanceof NextcloudHttpRequestFailedException) || ((NextcloudHttpRequestFailedException) throwable).getStatusCode() != HttpURLConnection.HTTP_UNAVAILABLE) {
-            runOnUiThread(() -> BrandedSnackbar.make(binding.coordinatorLayout, R.string.synchronization_failed, Snackbar.LENGTH_LONG)
-                    .setAction(R.string.simple_more, v -> ExceptionDialogFragment.newInstance(throwable, mainViewModel.getCurrentAccount()).show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName()))
-                    .setAnchorView(binding.fab)
-                    .show());
+            runOnUiThread(() -> {
+                if (binding != null) { // Can be null in case the activity has been destroyed before the synchronization process has been finished
+                    BrandedSnackbar.make(binding.coordinatorLayout, R.string.synchronization_failed, Snackbar.LENGTH_LONG)
+                            .setAction(R.string.simple_more, v -> ExceptionDialogFragment.newInstance(throwable, mainViewModel.getCurrentAccount()).show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName()))
+                            .setAnchorView(binding.fab)
+                    .show();
+                }
+            });
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
index e12b0985f..894f0d835 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/EditBoardDialogFragment.java
@@ -55,7 +55,7 @@ public class EditBoardDialogFragment extends DialogFragment {
                 .setView(binding.getRoot())
                 .setNeutralButton(android.R.string.cancel, null);
 
-        final Bundle args = getArguments();
+        final var args = getArguments();
         if (args != null && args.containsKey(KEY_BOARD_ID)) {
             builder.setTitle(R.string.edit_board);
             builder.setPositiveButton(R.string.simple_save, (dialog, which) -> {
@@ -63,7 +63,7 @@ public class EditBoardDialogFragment extends DialogFragment {
                 this.fullBoard.board.setTitle(binding.input.getText().toString());
                 this.editBoardListener.onUpdateBoard(fullBoard);
             });
-            final MainViewModel viewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+            final var viewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
             viewModel.getFullBoardById(viewModel.getCurrentAccount().getId(), args.getLong(KEY_BOARD_ID)).observe(EditBoardDialogFragment.this, (FullBoard fb) -> {
                 if (fb.board != null) {
                     this.fullBoard = fb;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
index 57a1cc21d..eb0ad1e26 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/EditStackDialogFragment.java
@@ -154,6 +154,7 @@ public class EditStackDialogFragment extends BrandedDialogFragment implements Di
                     } else {
                         editStackListener.onUpdateStack(args.getLong(KEY_STACK_ID), binding.input.getText().toString());
                     }
+                    dismiss();
                 } else {
                     binding.inputWrapper.setError(getString(R.string.title_is_mandatory));
                     binding.input.requestFocus();
diff --git a/fastlane/metadata/android/en-US/changelogs/1020003.txt b/fastlane/metadata/android/en-US/changelogs/1020003.txt
index 48df63af2..08362b0c2 100644
--- a/fastlane/metadata/android/en-US/changelogs/1020003.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1020003.txt
@@ -1,4 +1,4 @@
-- 🎨 Workaround for not announced breaking change of Deck 1.8b1 (#1337)
-- 🎨 Fix crash when appending a shared text to the description of an existing card (#1344)
-- 🎨 Fix constraint violation when a user has been assigned to a board multiple times
+- 🐞 Workaround for not announced breaking change of Deck 1.8b1 (#1337)
+- 🐞 Fix crash when appending a shared text to the description of an existing card (#1344)
+- 🐞 Fix constraint violation when a user has been assigned to a board multiple times
 - 🎨 Fix theming issue when taking photos on a board with white color
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/1021000.txt b/fastlane/metadata/android/en-US/changelogs/1021000.txt
new file mode 100644
index 000000000..4e03e4176
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1021000.txt
@@ -0,0 +1,2 @@
+- 🐞 Create new list: Dialog does not close (#1361)
+- 🐞 NullPointerException on CoordinatorLayout (#1356)