Merge pull request #14588 from nextcloud/Java16

AndyScherzinger · web-flow · commit 86b95c500531 · 2025-02-25T21:52:43.000+01:00
Use of Pattern Variables
diff --git a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -670,8 +670,7 @@ private Bitmap doThumbnailFromOCFileInBackground() {
                 int pxH;
                 pxW = pxH = getThumbnailDimension();
 
-                if (file instanceof OCFile) {
-                    OCFile ocFile = (OCFile) file;
+                if (file instanceof OCFile ocFile) {
                     if (ocFile.isDown()) {
                         Bitmap bitmap;
                         if (MimeTypeUtil.isVideo(ocFile)) {
@@ -1151,8 +1150,7 @@ public static boolean cancelPotentialThumbnailWork(Object file, ImageView imageV
     public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncThumbnailDrawable) {
-                final AsyncThumbnailDrawable asyncDrawable = (AsyncThumbnailDrawable) drawable;
+            if (drawable instanceof AsyncThumbnailDrawable asyncDrawable) {
                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
@@ -1162,8 +1160,7 @@ public static ThumbnailGenerationTask getBitmapWorkerTask(ImageView imageView) {
     private static ResizedImageGenerationTask getResizedImageGenerationWorkerTask(ImageView imageView) {
         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncResizedImageDrawable) {
-                final AsyncResizedImageDrawable asyncDrawable = (AsyncResizedImageDrawable) drawable;
+            if (drawable instanceof AsyncResizedImageDrawable asyncDrawable) {
                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
@@ -1173,8 +1170,7 @@ private static ResizedImageGenerationTask getResizedImageGenerationWorkerTask(Im
     private static GalleryImageGenerationTask getGalleryImageGenerationTask(ImageView imageView) {
         if (imageView != null) {
             final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncGalleryImageDrawable) {
-                final AsyncGalleryImageDrawable asyncDrawable = (AsyncGalleryImageDrawable) drawable;
+            if (drawable instanceof AsyncGalleryImageDrawable asyncDrawable) {
                 return asyncDrawable.getBitmapWorkerTask();
             }
         }
diff --git a/app/src/main/java/com/owncloud/android/db/OCUpload.java b/app/src/main/java/com/owncloud/android/db/OCUpload.java
@@ -292,10 +292,9 @@ public int describeContents() {
 
     @SuppressFBWarnings("SEO_SUBOPTIMAL_EXPRESSION_ORDER")
     public boolean isSame(@Nullable Object obj) {
-        if (!(obj instanceof OCUpload)) {
+        if (!(obj instanceof OCUpload other)) {
             return false;
         }
-        OCUpload other = (OCUpload) obj;
         return this.uploadId == other.uploadId &&
             localPath.equals(other.localPath) &&
             remotePath.equals(other.remotePath) &&
diff --git a/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java b/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java
@@ -54,9 +54,7 @@ private void findSwitch(ViewGroup viewGroup) {
         for (int i = 0; i < viewGroup.getChildCount(); i++) {
             View child = viewGroup.getChildAt(i);
 
-            if (child instanceof Switch) {
-                Switch switchView = (Switch) child;
-
+            if (child instanceof Switch switchView) {
                 viewThemeUtils.platform.colorSwitch(switchView);
 
                 break;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -812,9 +812,8 @@ public void resetSearchView() {
 
     protected void refreshDetailsFragmentIfVisible(String downloadEvent, String downloadedRemotePath, boolean success) {
         Fragment leftFragment = getLeftFragment();
-        if (leftFragment instanceof FileDetailFragment) {
+        if (leftFragment instanceof FileDetailFragment detailsFragment) {
             boolean waitedPreview = mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath);
-            FileDetailFragment detailsFragment = (FileDetailFragment) leftFragment;
             OCFile fileInFragment = detailsFragment.getFile();
             if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
                 // the user browsed to other file ; forget the automatic preview
@@ -1292,7 +1291,7 @@ protected void onResume() {
         }
         //show in-app review dialog to user
         inAppReviewHelper.showInAppReview(this);
-        
+
         checkNotifications();
 
         Log_OC.v(TAG, "onResume() end");
@@ -1897,8 +1896,7 @@ private void onRestoreFileVersionOperationFinish(RemoteOperationResult result) {
             startSyncFolderOperation(parent, true, true);
 
             Fragment leftFragment = getLeftFragment();
-            if (leftFragment instanceof FileDetailFragment) {
-                FileDetailFragment fileDetailFragment = (FileDetailFragment) leftFragment;
+            if (leftFragment instanceof FileDetailFragment fileDetailFragment) {
                 fileDetailFragment.getFileDetailActivitiesFragment().reload();
             }
 
@@ -1965,8 +1963,7 @@ private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOp
         if (result.isSuccess() && optionalUser.isPresent()) {
             final User currentUser = optionalUser.get();
             Fragment leftFragment = getLeftFragment();
-            if (leftFragment instanceof FileFragment) {
-                final FileFragment fileFragment = (FileFragment) leftFragment;
+            if (leftFragment instanceof FileFragment fileFragment) {
                 if (fileFragment instanceof FileDetailFragment && renamedFile.equals(fileFragment.getFile())) {
                     ((FileDetailFragment) fileFragment).updateFileDetails(renamedFile, currentUser);
                     showDetails(renamedFile);
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java
@@ -83,8 +83,7 @@ public void setActivityAndVersionItems(List<Object> items, NextcloudClient newCl
         for (Object item : items) {
             String time;
 
-            if (item instanceof Activity) {
-                Activity activity = (Activity) item;
+            if (item instanceof Activity activity) {
                 time = getHeaderDateString(context, activity.getDatetime().getTime()).toString();
             } else {
                 FileVersion version = (FileVersion) item;
@@ -115,8 +114,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof VersionViewHolder) {
-            final VersionViewHolder versionViewHolder = (VersionViewHolder) holder;
+        if (holder instanceof VersionViewHolder versionViewHolder) {
             FileVersion fileVersion = (FileVersion) values.get(position);
 
             versionViewHolder.binding.size.setText(DisplayUtils.bytesToHumanReadable(fileVersion.getFileLength()));
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
@@ -144,8 +144,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof ActivityViewHolder) {
-            final ActivityViewHolder activityViewHolder = (ActivityViewHolder) holder;
+        if (holder instanceof ActivityViewHolder activityViewHolder) {
             Activity activity = (Activity) values.get(position);
             activityViewHolder.binding.datetime.setVisibility(View.VISIBLE);
             activityViewHolder.binding.datetime.setText(DateFormat.format("HH:mm", activity.getDatetime().getTime()));
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -195,9 +195,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 gridViewHolder.itemLayout.setOnClickListener(v -> localFileListFragmentInterface
                     .onItemClicked(finalFile));
 
-                if (holder instanceof LocalFileListItemViewHolder) {
-                    LocalFileListItemViewHolder itemViewHolder = (LocalFileListItemViewHolder) holder;
-
+                if (holder instanceof LocalFileListItemViewHolder itemViewHolder) {
                     if (file.isDirectory()) {
                         itemViewHolder.fileSize.setVisibility(View.GONE);
                         itemViewHolder.fileSeparator.setVisibility(View.GONE);
@@ -213,8 +211,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                             file.lastModified()));
                 }
 
-                if (gridViewHolder instanceof LocalFileListGridItemViewHolder) {
-                    LocalFileListGridItemViewHolder itemVH = (LocalFileListGridItemViewHolder) gridViewHolder;
+                if (gridViewHolder instanceof LocalFileListGridItemViewHolder itemVH) {
                     itemVH.fileName.setText(file.getName());
 
                     if (gridView && (MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file) ||
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -924,8 +924,7 @@ private void parseShares(List<Object> objects) {
 
         for (Object shareObject : objects) {
             // check type before cast as of long running data fetch it is possible that old result is filled
-            if (shareObject instanceof OCShare) {
-                OCShare ocShare = (OCShare) shareObject;
+            if (shareObject instanceof OCShare ocShare) {
                 shares.add(ocShare);
             }
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java
@@ -119,8 +119,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof TrashbinFileViewHolder) {
-            final TrashbinFileViewHolder trashbinFileViewHolder = (TrashbinFileViewHolder) holder;
+        if (holder instanceof TrashbinFileViewHolder trashbinFileViewHolder) {
             TrashbinFile file = files.get(position);
 
             // layout
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -385,8 +385,7 @@ public boolean onScale(ScaleGestureDetector detector) {
     }
 
     protected void setGridViewColumns(float scaleFactor) {
-        if (mRecyclerView.getLayoutManager() instanceof GridLayoutManager) {
-            GridLayoutManager gridLayoutManager = (GridLayoutManager) mRecyclerView.getLayoutManager();
+        if (mRecyclerView.getLayoutManager() instanceof GridLayoutManager gridLayoutManager) {
             if (mScale == -1f) {
                 gridLayoutManager.setSpanCount(GridView.AUTO_FIT);
                 mScale = gridLayoutManager.getSpanCount();
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -429,8 +429,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         setTitle();
 
         FragmentActivity fragmentActivity;
-        if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity) {
-            FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) fragmentActivity;
+        if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity fileDisplayActivity) {
             fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir());
         }
         listDirectory(MainApp.isOnlyOnDevice(), false);
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsAccount.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsAccount.java
@@ -24,8 +24,7 @@ public class ContactsAccount {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof ContactsAccount) {
-            ContactsAccount other = (ContactsAccount) obj;
+        if (obj instanceof ContactsAccount other) {
             return this.name.equalsIgnoreCase(other.name) && this.type.equalsIgnoreCase(other.type);
         } else {
             return false;
diff --git a/app/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/app/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -425,11 +425,10 @@ public Color(int a, int r, int g, int b) {
 
         @Override
         public boolean equals(@Nullable Object obj) {
-            if (!(obj instanceof Color)) {
+            if (!(obj instanceof Color other)) {
                 return false;
             }
 
-            Color other = (Color) obj;
             return this.r == other.r && this.g == other.g && this.b == other.b;
         }
 
@@ -496,8 +495,7 @@ public static Bitmap drawableToBitmap(Drawable drawable) {
 
     @NonNull
     public static Bitmap drawableToBitmap(Drawable drawable, int desiredWidth, int desiredHeight) {
-        if (drawable instanceof BitmapDrawable) {
-            BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
+        if (drawable instanceof BitmapDrawable bitmapDrawable) {
             if (bitmapDrawable.getBitmap() != null) {
                 return bitmapDrawable.getBitmap();
             }

Original file line number	Diff line number	Diff line change
`@@ -924,8 +924,7 @@ private void parseShares(List<Object> objects) {`
`924`	`924`
`925`	`925`	`for (Object shareObject : objects) {`
`926`	`926`	`// check type before cast as of long running data fetch it is possible that old result is filled`
`927`		`- if (shareObject instanceof OCShare) {`
`928`		`- OCShare ocShare = (OCShare) shareObject;`
	`927`	`+ if (shareObject instanceof OCShare ocShare) {`
`929`	`928`	`shares.add(ocShare);`
`930`	`929`	`}`
`931`	`930`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,8 +385,7 @@ public boolean onScale(ScaleGestureDetector detector) {`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`protected void setGridViewColumns(float scaleFactor) {`
`388`		`- if (mRecyclerView.getLayoutManager() instanceof GridLayoutManager) {`
`389`		`- GridLayoutManager gridLayoutManager = (GridLayoutManager) mRecyclerView.getLayoutManager();`
	`388`	`+ if (mRecyclerView.getLayoutManager() instanceof GridLayoutManager gridLayoutManager) {`
`390`	`389`	`if (mScale == -1f) {`
`391`	`390`	`gridLayoutManager.setSpanCount(GridView.AUTO_FIT);`
`392`	`391`	`mScale = gridLayoutManager.getSpanCount();`