Skip to content

Commit 1123180

Browse files
tobiasKaminskytobiasKaminsky
authored
Merge pull request #17544 from nextcloud/renovate/spotless
Update dependency com.diffplug.spotless to v8.10.1
2 parents 21add72 + bbaf1bf commit 1123180

2 files changed

Lines changed: 26 additions & 19 deletions

File tree

‎app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
133133
private final long footerId = UUID.randomUUID().getLeastSignificantBits();
134134
private final long headerId = UUID.randomUUID().getLeastSignificantBits();
135135

136-
private List<OCFile> recommendedFiles = new ArrayList<>();
136+
private final List<OCFile> recommendedFiles = new ArrayList<>();
137137
private RecommendedFilesAdapter recommendedFilesAdapter;
138138
private final OCFileListAdapterHelper helper = new OCFileListAdapterHelper();
139139
private final ThumbnailGenerator thumbnailGenerator;
@@ -189,7 +189,7 @@ public OCFileListAdapter(
189189

190190
setHasStableIds(true);
191191

192-
// initialise thumbnails cache on background thread
192+
// initialize thumbnails cache on background thread
193193
ThumbnailsCacheManager.initDiskCacheAsync();
194194
isRTL = DisplayUtils.isRTL();
195195
}
@@ -936,6 +936,7 @@ public void setSortOrder(@Nullable OCFile folder, @NonNull FileSortOrder sortOrd
936936
this.sortOrder = sortOrder;
937937
}
938938

939+
@NonNull
939940
public Set<OCFile> getCheckedItems() {
940941
return ocFileListDelegate.getCheckedItems();
941942
}
@@ -997,15 +998,15 @@ public boolean shouldCallGeneratedCallback(String tag, Object callContext) {
997998
return ((ImageView) callContext).getTag().equals(tag);
998999
}
9991000

