Skip to content

Commit d43faac

Browse files
surinder-tsyssurinder-tsys
committed
Allow to create encrypted folder directly from bottom sheet dialog from NC PR: nextcloud#10782 
1 parent 2a840d2 commit d43faac

File tree

12 files changed

+159
-32
lines changed

12 files changed

+159
-32
lines changed

‎app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,11 @@ public void createFolder() {
324324

325325
}
326326

327+
@Override
328+
public void createEncryptedFolder() {
329+
330+
}
331+
327332
@Override
328333
public void uploadFromApp() {
329334

‎app/src/main/java/com/owncloud/android/files/FileMenuFilter.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private void filterUnlock(List<Integer> toHide, boolean fileLockingEnabled) {
247247

248248
private void filterEncrypt(List<Integer> toHide, boolean endToEndEncryptionEnabled) {
249249
if (files.isEmpty() || !isSingleSelection() || isSingleFile() || isEncryptedFolder() || isGroupFolder()
250-
|| !endToEndEncryptionEnabled || !isEmptyFolder() || isShared()) {
250+
|| !endToEndEncryptionEnabled || !isEmptyFolder() || isShared() || isInSubFolder()) {
251251
toHide.add(R.id.action_encrypted);
252252
}
253253
}
@@ -567,4 +567,15 @@ private boolean isShared() {
567567
}
568568
return false;
569569
}
570+
571+
private boolean isInSubFolder() {
572+
OCFile folder = files.iterator().next();
573+
OCFile parent = storageManager.getFileById(folder.getParentId());
574+
575+
if (parent == null) {
576+
return false;
577+
}
578+
579+
return !OCFile.ROOT_PATH.equals(parent.getRemotePath());
580+
}
570581
}

‎app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,31 @@ public class CreateFolderOperation extends SyncOperation implements OnRemoteOper
6565
private RemoteFile createdRemoteFolder;
6666
private User user;
6767
private Context context;
68+
private boolean encrypted;
6869

6970
/**
7071
* Constructor
7172
*/
72-
public CreateFolderOperation(String remotePath, User user, Context context, FileDataStorageManager storageManager) {
73+
public CreateFolderOperation(String remotePath,
74+
User user,
75+
Context context,
76+
FileDataStorageManager storageManager
77+
) {
78+
this(remotePath, false, user, context, storageManager);
79+
}
80+
81+
public CreateFolderOperation(String remotePath,
82+
boolean encrypted,
83+
User user,
84+
Context context,
85+
FileDataStorageManager storageManager
86+
) {
7387
super(storageManager);
7488

7589
this.remotePath = remotePath;
7690
this.user = user;
7791
this.context = context;
92+
this.encrypted = encrypted;
7893
}
7994

8095
@Override
@@ -102,7 +117,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
102117
if (encryptedAncestor) {
103118
return encryptedCreate(parent, client);
104119
} else {
105-
return normalCreate(client);
120+
return normalCreate(client, encrypted);
106121
}
107122
}
108123

@@ -288,7 +303,7 @@ private String createRandomFileName(DecryptedFolderMetadata metadata) {
288303
return encryptedFileName;
289304
}
290305

