浏览代码

FolderPickerActivity: remove EXTRA_CURRENT_FOLDER argument

It was unused (as it never reached the OCFileListFragment, which always starts at /) but was
mistakenly pre-populating the `file` variable with a wrong folder

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 年之前
父节点
当前提交
04ffe37d25

+ 2 - 6
app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -123,9 +123,7 @@ open class FolderPickerActivity :
             caption = themeUtils.getDefaultDisplayNameForRootFolder(this)
         }
         mTargetFilePaths = intent.getStringArrayListExtra(EXTRA_FILE_PATHS)
-        if (intent.getParcelableExtra<Parcelable?>(EXTRA_CURRENT_FOLDER) != null) {
-            file = intent.getParcelableExtra(EXTRA_CURRENT_FOLDER)
-        }
+
         if (savedInstanceState == null) {
             createFragments()
         }
@@ -246,6 +244,7 @@ open class FolderPickerActivity :
         // refresh list of files
         refreshListOfFilesFragment(false)
 
+        file = listOfFilesFragment?.currentFile
         updateUiElements()
 
         // Listen for sync messages
@@ -590,9 +589,6 @@ open class FolderPickerActivity :
         @JvmField
         val EXTRA_ACTION = FolderPickerActivity::class.java.canonicalName?.plus(".EXTRA_ACTION")
 
-        @JvmField
-        val EXTRA_CURRENT_FOLDER = FolderPickerActivity::class.java.canonicalName?.plus(".EXTRA_CURRENT_FOLDER")
-
         const val MOVE = "MOVE"
         const val COPY = "COPY"
         const val CHOOSE_LOCATION = "CHOOSE_LOCATION"

+ 0 - 1
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1227,7 +1227,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
             paths.add(file.getRemotePath());
         }
         action.putStringArrayListExtra(FolderPickerActivity.EXTRA_FILE_PATHS, paths);
-        action.putExtra(FolderPickerActivity.EXTRA_CURRENT_FOLDER, mFile);
         action.putExtra(FolderPickerActivity.EXTRA_ACTION, extraAction);
         getActivity().startActivityForResult(action, requestCode);
     }