Merge pull request nextcloud#14948 from nextcloud/javawarnings

alperozturk96 · web-flow · commit 94d64aaa7382 · 2025-08-22T08:59:21.000+02:00
Various Small Optimizations
diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
@@ -173,9 +173,7 @@ private static void waitForServer(OwnCloudClient client, Uri baseUrl) {
                 Assert.fail("Server not ready!");
             }
 
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (InterruptedException e) {
+        } catch (IOException | InterruptedException e) {
             e.printStackTrace();
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -573,7 +573,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return 31 * (int) (fileId ^ (fileId >>> 32)) + (int) (parentId ^ (parentId >>> 32));
+        return Objects.hash(fileId,parentId);
     }
 
     @NonNull
@@ -1093,11 +1093,7 @@ public long getE2eCounter() {
     }
 
     public void setE2eCounter(@Nullable Long e2eCounter) {
-        if (e2eCounter == null) {
-            this.e2eCounter = -1;
-        } else {
-            this.e2eCounter = e2eCounter;
-        }
+        this.e2eCounter = Objects.requireNonNullElse(e2eCounter, -1L);
     }
 
     public boolean isInternalFolderSync() {
diff --git a/app/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java
@@ -125,60 +125,59 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String FILE_INTERNAL_TWO_WAY_SYNC_TIMESTAMP = "internal_two_way_sync_timestamp";
         public static final String FILE_INTERNAL_TWO_WAY_SYNC_RESULT = "internal_two_way_sync_result";
 
-        public static final List<String> FILE_ALL_COLUMNS = Collections.unmodifiableList(Arrays.asList(
-            _ID,
-            FILE_PARENT,
-            FILE_NAME,
-            FILE_ENCRYPTED_NAME,
-            FILE_UPLOADED,
-            FILE_CREATION,
-            FILE_MODIFIED,
-            FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA,
-            FILE_CONTENT_LENGTH,
-            FILE_CONTENT_TYPE,
-            FILE_STORAGE_PATH,
-            FILE_PATH,
-            FILE_PATH_DECRYPTED,
-            FILE_ACCOUNT_OWNER,
-            FILE_LAST_SYNC_DATE,
-            FILE_LAST_SYNC_DATE_FOR_DATA,
-            FILE_KEEP_IN_SYNC,
-            FILE_ETAG,
-            FILE_ETAG_ON_SERVER,
-            FILE_SHARED_VIA_LINK,
-            FILE_SHARED_WITH_SHAREE,
-            FILE_PERMISSIONS,
-            FILE_REMOTE_ID,
-            FILE_LOCAL_ID,
-            FILE_UPDATE_THUMBNAIL,
-            FILE_IS_DOWNLOADING,
-            FILE_ETAG_IN_CONFLICT,
-            FILE_FAVORITE,
-            FILE_HIDDEN,
-            FILE_IS_ENCRYPTED,
-            FILE_MOUNT_TYPE,
-            FILE_HAS_PREVIEW,
-            FILE_UNREAD_COMMENTS_COUNT,
-            FILE_OWNER_ID,
-            FILE_OWNER_DISPLAY_NAME,
-            FILE_NOTE,
-            FILE_SHAREES,
-            FILE_RICH_WORKSPACE,
-            FILE_LOCKED,
-            FILE_LOCK_TYPE,
-            FILE_LOCK_OWNER,
-            FILE_LOCK_OWNER_DISPLAY_NAME,
-            FILE_LOCK_OWNER_EDITOR,
-            FILE_LOCK_TIMESTAMP,
-            FILE_LOCK_TIMEOUT,
-            FILE_LOCK_TOKEN,
-            FILE_METADATA_SIZE,
-            FILE_METADATA_LIVE_PHOTO,
-            FILE_E2E_COUNTER,
-            FILE_TAGS,
-            FILE_METADATA_GPS,
-            FILE_INTERNAL_TWO_WAY_SYNC_TIMESTAMP,
-            FILE_INTERNAL_TWO_WAY_SYNC_RESULT));
+        public static final List<String> FILE_ALL_COLUMNS = List.of(_ID,
+                                                                    FILE_PARENT,
+                                                                    FILE_NAME,
+                                                                    FILE_ENCRYPTED_NAME,
+                                                                    FILE_UPLOADED,
+                                                                    FILE_CREATION,
+                                                                    FILE_MODIFIED,
+                                                                    FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA,
+                                                                    FILE_CONTENT_LENGTH,
+                                                                    FILE_CONTENT_TYPE,
+                                                                    FILE_STORAGE_PATH,
+                                                                    FILE_PATH,
+                                                                    FILE_PATH_DECRYPTED,
+                                                                    FILE_ACCOUNT_OWNER,
+                                                                    FILE_LAST_SYNC_DATE,
+                                                                    FILE_LAST_SYNC_DATE_FOR_DATA,
+                                                                    FILE_KEEP_IN_SYNC,
+                                                                    FILE_ETAG,
+                                                                    FILE_ETAG_ON_SERVER,
+                                                                    FILE_SHARED_VIA_LINK,
+                                                                    FILE_SHARED_WITH_SHAREE,
+                                                                    FILE_PERMISSIONS,
+                                                                    FILE_REMOTE_ID,
+                                                                    FILE_LOCAL_ID,
+                                                                    FILE_UPDATE_THUMBNAIL,
+                                                                    FILE_IS_DOWNLOADING,
+                                                                    FILE_ETAG_IN_CONFLICT,
+                                                                    FILE_FAVORITE,
+                                                                    FILE_HIDDEN,
+                                                                    FILE_IS_ENCRYPTED,
+                                                                    FILE_MOUNT_TYPE,
+                                                                    FILE_HAS_PREVIEW,
+                                                                    FILE_UNREAD_COMMENTS_COUNT,
+                                                                    FILE_OWNER_ID,
+                                                                    FILE_OWNER_DISPLAY_NAME,
+                                                                    FILE_NOTE,
+                                                                    FILE_SHAREES,
+                                                                    FILE_RICH_WORKSPACE,
+                                                                    FILE_LOCKED,
+                                                                    FILE_LOCK_TYPE,
+                                                                    FILE_LOCK_OWNER,
+                                                                    FILE_LOCK_OWNER_DISPLAY_NAME,
+                                                                    FILE_LOCK_OWNER_EDITOR,
+                                                                    FILE_LOCK_TIMESTAMP,
+                                                                    FILE_LOCK_TIMEOUT,
+                                                                    FILE_LOCK_TOKEN,
+                                                                    FILE_METADATA_SIZE,
+                                                                    FILE_METADATA_LIVE_PHOTO,
+                                                                    FILE_E2E_COUNTER,
+                                                                    FILE_TAGS,
+                                                                    FILE_METADATA_GPS,
+                                                                    FILE_INTERNAL_TWO_WAY_SYNC_TIMESTAMP,
+                                                                    FILE_INTERNAL_TWO_WAY_SYNC_RESULT);
         public static final String FILE_DEFAULT_SORT_ORDER = FILE_NAME + " collate nocase asc";
 
         // Columns of ocshares table
diff --git a/app/src/main/java/com/owncloud/android/files/services/IndexedForest.java b/app/src/main/java/com/owncloud/android/files/services/IndexedForest.java
@@ -215,14 +215,7 @@ public V get(String accountName, String remotePath) {
      * @param accountName
      */
     public void remove(String accountName){
-        Iterator<String> it = mMap.keySet().iterator();
-        while (it.hasNext()) {
-            String key = it.next();
-            Log_OC.d("IndexedForest", "Number of pending downloads= "  + mMap.size());
-            if (key.startsWith(accountName)) {
-                mMap.remove(key);
-            }
-        }
+        mMap.keySet().removeIf(key -> key.startsWith(accountName));
     }
 
     /**
diff --git a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
@@ -196,10 +196,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         downloadOperation = new DownloadFileRemoteOperation(file.getRemotePath(), tmpFolder);
 
         if (downloadType == DownloadType.DOWNLOAD) {
-            Iterator<OnDatatransferProgressListener> listener = dataTransferListeners.iterator();
-            while (listener.hasNext()) {
-                downloadOperation.addDatatransferProgressListener(listener.next());
-            }
+            dataTransferListeners.forEach(downloadOperation::addDatatransferProgressListener);
         }
 
         result = downloadOperation.execute(client);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -710,9 +710,7 @@ public static void showDevSnackbar(Activity activity,
             } else {
                 Snackbar.make(activity.findViewById(android.R.id.content), R.string.dev_version_new_version_available,
                               Snackbar.LENGTH_LONG)
-                    .setAction(activity.getString(R.string.version_dev_download), v -> {
-                        DisplayUtils.startLinkIntent(activity, devApkLink);
-                    }).show();
+                    .setAction(activity.getString(R.string.version_dev_download), v -> DisplayUtils.startLinkIntent(activity, devApkLink)).show();
             }
         } else {
             if (!inBackground) {
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -636,23 +636,22 @@ private String internetShortcutDesktopText(String url, String filename) {
 
         @Nullable
         private File createTempFile(String text) {
-            File file = new File(getActivity().getCacheDir(), "tmp.tmp");
-            FileWriter fw = null;
-            try {
-                fw = new FileWriter(file);
+            final var activity = getActivity();
+            if (activity == null) {
+                return null;
+            }
+
+            final var cacheDir = activity.getCacheDir();
+
+            File file = new File(cacheDir, "tmp.tmp");
+
+            try (FileWriter fw = new FileWriter(file)) {
                 fw.write(text);
             } catch (IOException e) {
                 Log_OC.d(TAG, "Error ", e);
                 return null;
-            } finally {
-                if (fw != null) {
-                    try {
-                        fw.close();
-                    } catch (IOException e) {
-                        Log_OC.d(TAG, "Error closing file writer ", e);
-                    }
-                }
             }
+
             return file;
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java b/app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java
@@ -168,12 +168,7 @@ private ProgressDialog createMigrationProgressDialog() {
         progressDialog.setButton(
                 ProgressDialog.BUTTON_POSITIVE,
                 mContext.getString(R.string.drawer_close),
-                new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        dialogInterface.dismiss();
-                    }
-                });
+                (dialogInterface, i) -> dialogInterface.dismiss());
         return progressDialog;
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -343,9 +343,7 @@ private class UploadMessagesReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
 
-            throttler.run("update_upload_list", () -> {
-                uploadListAdapter.loadUploadItemsFromDb();
-            });
+            throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb());
         }
     }
 }
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
@@ -60,7 +60,7 @@ public void setActivityAndVersionItems(List<Object> items, NextcloudClient newCl
         }
         if (clear) {
             values.clear();
-            Collections.sort(items, (o1, o2) -> {
+            items.sort((o1, o2) -> {
                 long o1Date;
                 long o2Date;
                 if (o1 instanceof Activity) {
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java b/app/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java
@@ -49,14 +49,8 @@ public DiskLruImageCache(File diskCacheDir, int diskCacheSize, CompressFormat co
     }
 
     private boolean writeBitmapToFile(Bitmap bitmap, DiskLruCache.Editor editor) throws IOException {
-        OutputStream out = null;
-        try {
-            out = new BufferedOutputStream(editor.newOutputStream(0), IO_BUFFER_SIZE);
+        try (OutputStream out = new BufferedOutputStream(editor.newOutputStream(0), IO_BUFFER_SIZE)) {
             return bitmap.compress(mCompressFormat, mCompressQuality, out);
-        } finally {
-            if (out != null) {
-                out.close();
-            }
         }
     }
 
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
@@ -261,9 +261,7 @@ public void setFavoriteAttributeForItemID(String remotePath, boolean favorite, b
 
         FileSortOrder sortOrder = preferences.getSortOrderByFolder(currentDirectory);
         if (searchType == SearchType.SHARED_FILTER) {
-            Collections.sort(mFiles,
-                             (o1, o2) -> Long.compare(o2.getFirstShareTimestamp(), o1.getFirstShareTimestamp())
-                            );
+            mFiles.sort((o1, o2) -> Long.compare(o2.getFirstShareTimestamp(), o1.getFirstShareTimestamp()));
         } else {
             mFiles = sortOrder.sortCloudFiles(mFiles);
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/LoadContactsTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/LoadContactsTask.java
@@ -49,7 +49,7 @@ protected Boolean doInBackground(Void... voids) {
             File file = new File(ocFile.getStoragePath());
             try {
                 vCards.addAll(Ezvcard.parse(new BufferedInputStream(Files.newInputStream(file.toPath()))).all());
-                Collections.sort(vCards, new VCardComparator());
+                vCards.sort(new VCardComparator());
             } catch (IOException e) {
                 Log_OC.e(this, "IO Exception: " + file.getAbsolutePath());
                 return Boolean.FALSE;
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
@@ -647,9 +647,7 @@ public void onShareIconClick(OCFile file) {
         if (file.isFolder()) {
             mContainerActivity.showDetails(file, 1);
         } else {
-            throttler.run("shareIconClick", () -> {
-                mContainerActivity.getFileOperationsHelper().sendShareFile(file);
-            });
+            throttler.run("shareIconClick", () -> mContainerActivity.getFileOperationsHelper().sendShareFile(file));
         }
     }
 
diff --git a/app/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/app/src/main/java/com/owncloud/android/utils/BitmapUtils.java
@@ -85,9 +85,7 @@ private static Bitmap decodeSampledBitmapViaImageDecoder(@NonNull File file, int
 
             final var imageDecoderSource = ImageDecoder.createSource(file);
 
-            return ImageDecoder.decodeBitmap(imageDecoderSource, (decoder, info, source1) -> {
-                decoder.setTargetSize(reqWidth, reqHeight);
-            }
+            return ImageDecoder.decodeBitmap(imageDecoderSource, (decoder, info, source1) -> decoder.setTargetSize(reqWidth, reqHeight)
             );
 
         } catch (IOException exception) {
diff --git a/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
@@ -330,9 +330,7 @@ public static RemoteFile fillRemoteFile(OCFile ocFile) {
 
     public static List<OCFile> sortOcFolderDescDateModifiedWithoutFavoritesFirst(List<OCFile> files) {
         final int multiplier = -1;
-        Collections.sort(files, (o1, o2) -> {
-            return multiplier * Long.compare(o1.getModificationTimestamp(),o2.getModificationTimestamp());
-        });
+        files.sort((o1, o2) -> multiplier * Long.compare(o1.getModificationTimestamp(), o2.getModificationTimestamp()));
 
         return files;
     }
diff --git a/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java b/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
@@ -325,13 +325,11 @@ public static void restartUploadsIfNeeded(final UploadsStorageManager uploadsSto
                                               final ConnectivityService connectivityService,
                                               final PowerManagementService powerManagementService) {
         Log_OC.d(TAG, "restartUploadsIfNeeded, called");
-        new Thread(() -> {
-            FileUploadHelper.Companion.instance().retryFailedUploads(
-                uploadsStorageManager,
-                connectivityService,
-                accountManager,
-                powerManagementService);
-        }).start();
+        new Thread(() -> FileUploadHelper.Companion.instance().retryFailedUploads(
+            uploadsStorageManager,
+            connectivityService,
+            accountManager,
+            powerManagementService)).start();
     }
 
     public static void scheduleFilesSyncForAllFoldersIfNeeded(Context context, SyncedFolderProvider syncedFolderProvider, BackgroundJobManager jobManager) {
diff --git a/app/src/main/java/third_parties/ezvcard_android/ContactOperations.java b/app/src/main/java/third_parties/ezvcard_android/ContactOperations.java
@@ -570,11 +570,7 @@ private <T extends VCardProperty> Map<String, List<T>> orderPropertiesByGroup(It
                 continue;
             }
 
-            List<T> groupPropertiesList = groupedProperties.get(group);
-            if (groupPropertiesList == null) {
-                groupPropertiesList = new ArrayList<>();
-                groupedProperties.put(group, groupPropertiesList);
-            }
+            List<T> groupPropertiesList = groupedProperties.computeIfAbsent(group, k -> new ArrayList<>());
             groupPropertiesList.add(property);
         }
 
diff --git a/app/src/main/java/third_parties/ezvcard_android/DataMappings.java b/app/src/main/java/third_parties/ezvcard_android/DataMappings.java

Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,7 @@ private static void waitForServer(OwnCloudClient client, Uri baseUrl) {`
`173`	`173`	`Assert.fail("Server not ready!");`
`174`	`174`	`}`
`175`	`175`
`176`		`- } catch (IOException e) {`
`177`		`- e.printStackTrace();`
`178`		`- } catch (InterruptedException e) {`
	`176`	`+ } catch (IOException \| InterruptedException e) {`
`179`	`177`	`e.printStackTrace();`
`180`	`178`	`}`
`181`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ public boolean equals(Object o) {`
`573`	`573`
`574`	`574`	`@Override`
`575`	`575`	`public int hashCode() {`
`576`		`- return 31 * (int) (fileId ^ (fileId >>> 32)) + (int) (parentId ^ (parentId >>> 32));`
	`576`	`+ return Objects.hash(fileId,parentId);`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`@NonNull`
`@@ -1093,11 +1093,7 @@ public long getE2eCounter() {`
`1093`	`1093`	`}`
`1094`	`1094`
`1095`	`1095`	`public void setE2eCounter(@Nullable Long e2eCounter) {`
`1096`		`- if (e2eCounter == null) {`
`1097`		`- this.e2eCounter = -1;`
`1098`		`- } else {`
`1099`		`- this.e2eCounter = e2eCounter;`
`1100`		`- }`
	`1096`	`+ this.e2eCounter = Objects.requireNonNullElse(e2eCounter, -1L);`
`1101`	`1097`	`}`
`1102`	`1098`
`1103`	`1099`	`public boolean isInternalFolderSync() {`
Original file line number	Diff line number	Diff line change
`@@ -343,9 +343,7 @@ private class UploadMessagesReceiver extends BroadcastReceiver {`
`343`	`343`	`@Override`
`344`	`344`	`public void onReceive(Context context, Intent intent) {`
`345`	`345`
`346`		`- throttler.run("update_upload_list", () -> {`
`347`		`- uploadListAdapter.loadUploadItemsFromDb();`
`348`		`- });`
	`346`	`+ throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb());`
`349`	`347`	`}`
`350`	`348`	`}`
`351`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void setActivityAndVersionItems(List<Object> items, NextcloudClient newCl`
`60`	`60`	`}`
`61`	`61`	`if (clear) {`
`62`	`62`	`values.clear();`
`63`		`- Collections.sort(items, (o1, o2) -> {`
	`63`	`+ items.sort((o1, o2) -> {`
`64`	`64`	`long o1Date;`
`65`	`65`	`long o2Date;`
`66`	`66`	`if (o1 instanceof Activity) {`