291-
private RemoteOperationResult normalCreate(OwnCloudClient client) {
306+
private RemoteOperationResult normalCreate(OwnCloudClient client, boolean encrypted) {
292307
RemoteOperationResult result = new CreateFolderRemoteOperation(remotePath, true).execute(client);
293308

294309
if (result.isSuccess()) {
@@ -297,6 +312,21 @@ private RemoteOperationResult normalCreate(OwnCloudClient client) {
297312

298313
createdRemoteFolder = (RemoteFile) remoteFolderOperationResult.getData().get(0);
299314
saveFolderInDB();
315+
316+
if (encrypted) {
317+
final OCFile folder = getStorageManager().getFileByDecryptedRemotePath(remotePath);
318+
319+
final RemoteOperationResult remoteOperationResult =
320+
new ToggleEncryptionRemoteOperation(folder.getLocalId(),
321+
remotePath,
322+
true)
323+
.execute(client);
324+
325+
if (remoteOperationResult.isSuccess()) {
326+
folder.setEncrypted(true);
327+
getStorageManager().saveFile(folder);
328+
}
329+
}
300330
} else {
301331
Log_OC.e(TAG, remotePath + " hasn't been created");
302332
}

‎app/src/main/java/com/owncloud/android/services/OperationsService.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public class OperationsService extends Service {
9393
public static final String EXTRA_ACCOUNT = "ACCOUNT";
9494
public static final String EXTRA_SERVER_URL = "SERVER_URL";
9595
public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";
96+
public static final String EXTRA_ENCRYPTED = "ENCRYPTED";
9697
public static final String EXTRA_NEWNAME = "NEWNAME";
9798
public static final String EXTRA_REMOVE_ONLY_LOCAL = "REMOVE_LOCAL_COPY";
9899
public static final String EXTRA_SYNC_FILE_CONTENTS = "SYNC_FILE_CONTENTS";
@@ -685,7 +686,9 @@ private Pair<Target, RemoteOperation> newOperation(Intent operationIntent) {
685686

686687
case ACTION_CREATE_FOLDER:
687688
remotePath = operationIntent.getStringExtra(EXTRA_REMOTE_PATH);
689+
boolean encrypted = operationIntent.getBooleanExtra(EXTRA_ENCRYPTED, false);
688690
operation = new CreateFolderOperation(remotePath,
691+
encrypted,
689692
user,
690693
getApplicationContext(),
691694
fileDataStorageManager);

‎app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,10 @@ private String generateFooterText(int filesCount, int foldersCount) {
570570

571571
public @Nullable
572572
OCFile getItem(int position) {
573+
if (position == -1) {
574+
return null;
575+
}
576+
573577
int newPosition = position;
574578

575579
if (shouldShowHeader() && position > 0) {

‎app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class CreateFolderDialogFragment
6262
extends DialogFragment implements DialogInterface.OnClickListener, Injectable {
6363

6464
private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
65+
private static final String ARG_ENCRYPTED = "ENCRYPTED";
6566

6667
public static final String CREATE_FOLDER_FRAGMENT = "CREATE_FOLDER_FRAGMENT";
6768

@@ -70,8 +71,9 @@ public class CreateFolderDialogFragment
7071
@Inject KeyboardUtils keyboardUtils;
7172

7273

73-
private OCFile mParentFolder;
74+
private OCFile parentFolder;
7475
private Button positiveButton;
76+
private boolean encrypted;
7577

7678

7779
private EditBoxDialogBinding binding;
@@ -83,12 +85,16 @@ public class CreateFolderDialogFragment
8385
* @return Dialog ready to show.
8486
*/
8587
public static CreateFolderDialogFragment newInstance(OCFile parentFolder) {
88+
return newInstance(parentFolder, false);
89+
}
90+
91+
public static CreateFolderDialogFragment newInstance(OCFile parentFolder, boolean encrypted) {
8692
CreateFolderDialogFragment frag = new CreateFolderDialogFragment();
8793
Bundle args = new Bundle();
8894
args.putParcelable(ARG_PARENT_FOLDER, parentFolder);
95+
args.putBoolean(ARG_ENCRYPTED, encrypted);
8996
frag.setArguments(args);
9097
return frag;
91-
9298
}
9399

94100
@Override
@@ -122,7 +128,8 @@ public void onResume() {
122128
@NonNull
123129
@Override
124130
public Dialog onCreateDialog(Bundle savedInstanceState) {
125-
mParentFolder = getArguments().getParcelable(ARG_PARENT_FOLDER);
131+
parentFolder = getArguments().getParcelable(ARG_PARENT_FOLDER);
132+
encrypted = getArguments().getBoolean(ARG_ENCRYPTED);
126133

127134
// Inflate the layout for the dialog
128135
LayoutInflater inflater = requireActivity().getLayoutInflater();
@@ -215,9 +222,9 @@ public void onClick(DialogInterface dialog, int which) {
215222
return;
216223
}
217224

218-
String path = mParentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
225+
String path = parentFolder.getDecryptedRemotePath() + newFolderName + OCFile.PATH_SEPARATOR;
219226

220-
((ComponentsGetter) requireActivity()).getFileOperationsHelper().createFolder(path);
227+
((ComponentsGetter) requireActivity()).getFileOperationsHelper().createFolder(path, encrypted);
221228
}
222229
}
223230
}

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ public interface OCFileListBottomSheetActions {
3232
*/
3333
void createFolder();
3434

35+
/**
36+
* creates an encrypted folder within the actual folder
37+
*/
38+
void createEncryptedFolder();
39+
3540
/**
3641
* offers a file upload with the Android OS file picker to the current folder.
3742
*/

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@ protected void onCreate(Bundle savedInstanceState) {
9999
binding.addToCloud.setText(getContext().getResources().getString(R.string.add_to_cloud,
100100
themeUtils.getDefaultDisplayNameForRootFolder(getContext())));
101101

102-
OCCapability capability = fileActivity.getCapabilities();
103-
if (capability != null &&
104-
capability.getRichDocuments().isTrue() &&
102+
OCCapability capability = fileActivity.getStorageManager().getCapability(user.getAccountName());
103+
if (capability.getRichDocuments().isTrue() &&
105104
capability.getRichDocumentsDirectEditing().isTrue() &&
106105
capability.getRichDocumentsTemplatesAvailable().isTrue() &&
107106
!file.isEncrypted()) {
@@ -149,6 +148,12 @@ protected void onCreate(Bundle savedInstanceState) {
149148
binding.menuDirectCameraUpload.setVisibility(View.GONE);
150149
}
151150

151+
if (capability.getEndToEndEncryption().isTrue() && OCFile.ROOT_PATH.equals(file.getRemotePath())) {
152+
binding.menuEncryptedMkdir.setVisibility(View.VISIBLE);
153+
} else {
154+
binding.menuEncryptedMkdir.setVisibility(View.GONE);
155+
}
156+
152157
// create rich workspace
153158
if (editorUtils.isEditorAvailable(user,
154159
MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) &&
@@ -183,6 +188,11 @@ private void setupClickListener() {
183188
dismiss();
184189
});
185190

191+
binding.menuEncryptedMkdir.setOnClickListener(v -> {
192+
actions.createEncryptedFolder();
193+
dismiss();
194+
});
195+
186196
binding.menuUploadFromApp.setOnClickListener(v -> {
187197
actions.uploadFromApp();
188198
dismiss();

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,14 @@ public void createFolder() {
508508
.show(getActivity().getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
509509
}
510510

511+
@Override
512+
public void createEncryptedFolder() {
513+
if (checkEncryptionIsSetup(null)) {
514+
CreateFolderDialogFragment.newInstance(mFile, true)
515+
.show(getActivity().getSupportFragmentManager(), DIALOG_CREATE_FOLDER);
516+
}
517+
}
518+
511519
@Override
512520
public void uploadFromApp() {
513521
Intent action = new Intent(Intent.ACTION_GET_CONTENT);
@@ -1122,10 +1130,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
11221130
int position = data.getIntExtra(SetupEncryptionDialogFragment.ARG_POSITION, -1);
11231131
OCFile file = mAdapter.getItem(position);
11241132

1125-
if (file != null) {
1126-
mContainerActivity.getFileOperationsHelper().toggleEncryption(file, true);
1127-
mAdapter.setEncryptionAttributeForItemID(file.getRemoteId(), true);
1133+
if (file == null) {
1134+
return;
11281135
}
1136+
mContainerActivity.getFileOperationsHelper().toggleEncryption(file, true);
1137+
mAdapter.setEncryptionAttributeForItemID(file.getRemoteId(), true);
11291138

11301139
// update state and view of this fragment
11311140
searchFragment = false;
@@ -1702,45 +1711,51 @@ protected RemoteOperation getSearchRemoteOperation(final User currentUser, final
17021711

17031712
@Subscribe(threadMode = ThreadMode.BACKGROUND)
17041713
public void onMessageEvent(EncryptionEvent event) {
1714+
if (checkEncryptionIsSetup(event.remoteId)) {
1715+
encryptFolder(event.localId, event.remoteId, event.remotePath, event.shouldBeEncrypted);
1716+
}
1717+
}
1718+
1719+
private boolean checkEncryptionIsSetup(@Nullable String remoteId) {
17051720
final User user = accountManager.getUser();
17061721

17071722
// check if keys are stored
17081723
String publicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PUBLIC_KEY);
17091724
String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);
17101725

1711-
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
1712-
OCFile file = storageManager.getFileByRemoteId(event.remoteId);
1713-
17141726
if (publicKey.isEmpty() || privateKey.isEmpty()) {
17151727
Log_OC.d(TAG, "no public key for " + user.getAccountName());
17161728

1729+
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
17171730
int position = -1;
1718-
if (file != null) {
1719-
position = mAdapter.getItemPosition(file);
1731+
if (remoteId != null) {
1732+
OCFile file = storageManager.getFileByRemoteId(remoteId);
1733+
if (file != null) {
1734+
position = mAdapter.getItemPosition(file);
1735+
}
17201736
}
17211737
SetupEncryptionDialogFragment dialog = SetupEncryptionDialogFragment.newInstance(user, position);
17221738
dialog.setTargetFragment(this, SETUP_ENCRYPTION_REQUEST_CODE);
17231739
dialog.show(getParentFragmentManager(), SETUP_ENCRYPTION_DIALOG_TAG);
1740+
1741+
return false;
17241742
} else {
1725-
encryptFolder(file,
1726-
event.localId,
1727-
event.remoteId,
1728-
event.remotePath,
1729-
event.shouldBeEncrypted,
1730-
publicKey,
1731-
privateKey);
1743+
return true;
17321744
}
17331745
}
17341746

1735-
private void encryptFolder(OCFile folder,
1736-
long localId,
1747+
private void encryptFolder(long localId,
17371748
String remoteId,
17381749
String remotePath,
1739-
boolean shouldBeEncrypted,
1740-
String publicKey,
1741-
String privateKey) {
1750+
boolean shouldBeEncrypted) {
17421751
try {
17431752
User user = accountManager.getUser();
1753+
String publicKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PUBLIC_KEY);
1754+
String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);
1755+
1756+
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
1757+
OCFile folder = storageManager.getFileByRemoteId(remoteId);
1758+
17441759
OwnCloudClient client = clientFactory.create(user);
17451760
RemoteOperationResult remoteOperationResult = new ToggleEncryptionRemoteOperation(localId,
17461761
remotePath,

‎app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,11 +976,16 @@ public void removeFiles(Collection<OCFile> files, boolean onlyLocalCopy, boolean
976976

977977

978978
public void createFolder(String remotePath) {
979+
createFolder(remotePath, false);
980+
}
981+
982+
public void createFolder(String remotePath, boolean encrypted) {
979983
// Create Folder
980984
Intent service = new Intent(fileActivity, OperationsService.class);
981985
service.setAction(OperationsService.ACTION_CREATE_FOLDER);
982986
service.putExtra(OperationsService.EXTRA_ACCOUNT, fileActivity.getAccount());
983987
service.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath);
988+
service.putExtra(OperationsService.EXTRA_ENCRYPTED, encrypted);
984989
mWaitingForOpId = fileActivity.getOperationsServiceBinder().queueNewOperation(service);
985990

986991
fileActivity.showLoadingDialog(fileActivity.getString(R.string.wait_a_moment));

0 commit comments

Comments
 (0)