mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix code analytics

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2023-10-25 14:16:27 +02:00
parent bfccb3bd38
commit 497faaa3c9
No known key found for this signature in database
GPG key ID: 4E577DC593B59BDF
2 changed files with 66 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java
View file

@ -21,6 +21,7 @@
package com.owncloud.android.ui.asynctasks; package com.owncloud.android.ui.asynctasks;
import android.annotation.SuppressLint;
import android.os.AsyncTask; import android.os.AsyncTask;
import com.nextcloud.client.account.User; import com.nextcloud.client.account.User;
@ -42,6 +43,8 @@ public class FetchRemoteFileTask extends AsyncTask<Void, Void, String> {
private final User user; private final User user;
private final String fileId; private final String fileId;
private final FileDataStorageManager storageManager; private final FileDataStorageManager storageManager;
@SuppressLint("StaticFieldLeak")
private final FileDisplayActivity fileDisplayActivity; private final FileDisplayActivity fileDisplayActivity;
public FetchRemoteFileTask(User user, public FetchRemoteFileTask(User user,

127
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -61,7 +61,6 @@ import com.nextcloud.client.documentscan.DocumentScanActivity;
import com.nextcloud.client.editimage.EditImageActivity; import com.nextcloud.client.editimage.EditImageActivity;
import com.nextcloud.client.jobs.BackgroundJobManager; import com.nextcloud.client.jobs.BackgroundJobManager;
import com.nextcloud.client.network.ClientFactory; import com.nextcloud.client.network.ClientFactory;
import com.nextcloud.client.network.ConnectivityObserver;
import com.nextcloud.client.preferences.AppPreferences; import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.client.utils.Throttler; import com.nextcloud.client.utils.Throttler;
import com.nextcloud.common.NextcloudClient; import com.nextcloud.common.NextcloudClient;
@ -268,7 +267,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
return; return;
} }
Intent intent = getActivity().getIntent(); Intent intent = requireActivity().getIntent();
if (intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT) != null) { if (intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT) != null) {
searchEvent = intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT); searchEvent = intent.getParcelableExtra(OCFileListFragment.SEARCH_EVENT);
@ -289,19 +288,20 @@ public class OCFileListFragment extends ExtendedListFragment implements
public void onAttach(@NonNull Context context) { public void onAttach(@NonNull Context context) {
super.onAttach(context); super.onAttach(context);
Log_OC.i(TAG, "onAttach"); Log_OC.i(TAG, "onAttach");
try { try {
mContainerActivity = (FileFragment.ContainerActivity) context; mContainerActivity = (FileFragment.ContainerActivity) context;
setTitle(); setTitle();
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new IllegalArgumentException(context.toString() + " must implement " + throw new IllegalArgumentException(context + " must implement " +
FileFragment.ContainerActivity.class.getSimpleName(), e); FileFragment.ContainerActivity.class.getSimpleName(), e);
} }
try { try {
setOnRefreshListener((OnEnforceableRefreshListener) context); setOnRefreshListener((OnEnforceableRefreshListener) context);
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new IllegalArgumentException(context.toString() + " must implement " + throw new IllegalArgumentException(context + " must implement " +
OnEnforceableRefreshListener.class.getSimpleName(), e); OnEnforceableRefreshListener.class.getSimpleName(), e);
} }
} }
@ -422,8 +422,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
setTitle(); setTitle();
FragmentActivity fragmentActivity; FragmentActivity fragmentActivity;
if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity) { if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity fileDisplayActivity) {
FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) fragmentActivity;
fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir()); fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir());
} }
listDirectory(MainApp.isOnlyOnDevice(), false); listDirectory(MainApp.isOnlyOnDevice(), false);
@ -433,7 +432,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
boolean hideItemOptions = args != null && args.getBoolean(ARG_HIDE_ITEM_OPTIONS, false); boolean hideItemOptions = args != null && args.getBoolean(ARG_HIDE_ITEM_OPTIONS, false);
mAdapter = new OCFileListAdapter( mAdapter = new OCFileListAdapter(
getActivity(), requireActivity(),
accountManager.getUser(), accountManager.getUser(),
preferences, preferences,
syncedFolderProvider, syncedFolderProvider,
@ -482,7 +481,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
* register listener on FAB. * register listener on FAB.
*/ */
public void registerFabListener() { public void registerFabListener() {
FileActivity activity = (FileActivity) getActivity(); FileActivity activity = (FileActivity) requireActivity();
if (mFabMain != null) { if (mFabMain != null) {
// is not available in FolderPickerActivity // is not available in FolderPickerActivity
@ -509,7 +508,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
@Override @Override
public void createFolder() { public void createFolder() {
CreateFolderDialogFragment.newInstance(mFile) CreateFolderDialogFragment.newInstance(mFile)
.show(getActivity().getSupportFragmentManager(), DIALOG_CREATE_FOLDER); .show(requireActivity().getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
} }
@Override @Override
@ -518,10 +517,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE); action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); action.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
getActivity().startActivityForResult( requireActivity().startActivityForResult(
Intent.createChooser(action, getString(R.string.upload_chooser_title)), Intent.createChooser(action, getString(R.string.upload_chooser_title)),
FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS FileDisplayActivity.REQUEST_CODE__SELECT_CONTENT_FROM_APPS);
);
} }
@Override @Override
@ -559,11 +557,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
@Override @Override
public void uploadFiles() { public void uploadFiles() {
UploadFilesActivity.startUploadActivityForResult( UploadFilesActivity.startUploadActivityForResult(
getActivity(), requireActivity(),
((FileActivity) getActivity()).getUser().orElseThrow(RuntimeException::new), ((FileActivity) requireActivity()).getUser().orElseThrow(RuntimeException::new),
FileDisplayActivity.REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM, FileDisplayActivity.REQUEST_CODE__SELECT_FILES_FROM_FILE_SYSTEM, getCurrentFile().isEncrypted());
getCurrentFile().isEncrypted()
);
} }
@Override @Override
@ -697,7 +693,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
@Override @Override
public void onDrawerClosed(@NonNull View drawerView) { public void onDrawerClosed(@NonNull View drawerView) {
if (mActionModeClosedByDrawer && mSelectionWhenActionModeClosedByDrawer.size() > 0) { if (mActionModeClosedByDrawer && mSelectionWhenActionModeClosedByDrawer.size() > 0) {
FragmentActivity actionBarActivity = getActivity(); FragmentActivity actionBarActivity = requireActivity();
actionBarActivity.startActionMode(mMultiChoiceModeListener); actionBarActivity.startActionMode(mMultiChoiceModeListener);
getAdapter().setCheckedItem(mSelectionWhenActionModeClosedByDrawer); getAdapter().setCheckedItem(mSelectionWhenActionModeClosedByDrawer);
@ -742,16 +738,19 @@ public class OCFileListFragment extends ExtendedListFragment implements
mIsActionModeNew = true; mIsActionModeNew = true;
// fake menu to be able to use bottom sheet instead // fake menu to be able to use bottom sheet instead
MenuInflater inflater = getActivity().getMenuInflater(); MenuInflater inflater = requireActivity().getMenuInflater();
inflater.inflate(R.menu.custom_menu_placeholder, menu); inflater.inflate(R.menu.custom_menu_placeholder, menu);
final MenuItem item = menu.findItem(R.id.custom_menu_placeholder_item); final MenuItem item = menu.findItem(R.id.custom_menu_placeholder_item);
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.white)));
if (item.getIcon() != null) {
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.white)));
}
mode.invalidate(); mode.invalidate();
//set actionMode color //set actionMode color
viewThemeUtils.platform.colorStatusBar( viewThemeUtils.platform.colorStatusBar(
getActivity(), requireActivity(),
ContextCompat.getColor(getContext(), R.color.action_mode_background)); ContextCompat.getColor(requireContext(), R.color.action_mode_background));
// hide FAB in multi selection mode // hide FAB in multi selection mode
setFabVisible(false); setFabVisible(false);
@ -829,7 +828,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
if (savedInstanceState != null) { if (savedInstanceState != null) {
mMultiChoiceModeListener.loadStateFrom(savedInstanceState); mMultiChoiceModeListener.loadStateFrom(savedInstanceState);
} }
((FileActivity) getActivity()).addDrawerListener(mMultiChoiceModeListener); ((FileActivity) requireActivity()).addDrawerListener(mMultiChoiceModeListener);
} }
/** /**
@ -903,18 +902,24 @@ public class OCFileListFragment extends ExtendedListFragment implements
String parentPath = null; String parentPath = null;
if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) { if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {
parentPath = new File(mFile.getRemotePath()).getParent(); parentPath = new File(mFile.getRemotePath()).getParent();
parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : if (parentPath != null) {
parentPath + OCFile.PATH_SEPARATOR; parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR;
parentDir = storageManager.getFileByPath(parentPath); }
parentDir = storageManager.getFileByEncryptedRemotePath(parentPath);
moveCount++; moveCount++;
} else { } else {
parentDir = storageManager.getFileByPath(ROOT_PATH); parentDir = storageManager.getFileByEncryptedRemotePath(ROOT_PATH);
} }
while (parentDir == null) { while (parentDir == null) {
parentPath = new File(parentPath).getParent();
parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : if (parentPath != null) {
parentPath + OCFile.PATH_SEPARATOR; parentPath = new File(parentPath).getParent();
parentDir = storageManager.getFileByPath(parentPath); if (parentPath != null) {
parentPath = parentPath.endsWith(OCFile.PATH_SEPARATOR) ? parentPath : parentPath + OCFile.PATH_SEPARATOR;
}
}
parentDir = storageManager.getFileByEncryptedRemotePath(parentPath);
moveCount++; moveCount++;
} // exit is granted because storageManager.getFileByPath("/") never returns null } // exit is granted because storageManager.getFileByPath("/") never returns null
mFile = parentDir; mFile = parentDir;
@ -1036,8 +1041,8 @@ public class OCFileListFragment extends ExtendedListFragment implements
} else if (mFileSelectable) { } else if (mFileSelectable) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(FolderPickerActivity.EXTRA_FILES, file); intent.putExtra(FolderPickerActivity.EXTRA_FILES, file);
getActivity().setResult(Activity.RESULT_OK, intent); requireActivity().setResult(Activity.RESULT_OK, intent);
getActivity().finish(); requireActivity().finish();
} else if (!mOnlyFoldersClickable) { } else if (!mOnlyFoldersClickable) {
// Click on a file // Click on a file
if (PreviewImageFragment.canBePreviewed(file)) { if (PreviewImageFragment.canBePreviewed(file)) {
@ -1261,26 +1266,20 @@ public class OCFileListFragment extends ExtendedListFragment implements
} }
private void pickFolderForMoveOrCopy(final String extraAction, final Set<OCFile> checkedFiles) { private void pickFolderForMoveOrCopy(final String extraAction, final Set<OCFile> checkedFiles) {
int requestCode; int requestCode = switch (extraAction) {
switch (extraAction) { case FolderPickerActivity.MOVE -> FileDisplayActivity.REQUEST_CODE__MOVE_FILES;
case FolderPickerActivity.MOVE: case FolderPickerActivity.COPY -> FileDisplayActivity.REQUEST_CODE__COPY_FILES;
requestCode = FileDisplayActivity.REQUEST_CODE__MOVE_FILES; default -> throw new IllegalArgumentException("Unknown extra action: " + extraAction);
break; };
case FolderPickerActivity.COPY:
requestCode = FileDisplayActivity.REQUEST_CODE__COPY_FILES;
break;
default:
throw new IllegalArgumentException("Unknown extra action: " + extraAction);
}
final Intent action = new Intent(getActivity(), FolderPickerActivity.class); final Intent action = new Intent(requireActivity(), FolderPickerActivity.class);
final ArrayList<String> paths = new ArrayList<>(checkedFiles.size()); final ArrayList<String> paths = new ArrayList<>(checkedFiles.size());
for (OCFile file : checkedFiles) { for (OCFile file : checkedFiles) {
paths.add(file.getRemotePath()); paths.add(file.getRemotePath());
} }
action.putStringArrayListExtra(FolderPickerActivity.EXTRA_FILE_PATHS, paths); action.putStringArrayListExtra(FolderPickerActivity.EXTRA_FILE_PATHS, paths);
action.putExtra(FolderPickerActivity.EXTRA_ACTION, extraAction); action.putExtra(FolderPickerActivity.EXTRA_ACTION, extraAction);
getActivity().startActivityForResult(action, requestCode); requireActivity().startActivityForResult(action, requestCode);
} }
@ -1326,7 +1325,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
if (mFile != null) { if (mFile != null) {
directory = mFile; directory = mFile;
} else { } else {
directory = storageManager.getFileByPath(ROOT_PATH); directory = storageManager.getFileByEncryptedRemotePath(ROOT_PATH);
if (directory == null) { if (directory == null) {
return; // no files, wait for sync return; // no files, wait for sync
} }
@ -1348,8 +1347,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
directory, directory,
storageManager, storageManager,
onlyOnDevice, onlyOnDevice,
mLimitToMimeType mLimitToMimeType);
);
OCFile previousDirectory = mFile; OCFile previousDirectory = mFile;
mFile = directory; mFile = directory;
@ -1496,7 +1494,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
protected void setTitle() { protected void setTitle() {
// set title // set title
if (getActivity() instanceof FileDisplayActivity && currentSearchType != null) { if (requireActivity() instanceof FileDisplayActivity && currentSearchType != null) {
switch (currentSearchType) { switch (currentSearchType) {
case FAVORITE_SEARCH: case FAVORITE_SEARCH:
setTitle(R.string.drawer_item_favorites); setTitle(R.string.drawer_item_favorites);
@ -1533,7 +1531,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
} }
if (SearchType.FILE_SEARCH != currentSearchType && getActivity() != null) { if (SearchType.FILE_SEARCH != currentSearchType && getActivity() != null) {
getActivity().invalidateOptionsMenu(); requireActivity().invalidateOptionsMenu();
} }
} }
@ -1831,8 +1829,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
} }
/** /**
* Theme default action bar according to provided parameters. * Theme default action bar according to provided parameters. Replaces back arrow with hamburger menu icon.
* Replaces back arrow with hamburger menu icon.
* *
* @param title string res id of title to be shown in action bar * @param title string res id of title to be shown in action bar
*/ */
@ -1843,20 +1840,20 @@ public class OCFileListFragment extends ExtendedListFragment implements
/** /**
* Theme default action bar according to provided parameters. * Theme default action bar according to provided parameters.
* *
* @param title title to be shown in action bar * @param title title to be shown in action bar
* @param showBackAsMenu iff true replace back arrow with hamburger menu icon * @param showBackAsMenu iff true replace back arrow with hamburger menu icon
*/ */
protected void setTitle(final String title, Boolean showBackAsMenu) { protected void setTitle(final String title, Boolean showBackAsMenu) {
requireActivity().runOnUiThread(() -> { if (getActivity() != null) {
if (getActivity() != null) { getActivity().runOnUiThread(() -> {
final ActionBar actionBar = ((FileDisplayActivity) getActivity()).getSupportActionBar(); ActionBar actionBar = ((FileDisplayActivity) getActivity()).getSupportActionBar();
final Context context = getContext(); Context context = getContext();
if (actionBar != null && context != null) { if (actionBar != null && context != null) {
viewThemeUtils.files.themeActionBar(context, actionBar, title, showBackAsMenu); viewThemeUtils.files.themeActionBar(context, actionBar, title, showBackAsMenu);
} }
} });
}); }
} }
@Override @Override
@ -1900,10 +1897,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
public void selectAllFiles(boolean select) { public void selectAllFiles(boolean select) {
OCFileListAdapter ocFileListAdapter = (OCFileListAdapter) getRecyclerView().getAdapter(); OCFileListAdapter ocFileListAdapter = (OCFileListAdapter) getRecyclerView().getAdapter();
if (select) { if (ocFileListAdapter != null) {
ocFileListAdapter.addAllFilesToCheckedFiles(); if (select) {
} else { ocFileListAdapter.addAllFilesToCheckedFiles();
ocFileListAdapter.clearCheckedItems(); } else {
ocFileListAdapter.clearCheckedItems();
}
} }
for (int i = 0; i < mAdapter.getItemCount(); i++) { for (int i = 0; i < mAdapter.getItemCount(); i++) {