Make use of var keyword for complex class instances

Signed-off-by: Stefan Niedermann <info@niedermann.it>

30 files changed, 155 insertions, 162 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
index ac6335b90..31a20bb33 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
@@ -23,7 +23,7 @@ public class ExceptionActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        final ActivityExceptionBinding binding = ActivityExceptionBinding.inflate(getLayoutInflater());
+        final var binding = ActivityExceptionBinding.inflate(getLayoutInflater());
 
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
@@ -34,7 +34,7 @@ public class ExceptionActivity extends AppCompatActivity {
             throwable = new Exception("Could not get exception");
         }
 
-        final TipsAdapter adapter = new TipsAdapter(this::startActivity);
+        final var adapter = new TipsAdapter(this::startActivity);
         final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.INSTANCE.getDebugInfos(this, throwable, BuildConfig.FLAVOR);
 
         binding.tips.setAdapter(adapter);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
index 7a84ce0b6..987394b4b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
@@ -34,7 +34,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-        final Bundle args = getArguments();
+        final var args = getArguments();
         if (args != null) {
             this.throwable = (Throwable) args.getSerializable(KEY_THROWABLE);
             if (this.throwable == null) {
@@ -47,10 +47,10 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final View view = View.inflate(getContext(), R.layout.dialog_exception, null);
-        final DialogExceptionBinding binding = DialogExceptionBinding.bind(view);
+        final var view = View.inflate(getContext(), R.layout.dialog_exception, null);
+        final var binding = DialogExceptionBinding.bind(view);
 
-        final TipsAdapter adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent));
+        final var adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent));
 
         final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion());
 
@@ -73,10 +73,10 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
     }
 
     public static DialogFragment newInstance(Throwable throwable, @Nullable Account account) {
-        final Bundle args = new Bundle();
+        final var fragment = new ExceptionDialogFragment();
+        final var args = new Bundle();
         args.putSerializable(KEY_THROWABLE, throwable);
         args.putSerializable(KEY_ACCOUNT, account);
-        final DialogFragment fragment = new ExceptionDialogFragment();
         fragment.setArguments(args);
         return fragment;
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
index 04ed59c46..6d0c3ff5e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.exception.tips;
 
+import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
+import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -8,7 +11,6 @@ import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
@@ -38,9 +40,6 @@ import it.niedermann.nextcloud.deck.exceptions.OfflineException;
 import it.niedermann.nextcloud.deck.exceptions.UploadAttachmentFailedException;
 import it.niedermann.nextcloud.deck.model.Account;
 
-import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
-import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
-
 public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
 
     private static final String[] APPS = new String[]{Constants.PACKAGE_NAME_PROD, Constants.PACKAGE_NAME_DEV};
@@ -60,8 +59,8 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
     @NonNull
     @Override
     public TipsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        final View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_tip, parent, false);
-        return new TipsViewHolder(v);
+        final var view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_tip, parent, false);
+        return new TipsViewHolder(view);
     }
 
     @Override
