Browse Source

Merge pull request #9930 from nextcloud/fix/share-title-bar

FileActivity: don't try to get file from FileDetailSharingFragment
Álvaro Brey 3 years ago
parent
commit
55bdccc807

+ 1 - 1
scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-627
+626

+ 0 - 4
src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -291,10 +291,6 @@ public abstract class FileActivity extends DrawerActivity
      * @return  Main {@link OCFile} handled by the activity.
      * @return  Main {@link OCFile} handled by the activity.
      */
      */
     public OCFile getFile() {
     public OCFile getFile() {
-        FileDetailSharingFragment fragment = getShareFileFragment();
-        if (fragment != null) {
-            return fragment.getFile();
-        }
         return mFile;
         return mFile;
     }
     }
 
 

+ 0 - 4
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -458,10 +458,6 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
         searchView.setQuery(query, true);
         searchView.setQuery(query, true);
     }
     }
 
 
-    public OCFile getFile() {
-        return file;
-    }
-
     @Override
     @Override
     public void advancedPermissions(OCShare share) {
     public void advancedPermissions(OCShare share) {
         modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);
         modifyExistingShare(share, FileDetailsSharingProcessFragment.SCREEN_TYPE_PERMISSION);