Skip to content

Commit 283dd44

Browse files
PhilLabPhilLab
committed
OCFileListFragment: Removed unused fromSearch arg of listDirectory()
Last usage of the argument inside of the method was removed in 905222c, so removing it doesn't have any impact on the behavior. The only instance where the parameter was set to `true` was in the ExtendedListFragment Signed-off-by: Philipp Hasper <[email protected]>
1 parent 4e61f97 commit 283dd44

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ class FileDisplayActivity :
528528
/** First fragment */
529529
val listOfFiles = this.listOfFilesFragment
530530
if (listOfFiles != null && TextUtils.isEmpty(searchQuery)) {
531-
listOfFiles.listDirectory(getCurrentDir(), file, MainApp.isOnlyOnDevice(), false)
531+
listOfFiles.listDirectory(getCurrentDir(), file, MainApp.isOnlyOnDevice())
532532
} else {
533533
Log_OC.e(TAG, "Still have a chance to lose the initialization of list fragment >(")
534534
}
@@ -806,9 +806,9 @@ class FileDisplayActivity :
806806
resetScrolling(true)
807807
}
808808

809-
fun updateListOfFilesFragment(fromSearch: Boolean) {
809+
fun updateListOfFilesFragment() {
810810
val fileListFragment = this.listOfFilesFragment
811-
fileListFragment?.listDirectory(MainApp.isOnlyOnDevice(), fromSearch)
811+
fileListFragment?.listDirectory(MainApp.isOnlyOnDevice())
812812
}
813813

814814
fun resetSearchView() {
@@ -1324,10 +1324,10 @@ class FileDisplayActivity :
13241324
if (searchView != null && !TextUtils.isEmpty(searchQuery)) {
13251325
searchView?.setQuery(searchQuery, false)
13261326
} else if (!ocFileListFragment.isSearchFragment && startFile == null) {
1327-
updateListOfFilesFragment(false)
1327+
updateListOfFilesFragment()
13281328
ocFileListFragment.registerFabListener()
13291329
} else {
1330-
ocFileListFragment.listDirectory(startFile, false, false)
1330+
ocFileListFragment.listDirectory(startFile, false)
13311331
updateActionBarTitleAndHomeButton(startFile)
13321332
}
13331333

@@ -1546,7 +1546,7 @@ class FileDisplayActivity :
15461546
return
15471547
}
15481548

1549-
ocFileListFragment.listDirectory(currentDir, MainApp.isOnlyOnDevice(), false)
1549+
ocFileListFragment.listDirectory(currentDir, MainApp.isOnlyOnDevice())
15501550
}
15511551

15521552
private fun handleScrollBehaviour(ocFileListFragment: OCFileListFragment?) {
@@ -1659,7 +1659,7 @@ class FileDisplayActivity :
16591659
if (sameAccount && isDescendant) {
16601660
val linkedToRemotePath = intent.getStringExtra(FileUploadWorker.EXTRA_LINKED_TO_PATH)
16611661
if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
1662-
updateListOfFilesFragment(false)
1662+
updateListOfFilesFragment()
16631663
}
16641664
}
16651665

@@ -1732,7 +1732,7 @@ class FileDisplayActivity :
17321732
if (sameAccount && isDescendant) {
17331733
val linkedToRemotePath = intent.getStringExtra(FileDownloadWorker.EXTRA_LINKED_TO_PATH)
17341734
if (linkedToRemotePath == null || isAscendant(linkedToRemotePath)) {
1735-
updateListOfFilesFragment(false)
1735+
updateListOfFilesFragment()
17361736
}
17371737

17381738
val intentAction = intent.action
@@ -1793,7 +1793,7 @@ class FileDisplayActivity :
17931793
val listOfFiles = this.listOfFilesFragment
17941794
if (listOfFiles != null) { // should never be null, indeed
17951795
val root = storageManager.getFileByPath(OCFile.ROOT_PATH)
1796-
listOfFiles.listDirectory(root, MainApp.isOnlyOnDevice(), false)
1796+
listOfFiles.listDirectory(root, MainApp.isOnlyOnDevice())
17971797
file = listOfFiles.currentFile
17981798
startSyncFolderOperation(root, false)
17991799
}
@@ -1976,7 +1976,7 @@ class FileDisplayActivity :
19761976
if (fileListFragment == null) {
19771977
fileListFragment = listOfFilesFragment
19781978
}
1979-
fileListFragment?.listDirectory(currentDir, MainApp.isOnlyOnDevice(), false)
1979+
fileListFragment?.listDirectory(currentDir, MainApp.isOnlyOnDevice())
19801980
}
19811981

