Merge pull request #3362 from nextcloud/backport/3360/stable-3.4.x

[stable-3.4.x] Capability was read too early
nextcloud · Dec 13, 2018 · ed1eea4 · ed1eea4
2 parents 0032707 + f0125e4
commit ed1eea4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
@@ -20,7 +20,6 @@
 
 package com.owncloud.android.ui.fragment;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomSheetBehavior;
@@ -32,6 +31,7 @@
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.resources.status.OCCapability;
+import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.utils.ThemeUtils;
 
 import butterknife.BindView;
@@ -60,13 +60,12 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
 
     private Unbinder unbinder;
     private OCFileListBottomSheetActions actions;
-    private OCCapability capability;
+    private FileActivity fileActivity;
 
-    public OCFileListBottomSheetDialog(@NonNull Context context, OCCapability capability,
-                                       OCFileListBottomSheetActions actions) {
-        super(context);
+    public OCFileListBottomSheetDialog(FileActivity fileActivity, OCFileListBottomSheetActions actions) {
+        super(fileActivity);
         this.actions = actions;
-        this.capability = capability;
+        this.fileActivity = fileActivity;
     }
 
     @Override
@@ -89,6 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
         headline.setText(getContext().getResources().getString(R.string.add_to_cloud,
                 ThemeUtils.getDefaultDisplayNameForRootFolder(getContext())));
 
+        OCCapability capability = fileActivity.getCapabilities();
         if (capability.getRichDocuments().isTrue() && capability.getRichDocumentsDirectEditing().isTrue()) {
             templates.setVisibility(View.VISIBLE);
         }

diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -389,9 +389,9 @@ private void prepareCurrentSearch(SearchEvent event) {
      * register listener on FAB.
      */
     private void registerFabListener() {
-        OCCapability capability = ((FileActivity) getActivity()).getCapabilities();
+        FileActivity activity = ((FileActivity) getActivity());
         getFabMain().setOnClickListener(v -> {
-            new OCFileListBottomSheetDialog(getContext(), capability, this).show();
+            new OCFileListBottomSheetDialog(activity, this).show();
         });
     }