mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Capability was read too early

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2018-12-13 11:01:27 +01:00
parent 2d028495c7
commit 5838918a0a
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
View file

@ -20,7 +20,6 @@
package com.owncloud.android.ui.fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
@ -31,9 +30,9 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
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 androidx.annotation.NonNull;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
@ -60,13 +59,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 +87,7 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog {
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);
}

4
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -390,9 +390,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
* 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();
});
}