From 432ad54c355d05db87f872654264303663b07b61 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Mon, 22 Jan 2024 14:34:37 +0100 Subject: chore(lint): Use pattern variables Signed-off-by: Stefan Niedermann --- .../it/niedermann/nextcloud/deck/exceptions/HandledServerErrors.java | 3 +-- .../nextcloud/deck/model/widget/filter/FilterWidgetSort.java | 4 +--- .../it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java | 3 +-- .../java/it/niedermann/nextcloud/deck/repository/SyncRepository.java | 3 +-- .../niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java | 3 +-- .../it/niedermann/nextcloud/deck/ui/theme/ThemedSwitchPreference.java | 3 +-- .../nextcloud/deck/ui/upcomingcards/UpcomingCardsAdapter.java | 3 +-- 7 files changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/HandledServerErrors.java b/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/HandledServerErrors.java index a5d3e3155..8be6b2b2e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/HandledServerErrors.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/exceptions/HandledServerErrors.java @@ -21,8 +21,7 @@ public enum HandledServerErrors { } public static HandledServerErrors fromThrowable(Throwable throwable) { - if (throwable instanceof NextcloudHttpRequestFailedException) { - NextcloudHttpRequestFailedException requestFailedException = (NextcloudHttpRequestFailedException) throwable; + if (throwable instanceof NextcloudHttpRequestFailedException requestFailedException) { if (requestFailedException.getCause() != null) { String errorString = requestFailedException.getCause().getMessage(); try { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java index 26ab9eab3..c96a0f6cc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/widget/filter/FilterWidgetSort.java @@ -104,9 +104,7 @@ public class FilterWidgetSort { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof FilterWidgetSort)) return false; - - FilterWidgetSort that = (FilterWidgetSort) o; + if (!(o instanceof FilterWidgetSort that)) return false; if (direction != that.direction) return false; if (ruleOrder != that.ruleOrder) return false; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java index 1167fb7e2..4da2707f4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/ResponseCallback.java @@ -48,8 +48,7 @@ public abstract class ResponseCallback implements IResponseCallback { } private boolean isListOfRemoteEntity(T response) { - if (response instanceof List) { - final var collection = (List) response; + if (response instanceof List collection) { return collection.size() > 0 && collection.get(0) instanceof AbstractRemoteEntity; } return false; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/repository/SyncRepository.java b/app/src/main/java/it/niedermann/nextcloud/deck/repository/SyncRepository.java index b08cbc8a7..0aec7d8d4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/repository/SyncRepository.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/repository/SyncRepository.java @@ -300,8 +300,7 @@ public class SyncRepository extends BaseRepository { @SuppressLint("MissingSuperCall") @Override public void onError(Throwable throwable) { - if (throwable instanceof NextcloudHttpRequestFailedException) { - final NextcloudHttpRequestFailedException requestFailedException = (NextcloudHttpRequestFailedException) throwable; + if (throwable instanceof NextcloudHttpRequestFailedException requestFailedException) { DeckLog.verbose("HTTP Status " + requestFailedException.getStatusCode()); if (requestFailedException.getStatusCode() == HTTP_UNAVAILABLE && requestFailedException.getCause() != null) { final String errorString = requestFailedException.getCause().getMessage(); 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 7ca875b1f..690a4a0b9 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 @@ -103,11 +103,10 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe shareProgressViewModel.targetCardTitle = fullCard.getCard().getTitle(); for (Parcelable sourceStream : mStreamsToUpload) { - if (!(sourceStream instanceof Uri)) { + if (!(sourceStream instanceof Uri uri)) { shareProgressViewModel.addException(new UploadAttachmentFailedException("Expected sourceStream to be " + Uri.class.getSimpleName() + " but was: " + (sourceStream == null ? null : sourceStream.getClass().getSimpleName()))); return; } - final Uri uri = (Uri) sourceStream; if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) { shareProgressViewModel.addException(new UploadAttachmentFailedException("Unhandled URI scheme: " + uri.getScheme())); return; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedSwitchPreference.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedSwitchPreference.java index c9cba5b7c..52a72cb1d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedSwitchPreference.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/ThemedSwitchPreference.java @@ -71,8 +71,7 @@ public class ThemedSwitchPreference extends SwitchPreference implements Themed { if (view instanceof Switch) { return (Switch) view; } - if (view instanceof ViewGroup) { - ViewGroup viewGroup = (ViewGroup) view; + if (view instanceof ViewGroup viewGroup) { for (int i = 0; i < viewGroup.getChildCount(); i++) { final var child = viewGroup.getChildAt(i); if (child instanceof ViewGroup) { 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 c9e8403a9..cc1eb1b85 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 @@ -140,9 +140,8 @@ public class UpcomingCardsAdapter extends RecyclerView.Adapter