1000-
public boolean isCheckedFile(OCFile file) {
1001+
public boolean isCheckedFile(@NonNull OCFile file) {
10011002
return ocFileListDelegate.isCheckedFile(file);
10021003
}
10031004

1004-
public void addCheckedFile(OCFile file) {
1005+
public void addCheckedFile(@NonNull OCFile file) {
10051006
ocFileListDelegate.addCheckedFile(file);
10061007
}
10071008

1008-
public void setHighlightedItem(OCFile file) {
1009+
public void setHighlightedItem(@NonNull OCFile file) {
10091010
ocFileListDelegate.setHighlightedItem(file);
10101011
}
10111012

@@ -1023,7 +1024,7 @@ public void setShowMetadata(boolean bool) {
10231024

10241025
@NonNull
10251026
@Override
1026-
public String getPopupText(View view, int position) {
1027+
public String getPopupText(@NonNull View view, int position) {
10271028
OCFile file = getItem(position);
10281029

10291030
if (file == null || sortOrder == null) {
@@ -1073,7 +1074,8 @@ public void setCurrentDirectory(OCFile folder) {
10731074
// payload only for local file indicator
10741075
@Override
10751076
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
1076-
if (!payloads.isEmpty() && payloads.get(0) instanceof Integer iconId && holder instanceof ListViewHolder listViewHolder) {
1077+
if (!payloads.isEmpty() && payloads.get(0) instanceof Integer iconId &&
1078+
holder instanceof ListViewHolder listViewHolder) {
10771079
listViewHolder.getLocalFileIndicator().setImageResource(iconId);
10781080
listViewHolder.getLocalFileIndicator().setVisibility(View.VISIBLE);
10791081
// skip full rebind

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ protected enum MenuItemAddRemove {
241241

242242
protected MenuItemAddRemove menuItemAddRemoveValue = MenuItemAddRemove.ADD_GRID_AND_SORT_WITH_SEARCH;
243243

244-
private List<MenuItem> mOriginalMenuItems = new ArrayList<>();
244+
private final List<MenuItem> mOriginalMenuItems = new ArrayList<>();
245245

246246
private static OCFileDepth fileDepth = OCFileDepth.Root;
247247

@@ -311,14 +311,14 @@ public void onAttach(@NonNull Context context) {
311311
try {
312312
mContainerActivity = (FileFragment.ContainerActivity) context;
313313
} catch (ClassCastException e) {
314-
throw new IllegalArgumentException(context.toString() + " must implement " +
314+
throw new IllegalArgumentException(context + " must implement " +
315315
FileFragment.ContainerActivity.class.getSimpleName(), e);
316316
}
317317
try {
318318
setOnRefreshListener((OnEnforceableRefreshListener) context);
319319

320320
} catch (ClassCastException e) {
321-
throw new IllegalArgumentException(context.toString() + " must implement " +
321+
throw new IllegalArgumentException(context + " must implement " +
322322
OnEnforceableRefreshListener.class.getSimpleName(), e);
323323
}
324324
}
@@ -577,7 +577,7 @@ public void uploadFromApp() {
577577
action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
578578
action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
579579

580-
getActivity().startActivityForResult(
580+
requireActivity().startActivityForResult(
581581
Intent.createChooser(action, getString(R.string.upload_chooser_title)),
582582
FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS
583583
);
@@ -767,8 +767,9 @@ public void onHeaderClicked() {
767767
}
768768

769769
@Override
770-
public void showTemplate(@NonNull Creator creator, @NonNull String headline) {
771-
ChooseTemplateDialogFragment.newInstance(mFile, creator, headline).show(requireActivity().getSupportFragmentManager(),
770+
public void showTemplate(Creator creator, String headline) {
771+
ChooseTemplateDialogFragment.newInstance(mFile, creator, headline).show(requireActivity()
772+
.getSupportFragmentManager(),
772773
DIALOG_CREATE_DOCUMENT);
773774
}
774775

@@ -910,7 +911,9 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
910911
final int checkedCount = checkedFiles.size();
911912

912913
if (mActiveActionMode != null) {
913-
String title = getResources().getQuantityString(R.plurals.items_selected_count, checkedCount, checkedCount);
914+
String title = getResources().getQuantityString(R.plurals.items_selected_count,
915+
checkedCount,
916+
checkedCount);
914917
mActiveActionMode.setTitle(title);
915918
}
916919

@@ -984,7 +987,7 @@ protected void setChoiceModeAsMultipleModal(Bundle savedInstanceState) {
984987
if (savedInstanceState != null) {
985988
mMultiChoiceModeListener.loadStateFrom(savedInstanceState);
986989
}
987-
((FileActivity) getActivity()).addDrawerListener(mMultiChoiceModeListener);
990+
((FileActivity) requireActivity()).addDrawerListener(mMultiChoiceModeListener);
988991
}
989992

990993
/**
@@ -1132,7 +1135,9 @@ public boolean onLongItemClicked(OCFile file) {
11321135

11331136
private void folderOnItemClick(OCFile file, int position) {
11341137
if (requireActivity() instanceof FolderPickerActivity fpa) {
1135-
String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), getCapabilities(), requireContext());
1138+
String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(),
1139+
getCapabilities(),
1140+
requireContext());
11361141
if (filenameErrorMessage != null) {
11371142
DisplayUtils.showSnackMessage(fpa, filenameErrorMessage);
11381143
return;
@@ -1329,7 +1334,7 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set<OCFile> checkedFi
13291334
return true;
13301335
} else if (itemId == R.id.action_rename_file) {
13311336
RenameFileDialogFragment dialog = RenameFileDialogFragment.newInstance(singleFile, mFile);
1332-
dialog.show(getFragmentManager(), FileDetailFragment.FTAG_RENAME_FILE);
1337+
dialog.show(requireFragmentManager(), FileDetailFragment.FTAG_RENAME_FILE);
13331338
return true;
13341339
} else if (itemId == R.id.action_see_details) {
13351340
if (mActiveActionMode != null) {
@@ -1368,7 +1373,7 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set<OCFile> checkedFi
13681373
if (itemId == R.id.action_remove_file) {
13691374
RemoveFilesDialogFragment dialog =
13701375
RemoveFilesDialogFragment.newInstance(new ArrayList<>(checkedFiles), mActiveActionMode);
1371-
dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
1376+
dialog.show(requireFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
13721377
return true;
13731378
} else if (itemId == R.id.action_download_file || itemId == R.id.action_sync_file) {
13741379
syncAndCheckFiles(checkedFiles);
@@ -1462,7 +1467,7 @@ private void pickFolderForMoveOrCopy(final Set<OCFile> checkedFiles) {
14621467
action.putExtra(FolderPickerActivity.EXTRA_FOLDER, getCurrentFile());
14631468
action.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); // No animation since we stay in the same folder
14641469
action.putExtra(FolderPickerActivity.EXTRA_ACTION, extraAction);
1465-
getActivity().startActivityForResult(action, requestCode);
1470+
requireActivity().startActivityForResult(action, requestCode);
14661471
}
14671472

14681473

0 commit comments

Comments
 (0)