19821982
private fun handleDownloadWorkerState() {
@@ -2100,7 +2100,7 @@ class FileDisplayActivity :
21002100
}
21012101
val parentFile = storageManager.getFileById(removedFile.parentId)
21022102
if (parentFile != null && parentFile == getCurrentDir()) {
2103-
updateListOfFilesFragment(false)
2103+
updateListOfFilesFragment()
21042104
} else if (this.leftFragment is GalleryFragment) {
21052105
val galleryFragment = leftFragment as GalleryFragment
21062106
galleryFragment.onRefresh()
@@ -2190,7 +2190,7 @@ class FileDisplayActivity :
21902190
*/
21912191
private fun onCopyFileOperationFinish(operation: CopyFileOperation?, result: RemoteOperationResult<*>) {
21922192
if (result.isSuccess) {
2193-
updateListOfFilesFragment(false)
2193+
updateListOfFilesFragment()
21942194
refreshGalleryFragmentIfNeeded()
21952195
} else {
21962196
try {
@@ -2240,7 +2240,7 @@ class FileDisplayActivity :
22402240

22412241
val file = storageManager.getFileById(renamedFile.parentId)
22422242
if (file != null && file == getCurrentDir()) {
2243-
updateListOfFilesFragment(false)
2243+
updateListOfFilesFragment()
22442244
}
22452245
refreshGalleryFragmentIfNeeded()
22462246
fetchRecommendedFilesIfNeeded(ignoreETag = true, currentDir)
@@ -2299,7 +2299,7 @@ class FileDisplayActivity :
22992299
* {@inheritDoc}
23002300
*/
23012301
override fun onTransferStateChanged(file: OCFile, downloading: Boolean, uploading: Boolean) {
2302-
updateListOfFilesFragment(false)
2302+
updateListOfFilesFragment()
23032303
val leftFragment = this.leftFragment
23042304
val optionalUser = user
23052305
if (leftFragment is FileDetailFragment && file == leftFragment.file && optionalUser.isPresent) {
@@ -3003,7 +3003,7 @@ class FileDisplayActivity :
30033003
if (TextUtils.isEmpty(message)) {
30043004
val temp = file
30053005
file = getCurrentDir()
3006-
listOfFiles.listDirectory(getCurrentDir(), temp, MainApp.isOnlyOnDevice(), false)
3006+
listOfFiles.listDirectory(getCurrentDir(), temp, MainApp.isOnlyOnDevice())
30073007
updateActionBarTitleAndHomeButton(null)
30083008
} else {
30093009
val view = listOfFiles.view

‎app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ open class FolderPickerActivity :
189189
folder = file
190190
}
191191

192-
listOfFilesFragment?.listDirectory(folder, false, false)
192+
listOfFilesFragment?.listDirectory(folder, false)
193193
startSyncFolderOperation(folder, false)
194194
updateUiElements()
195195
}
@@ -283,7 +283,7 @@ open class FolderPickerActivity :
283283
else {
284284
file = listOfFilesFragment?.currentFile
285285
}
286-
refreshListOfFilesFragment(file, false)
286+
refreshListOfFilesFragment(file)
287287
updateUiElements()
288288

289289
val intentFilter = getSyncIntentFilter()
@@ -358,14 +358,14 @@ open class FolderPickerActivity :
358358
}
359359
}
360360

361-
private fun refreshListOfFilesFragment(directory: OCFile, fromSearch: Boolean) {
362-
listOfFilesFragment?.listDirectory(directory, false, fromSearch)
361+
private fun refreshListOfFilesFragment(directory: OCFile) {
362+
listOfFilesFragment?.listDirectory(directory, false)
363363
}
364364

365365
fun browseToRoot() {
366366
listOfFilesFragment?.let {
367367
val root = storageManager.getFileByEncryptedRemotePath(OCFile.ROOT_PATH)
368-
it.listDirectory(root, false, false)
368+
it.listDirectory(root, false)
369369
file = it.currentFile
370370
updateUiElements()
371371
startSyncFolderOperation(root, false)
@@ -567,7 +567,7 @@ open class FolderPickerActivity :
567567
currentFile = currentDir
568568
}
569569
if (currentDir.remotePath == syncFolderRemotePath) {
570-
listOfFilesFragment?.listDirectory(currentDir, false, false)
570+
listOfFilesFragment?.listDirectory(currentDir, false)
571571
}
572572
file = currentFile
573573
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ open class ExtendedListFragment :
253253
is FileDisplayActivity -> {
254254
if (isBackPressed && query.isEmpty()) {
255255
activity.resetSearchView()
256-
activity.updateListOfFilesFragment(true)
256+
activity.updateListOfFilesFragment()
257257
} else {
258258
Handler(Looper.getMainLooper()).post {
259259
if (adapter is OCFileListAdapter) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
434434
if ((fragmentActivity = getActivity()) != null && fragmentActivity instanceof FileDisplayActivity fileDisplayActivity) {
435435
fileDisplayActivity.updateActionBarTitleAndHomeButton(fileDisplayActivity.getCurrentDir());
436436
}
437-
listDirectory(MainApp.isOnlyOnDevice(), false);
437+
listDirectory(MainApp.isOnlyOnDevice());
438438
}
439439

440440
protected void setAdapter(Bundle args) {
@@ -1097,7 +1097,7 @@ public int onBrowseUp() {
10971097
}
10981098

10991099
private void updateFileList() {
1100-
listDirectory(mFile, MainApp.isOnlyOnDevice(), false);
1100+
listDirectory(mFile, MainApp.isOnlyOnDevice());
11011101
onRefresh(false);
11021102
restoreIndexAndTopPosition();
11031103
}
@@ -1296,7 +1296,7 @@ public void onItemClicked(OCFile file) {
12961296

12971297
private void browseToFolder(OCFile file, int position) {
12981298
resetSearchIfBrowsingFromFavorites();
1299-
listDirectory(file, MainApp.isOnlyOnDevice(), false);
1299+
listDirectory(file, MainApp.isOnlyOnDevice());
13001300
// then, notify parent activity to let it update its state and view
13011301
mContainerActivity.onBrowsedDownTo(file);
13021302
// save index and top position
@@ -1326,7 +1326,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
13261326

13271327
// update state and view of this fragment
13281328
searchFragment = false;
1329-
listDirectory(file, MainApp.isOnlyOnDevice(), false);
1329+
listDirectory(file, MainApp.isOnlyOnDevice());
13301330
// then, notify parent activity to let it update its state and view
13311331
mContainerActivity.onBrowsedDownTo(file);
13321332
// save index and top position
@@ -1515,21 +1515,21 @@ public OCFile getCurrentFile() {
15151515
}
15161516

15171517
/**
1518-
* Calls {@link OCFileListFragment#listDirectory(OCFile, boolean, boolean)} with a null parameter
1518+
* Calls {@link OCFileListFragment#listDirectory(OCFile, boolean)} with a null parameter
15191519
*/
1520-
public void listDirectory(boolean onlyOnDevice, boolean fromSearch) {
1521-
listDirectory(null, onlyOnDevice, fromSearch);
1520+
public void listDirectory(boolean onlyOnDevice) {
1521+
listDirectory(null, onlyOnDevice);
15221522
}
15231523

15241524
public void refreshDirectory() {
15251525
searchFragment = false;
15261526

15271527
setFabVisible(mFile.canCreateFileAndFolder());
1528-
listDirectory(getCurrentFile(), MainApp.isOnlyOnDevice(), false);
1528+
listDirectory(getCurrentFile(), MainApp.isOnlyOnDevice());
15291529
}
15301530

1531-
public void listDirectory(OCFile directory, boolean onlyOnDevice, boolean fromSearch) {
1532-
listDirectory(directory, null, onlyOnDevice, fromSearch);
1531+
public void listDirectory(OCFile directory, boolean onlyOnDevice) {
1532+
listDirectory(directory, null, onlyOnDevice);
15331533
}
15341534

15351535
private OCFile getDirectoryForListDirectory(OCFile directory, FileDataStorageManager storageManager) {
@@ -1556,7 +1556,7 @@ private OCFile getDirectoryForListDirectory(OCFile directory, FileDataStorageMan
15561556
*
15571557
* @param directory File to be listed
15581558
*/
1559-
public void listDirectory(OCFile directory, OCFile file, boolean onlyOnDevice, boolean fromSearch) {
1559+
public void listDirectory(OCFile directory, OCFile file, boolean onlyOnDevice) {
15601560
if (!searchFragment) {
15611561
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
15621562
if (storageManager == null) {

0 commit comments

Comments
 (0)