@@ -191,7 +190,7 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
 
     @Nullable
     private static Intent getOpenFilesIntent(@NonNull Context context) {
-        final PackageManager pm = context.getPackageManager();
+        final var pm = context.getPackageManager();
         for (String app : APPS) {
             try {
                 pm.getPackageInfo(app, PackageManager.GET_ACTIVITIES);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
index 7d254459e..8a66c8cbf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.exception.tips;
 
+import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
+
 import android.content.Intent;
 import android.view.View;
 
@@ -9,8 +11,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import it.niedermann.nextcloud.deck.databinding.ItemTipBinding;
 
-import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
-
 public class TipsViewHolder extends RecyclerView.ViewHolder {
     private final ItemTipBinding binding;
 
@@ -22,7 +22,7 @@ public class TipsViewHolder extends RecyclerView.ViewHolder {
 
     public void bind(@NonNull TipsModel tip, @NonNull Consumer<Intent> actionButtonClickedListener) {
         binding.tip.setText(tip.getText());
-        final Intent actionIntent = tip.getActionIntent();
+        final var actionIntent = tip.getActionIntent();
         if (actionIntent != null && actionIntent.hasExtra(INTENT_EXTRA_BUTTON_TEXT)) {
             binding.actionButton.setVisibility(View.VISIBLE);
             binding.actionButton.setText(actionIntent.getIntExtra(INTENT_EXTRA_BUTTON_TEXT, 0));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
index 6bdd7a588..94101fff9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
+
 import android.app.Dialog;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -11,7 +13,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
@@ -22,11 +23,8 @@ import it.niedermann.android.util.ColorUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.DialogFilterBinding;
 import it.niedermann.nextcloud.deck.model.enums.EDueType;
-import it.niedermann.nextcloud.deck.model.internal.FilterInformation;
 import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
 
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
-
 public class FilterDialogFragment extends BrandedDialogFragment {
 
     private DialogFilterBinding binding;
@@ -44,19 +42,21 @@ public class FilterDialogFragment extends BrandedDialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        indicator = ContextCompat.getDrawable(requireContext(), R.drawable.circle_grey600_8dp);
+        final var context = requireContext();
+
+        indicator = ContextCompat.getDrawable(context, R.drawable.circle_grey600_8dp);
         assert indicator != null;
-        indicator.setColorFilter(ContextCompat.getColor(getContext(), R.color.defaultBrand), PorterDuff.Mode.SRC_ATOP);
+        indicator.setColorFilter(ContextCompat.getColor(context, R.color.defaultBrand), PorterDuff.Mode.SRC_ATOP);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext());
+        final var dialogBuilder = new AlertDialog.Builder(context);
 
         binding = DialogFilterBinding.inflate(requireActivity().getLayoutInflater());
         binding.viewPager.setAdapter(new TabsPagerAdapter(this));
         binding.viewPager.setOffscreenPageLimit(tabTitles.length);
 
-        LiveData<FilterInformation> filterInformationDraft = filterViewModel.getFilterInformationDraft();
+        final var filterInformationDraft = filterViewModel.getFilterInformationDraft();
         new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> {
             filterInformationDraft.observe(this, (draft) -> {
                 switch (position) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
index 01ba1a966..5134498b2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,8 +15,6 @@ import androidx.lifecycle.ViewModelProvider;
 import it.niedermann.nextcloud.deck.databinding.DialogFilterDuedateBinding;
 import it.niedermann.nextcloud.deck.model.enums.EDueType;
 
-import static java.util.Objects.requireNonNull;
-
 public class FilterDueTypeFragment extends Fragment implements SelectionListener<EDueType> {
 
     private FilterViewModel filterViewModel;
@@ -23,7 +23,7 @@ public class FilterDueTypeFragment extends Fragment implements SelectionListener
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterDuedateBinding binding = DialogFilterDuedateBinding.inflate(requireActivity().getLayoutInflater());
+        final var binding = DialogFilterDuedateBinding.inflate(requireActivity().getLayoutInflater());
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
index 39fb791be..83b8f8f3e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
@@ -43,7 +43,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte
 
     @Override
     public long getItemId(int position) {
-        @Nullable final Label label = labels.get(position);
+        @Nullable final var label = labels.get(position);
         return label == null ? -1L : label.getLocalId();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
index e7d693185..b4eb17d0e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,9 +17,6 @@ import it.niedermann.nextcloud.deck.databinding.DialogFilterLabelsBinding;
 import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.ui.MainViewModel;
 
-import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static java.util.Objects.requireNonNull;
-
 public class FilterLabelsFragment extends Fragment implements SelectionListener<Label> {
 
     private FilterViewModel filterViewModel;
@@ -25,8 +25,8 @@ public class FilterLabelsFragment extends Fragment implements SelectionListener<
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterLabelsBinding binding = DialogFilterLabelsBinding.inflate(requireActivity().getLayoutInflater());
-        final MainViewModel mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+        final var binding = DialogFilterLabelsBinding.inflate(requireActivity().getLayoutInflater());
+        final var mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
index 6ffaec6a6..708e2e541 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,9 +19,6 @@ import it.niedermann.nextcloud.deck.databinding.DialogFilterAssigneesBinding;
 import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.ui.MainViewModel;
 
-import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static java.util.Objects.requireNonNull;
-
 public class FilterUserFragment extends Fragment implements SelectionListener<User> {
 
     private FilterViewModel filterViewModel;
@@ -27,8 +27,8 @@ public class FilterUserFragment extends Fragment implements SelectionListener<Us
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterAssigneesBinding binding = DialogFilterAssigneesBinding.inflate(requireActivity().getLayoutInflater());
-        final MainViewModel mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+        final var binding = DialogFilterAssigneesBinding.inflate(requireActivity().getLayoutInflater());
+        final var mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
index 7cd3c1c80..acdab52e7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static androidx.lifecycle.Transformations.distinctUntilChanged;
+import static androidx.lifecycle.Transformations.map;
+
 import android.app.Application;
 
 import androidx.annotation.IntRange;
@@ -17,9 +20,6 @@ import it.niedermann.nextcloud.deck.model.enums.EDueType;
 import it.niedermann.nextcloud.deck.model.internal.FilterInformation;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 
-import static androidx.lifecycle.Transformations.distinctUntilChanged;
-import static androidx.lifecycle.Transformations.map;
-
 @SuppressWarnings("WeakerAccess")
 public class FilterViewModel extends AndroidViewModel {
 
@@ -43,7 +43,7 @@ public class FilterViewModel extends AndroidViewModel {
     }
 
     public void clearFilterInformation(boolean alsoFilterText) {
-        final FilterInformation newFilterInformation = new FilterInformation();
+        final var newFilterInformation = new FilterInformation();
         if (alsoFilterText) {
             final FilterInformation oldFilterInformation = this.filterInformation.getValue();
             newFilterInformation.setFilterText(oldFilterInformation != null ? oldFilterInformation.getFilterText() : "");
@@ -73,43 +73,43 @@ public class FilterViewModel extends AndroidViewModel {
     }
 
     public void setFilterInformationDraftDueType(@NonNull EDueType dueType) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setDueType(dueType);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void addFilterInformationDraftLabel(@NonNull Label label) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.addLabel(label);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void addFilterInformationUser(@NonNull User user) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.addUser(user);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void setNotAssignedUser(boolean notAssignedUser) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setNoAssignedUser(notAssignedUser);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void setNotAssignedLabel(boolean notAssignedLabel) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setNoAssignedLabel(notAssignedLabel);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void removeFilterInformationLabel(@NonNull Label label) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.removeLabel(label);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void removeFilterInformationUser(@NonNull User user) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.removeUser(user);
         this.filterInformationDraft.postValue(newDraft);
     }
@@ -120,7 +120,7 @@ public class FilterViewModel extends AndroidViewModel {
 
     public void setFilterText(@NonNull String filterText) {
         DeckLog.info("New filterText:", filterText);
-        FilterInformation newDraft = new FilterInformation(filterInformation.getValue());
+        final var newDraft = new FilterInformation(filterInformation.getValue());
         newDraft.setFilterText(filterText);
         this.filterInformation.postValue(newDraft);
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountAdapter.java
index c316705d0..29c7996c6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountAdapter.java
@@ -45,7 +45,7 @@ public class ManageAccountAdapter extends RecyclerView.Adapter<ManageAccountView
 
     @Override
     public void onBindViewHolder(@NonNull ManageAccountViewHolder holder, int position) {
-        final Account account = accounts.get(position);
+        final var account = accounts.get(position);
         holder.bind(account, (clickedAccount) -> {
             setCurrentAccount(clickedAccount);
             onAccountClick.accept(clickedAccount);
@@ -58,7 +58,7 @@ public class ManageAccountAdapter extends RecyclerView.Adapter<ManageAccountView
                 }
             }
 
-            Account newAccount = accounts.size() > 0 ? accounts.get(0) : null;
+            final var newAccount = accounts.size() > 0 ? accounts.get(0) : null;
             setCurrentAccount(newAccount);
             onAccountDelete.accept(new Pair<>(accountToDelete, newAccount));
         }), currentAccount != null && currentAccount.getId().equals(account.getId()));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
index 442f2c6eb..19fc401c8 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.movecard;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
@@ -23,9 +26,6 @@ import it.niedermann.nextcloud.deck.ui.pickstack.PickStackFragment;
 import it.niedermann.nextcloud.deck.ui.pickstack.PickStackListener;
 import it.niedermann.nextcloud.deck.ui.pickstack.PickStackViewModel;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
 public class MoveCardDialogFragment extends BrandedDialogFragment implements PickStackListener {
 
     private static final String KEY_ORIGIN_ACCOUNT_ID = "account_id";
@@ -119,14 +119,14 @@ public class MoveCardDialogFragment extends BrandedDialogFragment implements Pic
     }
 
     public static DialogFragment newInstance(long originAccountId, long originBoardLocalId, String originCardTitle, Long originCardLocalId, boolean hasAttachmentsOrComments) {
-        final DialogFragment dialogFragment = new MoveCardDialogFragment();
-        final Bundle args = new Bundle();
+        final var fragment = new MoveCardDialogFragment();
+        final var args = new Bundle();
         args.putLong(KEY_ORIGIN_ACCOUNT_ID, originAccountId);
         args.putLong(KEY_ORIGIN_BOARD_LOCAL_ID, originBoardLocalId);
         args.putString(KEY_ORIGIN_CARD_TITLE, originCardTitle);
         args.putLong(KEY_ORIGIN_CARD_LOCAL_ID, originCardLocalId);
         args.putBoolean(KEY_ORIGIN_CARD_HAS_ATTACHMENTS_OR_COMMENTS, hasAttachmentsOrComments);
-        dialogFragment.setArguments(args);
-        return dialogFragment;
+        fragment.setArguments(args);
+        return fragment;
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java
index 6408f6b64..ab41e71b5 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/pickstack/PickStackFragment.java
@@ -1,5 +1,10 @@
 package it.niedermann.nextcloud.deck.ui.pickstack;
 
+import static androidx.lifecycle.Transformations.switchMap;
+import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentAccountId;
+import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentBoardId;
+import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentStackId;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -26,11 +31,6 @@ import it.niedermann.nextcloud.deck.ui.preparecreate.BoardAdapter;
 import it.niedermann.nextcloud.deck.ui.preparecreate.SelectedListener;
 import it.niedermann.nextcloud.deck.ui.preparecreate.StackAdapter;
 
-import static androidx.lifecycle.Transformations.switchMap;
-import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentAccountId;
-import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentBoardId;
-import static it.niedermann.nextcloud.deck.DeckApplication.readCurrentStackId;
-
 public class PickStackFragment extends Fragment {
 
     private FragmentPickStackBinding binding;
@@ -52,7 +52,7 @@ public class PickStackFragment extends Fragment {
     @Nullable
     private LiveData<List<Board>> boardsLiveData;
     @NonNull
-    private Observer<List<Board>> boardsObserver = (boards) -> {
+    private final Observer<List<Board>> boardsObserver = (boards) -> {
         boardAdapter.clear();
         boardAdapter.addAll(boards);
         binding.boardSelect.setEnabled(true);
@@ -61,7 +61,7 @@ public class PickStackFragment extends Fragment {
             binding.boardSelect.setEnabled(true);
 
             Board boardToSelect = null;
-            for (Board board : boards) {
+            for (final var board : boards) {
                 if (board.getLocalId() == lastBoardId) {
                     boardToSelect = board;
                     break;
@@ -88,7 +88,7 @@ public class PickStackFragment extends Fragment {
             binding.stackSelect.setEnabled(true);
 
             Stack stackToSelect = null;
-            for (Stack stack : stacks) {
+            for (final var stack : stacks) {
                 if (stack.getLocalId() == lastStackId) {
                     stackToSelect = stack;
                     break;
@@ -114,7 +114,7 @@ public class PickStackFragment extends Fragment {
         } else {
             throw new IllegalArgumentException("Caller must implement " + PickStackListener.class.getSimpleName());
         }
-        final Bundle args = getArguments();
+        final var args = getArguments();
         if (args != null) {
             this.showBoardsWithoutEditPermission = args.getBoolean(KEY_SHOW_BOARDS_WITHOUT_EDIT_PERMISSION, false);
         }
@@ -194,8 +194,8 @@ public class PickStackFragment extends Fragment {
     }
 
     public static PickStackFragment newInstance(boolean showBoardsWithoutEditPermission) {
-        final PickStackFragment fragment = new PickStackFragment();
-        final Bundle args = new Bundle();
+        final var fragment = new PickStackFragment();
+        final var args = new Bundle();
         args.putBoolean(KEY_SHOW_BOARDS_WITHOUT_EDIT_PERMISSION, showBoardsWithoutEditPermission);
         fragment.setArguments(args);
         return fragment;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
index 9534b51b4..4905909f0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java
@@ -40,7 +40,7 @@ public class AccountAdapter extends AbstractAdapter<Account> {
             binding = ItemPrepareCreateAccountBinding.bind(convertView);
         }
 
-        final Account item = getItem(position);
+        final var item = getItem(position);
         if (item != null) {
             binding.username.setText(item.getUserName());
             try {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
index c27fa04ee..e0a7c68c0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/BoardAdapter.java
@@ -34,10 +34,10 @@ public class BoardAdapter extends AbstractAdapter<Board> {
             binding = ItemPrepareCreateBoardBinding.bind(convertView);
         }
 
-        final Board item = getItem(position);
-        if (item != null) {
-            binding.boardTitle.setText(item.getTitle());
-            binding.avatar.setImageDrawable(ViewUtil.getTintedImageView(binding.avatar.getContext(), R.drawable.circle_grey600_36dp, item.getColor()));
+        final var board = getItem(position);
+        if (board != null) {
+            binding.boardTitle.setText(board.getTitle());
+            binding.avatar.setImageDrawable(ViewUtil.getTintedImageView(binding.avatar.getContext(), R.drawable.circle_grey600_36dp, board.getColor()));
         } else {
             DeckLog.logError(new IllegalArgumentException("No item for position " + position));
         }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java
index ccb7c8a38..0557001b7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java
@@ -1,5 +1,9 @@
 package it.niedermann.nextcloud.deck.ui.preparecreate;
 
+import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentAccount;
+import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentBoardId;
+import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentStackId;
+
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,7 +12,6 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
 import androidx.lifecycle.ViewModelProvider;
 
 import it.niedermann.nextcloud.deck.R;
@@ -18,10 +21,6 @@ import it.niedermann.nextcloud.deck.model.full.FullCard;
 import it.niedermann.nextcloud.deck.ui.PickStackActivity;
 import it.niedermann.nextcloud.deck.ui.card.EditActivity;
 
-import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentAccount;
-import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentBoardId;
-import static it.niedermann.nextcloud.deck.DeckApplication.saveCurrentStackId;
-
 public class PrepareCreateActivity extends PickStackActivity {
 
     private PrepareCreateViewModel viewModel;
@@ -29,7 +28,7 @@ public class PrepareCreateActivity extends PickStackActivity {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final ActionBar actionBar = getSupportActionBar();
+        final var actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(R.string.add_card);
         }
@@ -83,7 +82,7 @@ public class PrepareCreateActivity extends PickStackActivity {
 
     @Override
     protected boolean requireContent() {
-        final Intent intent = getIntent();
+        final var intent = getIntent();
         return intent == null || (TextUtils.isEmpty(intent.getStringExtra(Intent.EXTRA_SUBJECT)) &&
                 TextUtils.isEmpty(intent.getStringExtra(Intent.EXTRA_TITLE)) &&
                 TextUtils.isEmpty(intent.getStringExtra(Intent.EXTRA_TEXT)));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java
index db0c4147c..f41a7592a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java
@@ -19,7 +19,7 @@ public class SettingsActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
 
-        final ActivitySettingsBinding binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        final var binding = ActivitySettingsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
         setSupportActionBar(binding.toolbar);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
index e378c96d1..b4b91a2cb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.settings;
 
+import static it.niedermann.nextcloud.deck.DeckApplication.setAppTheme;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
@@ -7,7 +9,6 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
-import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -17,8 +18,6 @@ import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncWorker;
 import it.niedermann.nextcloud.deck.ui.branding.BrandedSwitchPreference;
 
-import static it.niedermann.nextcloud.deck.DeckApplication.setAppTheme;
-
 public class SettingsFragment extends PreferenceFragmentCompat {
 
     private BrandedSwitchPreference wifiOnlyPref;
@@ -49,7 +48,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             DeckLog.error("Could not find preference with key:", getString(R.string.pref_key_debugging));
         }
 
-        final ListPreference backgroundSyncPref = findPreference(getString(R.string.pref_key_background_sync));
+        final var backgroundSyncPref = findPreference(getString(R.string.pref_key_background_sync));
         if (backgroundSyncPref != null) {
             backgroundSyncPref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> {
                 SyncWorker.update(requireContext().getApplicationContext(), (String) newValue);
@@ -59,7 +58,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             DeckLog.error("Could not find preference with key", getString(R.string.pref_key_background_sync));
         }
 
-        final Preference themePref = findPreference(getString(R.string.pref_key_dark_theme));
+        final var themePref = findPreference(getString(R.string.pref_key_dark_theme));
         if (themePref != null) {
             themePref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> {
                 setAppTheme(Integer.parseInt((String) newValue));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
index 3028ea952..fc093c471 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.sharetarget;
 
+import static android.graphics.PorterDuff.Mode;
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -22,9 +25,6 @@ import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
 import it.niedermann.nextcloud.exception.ExceptionUtil;
 
-import static android.graphics.PorterDuff.Mode;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
-
 public class ShareProgressDialogFragment extends BrandedDialogFragment {
 
     private DialogShareProgressBinding binding;
@@ -85,7 +85,7 @@ public class ShareProgressDialogFragment extends BrandedDialogFragment {
         viewModel.getDuplicateAttachments().observe(requireActivity(), (duplicates) -> {
             final int duplicatesCount = duplicates.size();
             if (duplicatesCount > 0) {
-                final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
+                final var params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
                 binding.duplicates.removeAllViews();
                 for (String duplicate : duplicates) {
                     TextView duplicateEntry = new TextView(requireContext());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressViewModel.java
index f30a3bcf4..6a2a1d0b7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressViewModel.java
@@ -15,13 +15,13 @@ public class ShareProgressViewModel extends ViewModel {
     @NonNull
     public String targetCardTitle = "";
     @NonNull
-    private MutableLiveData<List<Throwable>> exceptions = new MutableLiveData<>(new ArrayList<>());
+    private final MutableLiveData<List<Throwable>> exceptions = new MutableLiveData<>(new ArrayList<>());
     @NonNull
-    private MutableLiveData<List<String>> duplicateAttachments = new MutableLiveData<>(new ArrayList<>());
+    private final MutableLiveData<List<String>> duplicateAttachments = new MutableLiveData<>(new ArrayList<>());
     @NonNull
-    private MutableLiveData<Integer> max = new MutableLiveData<>();
+    private final MutableLiveData<Integer> max = new MutableLiveData<>();
     @NonNull
-    private MutableLiveData<Integer> progress = new MutableLiveData<>(0);
+    private final MutableLiveData<Integer> progress = new MutableLiveData<>(0);
 
     public void setMax(int max) {
         this.max.setValue(max);
@@ -36,7 +36,7 @@ public class ShareProgressViewModel extends ViewModel {
     }
 
     public void increaseProgress() {
-        final Integer currentValue = this.progress.getValue();
+        final var currentValue = this.progress.getValue();
         if (currentValue == null) {
             this.progress.setValue(0);
         } else {
@@ -49,7 +49,7 @@ public class ShareProgressViewModel extends ViewModel {
     }
 
     public void addDuplicateAttachment(String fileName) {
-        List<String> fileNames = this.duplicateAttachments.getValue();
+        var fileNames = this.duplicateAttachments.getValue();
         if (fileNames == null) {
             fileNames = new ArrayList<>();
         }
@@ -59,7 +59,7 @@ public class ShareProgressViewModel extends ViewModel {
     }
 
     public boolean hasAlreadyDuplicateAttachments() {
-        List<String> duplicateAttachments = this.duplicateAttachments.getValue();
+        final var duplicateAttachments = this.duplicateAttachments.getValue();
         if (duplicateAttachments == null) {
             return false;
         }
@@ -72,7 +72,7 @@ public class ShareProgressViewModel extends ViewModel {
 
     public void addException(Throwable exception) {
         DeckLog.logError(exception);
-        List<Throwable> exceptionList = this.exceptions.getValue();
+        var exceptionList = this.exceptions.getValue();
         if (exceptionList == null) {
             exceptionList = new ArrayList<>();
         }
@@ -82,7 +82,7 @@ public class ShareProgressViewModel extends ViewModel {
     }
 
     public boolean hasExceptions() {
-        List<Throwable> exceptions = this.exceptions.getValue();
+        final var exceptions = this.exceptions.getValue();
         if (exceptions == null) {
             return false;
         }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
index 2f21eb0b3..450450fe6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.sharetarget;
 
+import static java.net.HttpURLConnection.HTTP_CONFLICT;
+import static it.niedermann.nextcloud.deck.util.FilesUtil.copyContentUriToTempFile;
+
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -26,7 +29,6 @@ import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.api.IResponseCallback;
 import it.niedermann.nextcloud.deck.exceptions.UploadAttachmentFailedException;
-import it.niedermann.nextcloud.deck.model.Account;
 import it.niedermann.nextcloud.deck.model.Attachment;
 import it.niedermann.nextcloud.deck.model.Board;
 import it.niedermann.nextcloud.deck.model.full.FullCard;
@@ -36,9 +38,6 @@ import it.niedermann.nextcloud.deck.ui.card.SelectCardListener;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
 import it.niedermann.nextcloud.deck.util.MimeTypeUtil;
 
-import static it.niedermann.nextcloud.deck.util.FilesUtil.copyContentUriToTempFile;
-import static java.net.HttpURLConnection.HTTP_CONFLICT;
-
 public class ShareTargetActivity extends MainActivity implements SelectCardListener {
 
     private boolean isFile;
@@ -102,7 +101,7 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe
 
     private void appendFilesAndFinish(@NonNull FullCard fullCard) {
         ShareProgressDialogFragment.newInstance().show(getSupportFragmentManager(), ShareProgressDialogFragment.class.getSimpleName());
-        final ShareProgressViewModel shareProgressViewModel = new ViewModelProvider(this).get(ShareProgressViewModel.class);
+        final var shareProgressViewModel = new ViewModelProvider(this).get(ShareProgressViewModel.class);
         shareProgressViewModel.setMax(mStreamsToUpload.size());
         shareProgressViewModel.targetCardTitle = fullCard.getCard().getTitle();
 
@@ -150,10 +149,10 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe
     }
 
     private void appendTextAndFinish(@NonNull FullCard fullCard, @NonNull String receivedText) {
-        final String[] animals = {getString(R.string.append_text_to_description), getString(R.string.add_text_as_comment)};
+        final String[] targets = {getString(R.string.append_text_to_description), getString(R.string.add_text_as_comment)};
         new AlertDialog.Builder(this)
                 .setOnCancelListener(dialog -> cardSelected = false)
-                .setItems(animals, (dialog, which) -> {
+                .setItems(targets, (dialog, which) -> {
                     switch (which) {
                         case 0:
                             final String oldDescription = fullCard.getCard().getDescription();
@@ -181,8 +180,8 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe
                             });
                             break;
                         case 1:
-                            final Account currentAccount = mainViewModel.getCurrentAccount();
-                            final DeckComment comment = new DeckComment(receivedText.trim(), currentAccount.getUserName(), Instant.now());
+                            final var currentAccount = mainViewModel.getCurrentAccount();
+                            final var comment = new DeckComment(receivedText.trim(), currentAccount.getUserName(), Instant.now());
                             mainViewModel.addCommentToCard(currentAccount.getId(), fullCard.getLocalId(), comment);
                             Toast.makeText(getApplicationContext(), getString(R.string.share_success, "\"" + receivedText + "\"", "\"" + fullCard.getCard().getTitle() + "\""), Toast.LENGTH_LONG).show();
                             finish();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
index f32be185a..6594ccc0f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/DeleteStackDialogFragment.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import it.niedermann.nextcloud.deck.R;
@@ -42,18 +41,18 @@ public class DeleteStackDialogFragment extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new DeleteAlertDialogBuilder(requireContext())
+        return new DeleteAlertDialogBuilder(requireContext())
                 .setTitle(R.string.delete_list)
                 .setMessage(getResources().getQuantityString(R.plurals.do_you_want_to_delete_the_current_list, numberCards, numberCards))
                 .setPositiveButton(R.string.simple_delete, (dialog, whichButton) -> deleteStackListener.onStackDeleted(stackId))
-                .setNeutralButton(android.R.string.cancel, null);
-        return builder.create();
+                .setNeutralButton(android.R.string.cancel, null)
+                .create();
     }
 
     public static DialogFragment newInstance(long stackId, int numberCards) {
-        DeleteStackDialogFragment dialog = new DeleteStackDialogFragment();
+        final var dialog = new DeleteStackDialogFragment();
 
-        Bundle args = new Bundle();
+        final var args = new Bundle();
         args.putLong(KEY_STACK_ID, stackId);
         args.putInt(KEY_NUMBER_CARDS, numberCards);
         dialog.setArguments(args);
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 2464fb0c3..897969671 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
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.stack;
 
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -19,8 +21,6 @@ import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.DialogStackCreateBinding;
 import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
 
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout;
-
 public class EditStackDialogFragment extends BrandedDialogFragment {
     private static final String KEY_STACK_ID = "stack_id";
     private static final String KEY_OLD_TITLE = "old_title";
@@ -43,10 +43,10 @@ public class EditStackDialogFragment extends BrandedDialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         binding = DialogStackCreateBinding.inflate(requireActivity().getLayoutInflater());
 
-        final AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity())
+        final var builder = new AlertDialog.Builder(requireActivity())
                 .setView(binding.getRoot())
                 .setNeutralButton(android.R.string.cancel, null);
-        final Bundle args = getArguments();
+        final var args = getArguments();
         if (args == null) {
             builder.setTitle(R.string.add_list)
                     .setPositiveButton(R.string.simple_add, (dialog, which) -> editStackListener.onCreateStack(binding.input.getText().toString()));
@@ -71,9 +71,9 @@ public class EditStackDialogFragment extends BrandedDialogFragment {
     }
 
     public static DialogFragment newInstance(long stackId, @Nullable String oldTitle) {
-        final DialogFragment dialog = new EditStackDialogFragment();
+        final var dialog = new EditStackDialogFragment();
 
-        final Bundle args = new Bundle();
+        final var args = new Bundle();
         args.putLong(KEY_STACK_ID, stackId);
         args.putString(KEY_OLD_TITLE, oldTitle);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
index 9bd260206..4a26164dd 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java
@@ -64,7 +64,7 @@ public class StackAdapter extends FragmentStateAdapter {
 
     @Override
     public boolean containsItem(long itemId) {
-        for (Stack stack : stackList) {
+        for (final var stack : stackList) {
             if (stack.getLocalId() == itemId) {
                 return true;
             }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
index 7d5a6c4d5..93ebd0093 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
@@ -52,8 +52,8 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
-        final Bundle args = getArguments();
-        if (args == null || !args.containsKey(KEY_STACK_ID)) {
+        final var args = requireArguments();
+        if (!args.containsKey(KEY_STACK_ID)) {
             throw new IllegalArgumentException(KEY_STACK_ID + " is required.");
         }
 
@@ -70,7 +70,7 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte
         binding = FragmentStackBinding.inflate(inflater, container, false);
         mainViewModel = new ViewModelProvider(activity).get(MainViewModel.class);
 
-        final FilterViewModel filterViewModel = new ViewModelProvider(activity).get(FilterViewModel.class);
+        final var filterViewModel = new ViewModelProvider(activity).get(FilterViewModel.class);
 
         // This might be a zombie fragment with an empty MainViewModel after Android killed the activity (but not the fragment instance
         // See https://github.com/stefan-niedermann/nextcloud-deck/issues/478
@@ -148,10 +148,10 @@ public class StackFragment extends Fragment implements DragAndDropTab<CardAdapte
     }
 
     public static Fragment newInstance(long stackId) {
-        final Bundle args = new Bundle();
-        args.putLong(KEY_STACK_ID, stackId);
+        final var fragment = new StackFragment();
 
-        final StackFragment fragment = new StackFragment();
+        final var args = new Bundle();
+        args.putLong(KEY_STACK_ID, stackId);
         fragment.setArguments(args);
 
         return fragment;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
index 78a9319d0..0bfddd76d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.takephoto;
 
+import static it.niedermann.nextcloud.deck.util.MimeTypeUtil.IMAGE_JPEG;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -14,7 +16,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.camera.core.Camera;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCaptureException;
 import androidx.camera.core.Preview;
@@ -37,8 +38,6 @@ import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 import it.niedermann.nextcloud.deck.util.FilesUtil;
 
-import static it.niedermann.nextcloud.deck.util.MimeTypeUtil.IMAGE_JPEG;
-
 public class TakePhotoActivity extends AppCompatActivity {
 
     private ActivityTakePhotoBinding binding;
@@ -68,10 +67,10 @@ public class TakePhotoActivity extends AppCompatActivity {
         cameraProviderFuture = ProcessCameraProvider.getInstance(this);
         cameraProviderFuture.addListener(() -> {
             try {
-                final ProcessCameraProvider cameraProvider = cameraProviderFuture.get();
-                final Preview previewUseCase = getPreviewUseCase();
-                final ImageCapture captureUseCase = getCaptureUseCase();
-                final Camera camera = cameraProvider.bindToLifecycle(this, viewModel.getCameraSelector(), captureUseCase, previewUseCase);
+                final var cameraProvider = cameraProviderFuture.get();
+                final var previewUseCase = getPreviewUseCase();
+                final var captureUseCase = getCaptureUseCase();
+                final var camera = cameraProvider.bindToLifecycle(this, viewModel.getCameraSelector(), captureUseCase, previewUseCase);
 
                 viewModel.getCameraSelectorToggleButtonImageResource().observe(this, res -> binding.switchCamera.setImageDrawable(ContextCompat.getDrawable(this, res)));
                 viewModel.getTorchToggleButtonImageResource().observe(this, res -> binding.toggleTorch.setImageDrawable(ContextCompat.getDrawable(this, res)));
@@ -149,7 +148,7 @@ public class TakePhotoActivity extends AppCompatActivity {
     }
 
     private Preview getPreviewUseCase() {
-        Preview previewUseCase = new Preview.Builder().build();
+        final var previewUseCase = new Preview.Builder().build();
         previewUseCase.setSurfaceProvider(binding.preview.getSurfaceProvider());
         return previewUseCase;
     }
@@ -175,9 +174,9 @@ public class TakePhotoActivity extends AppCompatActivity {
     }
 
     private void applyBoardColorBrand(int mainColor) {
-        final ColorStateList colorStateList = ColorStateList.valueOf(mainColor);
-        for (View v : brandedViews) {
-            v.setBackgroundTintList(colorStateList);
+        final var colorStateList = ColorStateList.valueOf(mainColor);
+        for (final var view : brandedViews) {
+            view.setBackgroundTintList(colorStateList);
         }
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java
index a71291ff2..cadc02687 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java
@@ -1,17 +1,17 @@
 package it.niedermann.nextcloud.deck.ui.takephoto;
 
+import static androidx.camera.core.CameraSelector.DEFAULT_BACK_CAMERA;
+import static androidx.camera.core.CameraSelector.DEFAULT_FRONT_CAMERA;
+import static androidx.lifecycle.Transformations.map;
+
 import androidx.annotation.NonNull;
 import androidx.camera.core.CameraSelector;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModel;
 
 import it.niedermann.nextcloud.deck.R;
 
-import static androidx.camera.core.CameraSelector.DEFAULT_BACK_CAMERA;
-import static androidx.camera.core.CameraSelector.DEFAULT_FRONT_CAMERA;
-
 public class TakePhotoViewModel extends ViewModel {
 
     @NonNull
@@ -50,7 +50,7 @@ public class TakePhotoViewModel extends ViewModel {
     }
 
     public LiveData<Integer> getTorchToggleButtonImageResource() {
-        return Transformations.map(isTorchEnabled(), enabled -> enabled
+        return map(isTorchEnabled(), enabled -> enabled
                 ? R.drawable.ic_baseline_flash_off_24
                 : R.drawable.ic_baseline_flash_on_24);
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java
index 41e2e9f24..e5f9297fd 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsActivity.java
@@ -31,7 +31,7 @@ public class UpcomingCardsActivity extends AppCompatActivity implements MoveCard
 
         Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
 
-        final ActivityUpcomingCardsBinding binding = ActivityUpcomingCardsBinding.inflate(getLayoutInflater());
+        final var binding = ActivityUpcomingCardsBinding.inflate(getLayoutInflater());
         viewModel = new ViewModelProvider(this).get(UpcomingCardsViewModel.class);
 
         setContentView(binding.getRoot());
@@ -39,7 +39,7 @@ public class UpcomingCardsActivity extends AppCompatActivity implements MoveCard
 
         binding.loadingSpinner.show();
 
-        final UpcomingCardsAdapter adapter = new UpcomingCardsAdapter(this, getSupportFragmentManager(),
+        final var adapter = new UpcomingCardsAdapter(this, getSupportFragmentManager(),
                 viewModel::assignUser,
                 viewModel::unassignUser,
                 (fullCard) -> viewModel.archiveCard(fullCard, new IResponseCallback<FullCard>() {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsAdapter.java
index 212fe5747..7f1c64ad6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsAdapter.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.upcomingcards;
 
+import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;
+
 import android.app.Activity;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -31,8 +33,6 @@ import it.niedermann.nextcloud.deck.ui.card.DefaultCardOnlyTitleViewHolder;
 import it.niedermann.nextcloud.deck.ui.card.DefaultCardViewHolder;
 import it.niedermann.nextcloud.deck.ui.card.EditActivity;
 
-import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;
-
 public class UpcomingCardsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private final boolean compactMode;
@@ -78,7 +78,7 @@ public class UpcomingCardsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     @Override
     public long getItemId(int position) {
-        final Object item = items.get(position);
+        final var item = items.get(position);
         if (item.getClass() == UpcomingCardsAdapterSectionItem.class || item instanceof UpcomingCardsAdapterSectionItem) {
             return items
                     .stream()
@@ -107,14 +107,14 @@ public class UpcomingCardsAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     @Override
     public int getItemViewType(int position) {
-        final Object item = items.get(position);
+        final var item = items.get(position);
         if (item.getClass() == UpcomingCardsAdapterSectionItem.class || item instanceof UpcomingCardsAdapterSectionItem) {
             return R.layout.item_section;
         } else if (item.getClass() == UpcomingCardsAdapterItem.class || item instanceof UpcomingCardsAdapterItem) {
             if (compactMode) {
                 return R.layout.item_card_compact;
             } else {
-                final FullCard fullCard = ((UpcomingCardsAdapterItem) item).getFullCard();
+                final var fullCard = ((UpcomingCardsAdapterItem) item).getFullCard();
                 if (fullCard.getAttachments().size() == 0
                         && fullCard.getAssignedUsers().size() == 0
                         && fullCard.getLabels().size() == 0
@@ -134,16 +134,15 @@ public class UpcomingCardsAdapter extends RecyclerView.Adapter<RecyclerView.View
         final Object item = items.get(position);
         if (item.getClass() == UpcomingCardsAdapterSectionItem.class || item instanceof UpcomingCardsAdapterSectionItem) {
             if (viewHolder.getClass() == UpcomingCardsSectionViewHolder.class || viewHolder instanceof UpcomingCardsSectionViewHolder) {
-                final UpcomingCardsAdapterSectionItem cardItem = (UpcomingCardsAdapterSectionItem) item;
+                final var cardItem = (UpcomingCardsAdapterSectionItem) item;
                 ((UpcomingCardsSectionViewHolder) viewHolder).bind(cardItem.getTitle());
             } else {
                 throw new IllegalStateException("Item at position " + position + " is a " + item.getClass().getSimpleName() + " but viewHolder is no " + UpcomingCardsSectionViewHolder.class.getSimpleName());
             }
         } else if (item.getClass() == UpcomingCardsAdapterItem.class || item instanceof UpcomingCardsAdapterItem) {
-            viewHolder.getClass();
             if (viewHolder instanceof AbstractCardViewHolder) {
-                final UpcomingCardsAdapterItem cardItem = (UpcomingCardsAdapterItem) item;
-                AbstractCardViewHolder cardViewHolder = ((AbstractCardViewHolder) viewHolder);
+                final var cardItem = (UpcomingCardsAdapterItem) item;
+                final var cardViewHolder = ((AbstractCardViewHolder) viewHolder);
                 cardViewHolder.bind(cardItem.getFullCard(), cardItem.getAccount(), cardItem.getCurrentBoardRemoteId(), cardItem.currentBoardHasEditPermission(), R.menu.card_menu,
                         new UpcomingCardsOptionsItemSelectedListener(
                                 cardItem.getAccount(),
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsOptionsItemSelectedListener.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsOptionsItemSelectedListener.java
index 403292840..b5c0dd3be 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsOptionsItemSelectedListener.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/upcomingcards/UpcomingCardsOptionsItemSelectedListener.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.upcomingcards;
 
+import static it.niedermann.nextcloud.deck.util.MimeTypeUtil.TEXT_PLAIN;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.view.MenuItem;
@@ -20,8 +22,6 @@ import it.niedermann.nextcloud.deck.ui.card.CardOptionsItemSelectedListener;
 import it.niedermann.nextcloud.deck.ui.movecard.MoveCardDialogFragment;
 import it.niedermann.nextcloud.deck.util.CardUtil;
 
-import static it.niedermann.nextcloud.deck.util.MimeTypeUtil.TEXT_PLAIN;
-
 public class UpcomingCardsOptionsItemSelectedListener implements CardOptionsItemSelectedListener {
     @NonNull
     private final Account account;
@@ -66,7 +66,7 @@ public class UpcomingCardsOptionsItemSelectedListener implements CardOptionsItem
     public boolean onCardOptionsItemSelected(@NonNull MenuItem menuItem, @NonNull FullCard fullCard) {
         final int itemId = menuItem.getItemId();
         if (itemId == R.id.share_link) {
-            final Intent shareIntent = new Intent()
+            final var shareIntent = new Intent()
                     .setAction(Intent.ACTION_SEND)
                     .setType(TEXT_PLAIN)
                     .putExtra(Intent.EXTRA_SUBJECT, fullCard.getCard().getTitle())
@@ -75,7 +75,7 @@ public class UpcomingCardsOptionsItemSelectedListener implements CardOptionsItem
             activity.startActivity(Intent.createChooser(shareIntent, fullCard.getCard().getTitle()));
             return true;
         } else if (itemId == R.id.share_content) {
-            final Intent shareIntent = new Intent()
+            final var shareIntent = new Intent()
                     .setAction(Intent.ACTION_SEND)
                     .setType(TEXT_PLAIN)
                     .putExtra(Intent.EXTRA_SUBJECT, fullCard.getCard().getTitle())