Skip to content

Commit 5b7c4a0

Browse files
authored
Merge pull request #9947 from nextcloud/backport/9930/stable-3.19
[stable-3.19] FileActivity: don't try to get file from FileDetailSharingFragment
2 parents f697798 + 0e1adfc commit 5b7c4a0

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

scripts/analysis/findbugs-results.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
641
1+
640

src/main/java/com/owncloud/android/ui/activity/FileActivity.java

-4
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,6 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
291291
* @return Main {@link OCFile} handled by the activity.
292292
*/
293293
public OCFile getFile() {
294-
FileDetailSharingFragment fragment = getShareFileFragment();
295-
if (fragment != null) {
296-
return fragment.getFile();
297-
}
298294
return mFile;
299295
}
300296

src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

-4
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,6 @@ public void search(String query) {
458458
searchView.setQuery(query, true);
459459
}
460460

461-
public OCFile getFile() {
462-
return file;
463-
}
464-
465461
@Override
466462
public void advancedPermissions(OCShare share) {
467463
modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);

0 commit comments

Comments
 (0)