Skip to content

Commit 8d8751f

Browse files
surinder-tsyssurinder-tsys
committed
NMC-1923: E2EE related changes with test cases.
NMC-1550: Allow to create encrypted folder directly from bottom sheet dialog from NC PR: nextcloud#10782
1 parent e3e0264 commit 8d8751f

28 files changed

+2872
-2039
lines changed

‎app/src/androidTest/java/com/nmc/android/FileMenuFilterIT.kt‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
/*
2+
* Nextcloud Android client application
3+
*
4+
* @author Álvaro Brey Vilas
5+
* Copyright (C) 2022 Álvaro Brey Vilas
6+
* Copyright (C) 2022 Nextcloud GmbH
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*/
21+
package com.nmc.android
22+
23+
import androidx.test.core.app.launchActivity
24+
import androidx.test.ext.junit.runners.AndroidJUnit4
25+
import com.nextcloud.client.account.User
26+
import com.nextcloud.client.jobs.download.FileDownloadWorker
27+
import com.nextcloud.client.jobs.upload.FileUploadHelper
28+
import com.nextcloud.test.TestActivity
29+
import com.nextcloud.utils.EditorUtils
30+
import com.owncloud.android.AbstractIT
31+
import com.owncloud.android.R
32+
import com.owncloud.android.datamodel.ArbitraryDataProvider
33+
import com.owncloud.android.datamodel.FileDataStorageManager
34+
import com.owncloud.android.datamodel.OCFile
35+
import com.owncloud.android.files.FileMenuFilter
36+
import com.owncloud.android.lib.resources.status.CapabilityBooleanType
37+
import com.owncloud.android.lib.resources.status.OCCapability
38+
import com.owncloud.android.services.OperationsService
39+
import com.owncloud.android.ui.activity.ComponentsGetter
40+
import com.owncloud.android.utils.MimeType
41+
import io.mockk.MockKAnnotations
42+
import io.mockk.every
43+
import io.mockk.impl.annotations.MockK
44+
import org.junit.Assert.assertFalse
45+
import org.junit.Assert.assertTrue
46+
import org.junit.Before
47+
import org.junit.Test
48+
import org.junit.runner.RunWith
49+
import java.security.SecureRandom
50+
51+
@RunWith(AndroidJUnit4::class)
52+
class FileMenuFilterIT : AbstractIT() {
53+
54+
@MockK
55+
private lateinit var mockComponentsGetter: ComponentsGetter
56+
57+
@MockK
58+
private lateinit var mockStorageManager: FileDataStorageManager
59+
60+
@MockK
61+
private lateinit var mockFileUploaderBinder: FileUploadHelper
62+
63+
@MockK
64+
private lateinit var mockOperationsServiceBinder: OperationsService.OperationsServiceBinder
65+
66+
@MockK
67+
private lateinit var mockFileDownloadProgressListener: FileDownloadWorker.FileDownloadProgressListener
68+
69+
@MockK
70+
private lateinit var mockArbitraryDataProvider: ArbitraryDataProvider
71+
72+
private lateinit var editorUtils: EditorUtils
73+
74+
@Before
75+
fun setup() {
76+
MockKAnnotations.init(this)
77+
every { mockFileUploaderBinder.isUploading(any(), any()) } returns false
78+
every { mockComponentsGetter.fileUploaderHelper } returns mockFileUploaderBinder
79+
every { mockFileDownloadProgressListener.isDownloading(any(), any()) } returns false
80+
every { mockComponentsGetter.fileDownloadProgressListener } returns mockFileDownloadProgressListener
81+
every { mockOperationsServiceBinder.isSynchronizing(any(), any()) } returns false
82+
every { mockComponentsGetter.operationsServiceBinder } returns mockOperationsServiceBinder
83+
every { mockStorageManager.getFileById(any()) } returns OCFile("/")
84+
every { mockStorageManager.getFolderContent(any(), any()) } returns ArrayList<OCFile>()
85+
every { mockArbitraryDataProvider.getValue(any<User>(), any()) } returns ""
86+
editorUtils = EditorUtils(mockArbitraryDataProvider)
87+
}
88+
89+
@Test
90+
fun hide_shareAndFavouriteMenu_encryptedFolder() {
91+
val capability = OCCapability().apply {
92+
endToEndEncryption = CapabilityBooleanType.TRUE
93+
}
94+
95+
val encryptedFolder = OCFile("/encryptedFolder/").apply {
96+
isEncrypted = true
97+
mimeType = MimeType.DIRECTORY
98+
fileLength = SecureRandom().nextLong()
99+
}
100+
101+
configureCapability(capability)
102+
103+
launchActivity<TestActivity>().use {
104+
it.onActivity { activity ->
105+
val filterFactory =
106+
FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
107+
108+
val sut = filterFactory.newInstance(encryptedFolder, mockComponentsGetter, true, user)
109+
val toHide = sut.getToHide(false)
110+
111+
// encrypted folder
112+
assertTrue(toHide.contains(R.id.action_see_details))
113+
assertTrue(toHide.contains(R.id.action_favorite))
114+
assertTrue(toHide.contains(R.id.action_unset_favorite))
115+
}
116+
}
117+
}
118+
119+
@Test
120+
fun show_shareAndFavouriteMenu_normalFolder() {
121+
val capability = OCCapability().apply {
122+
endToEndEncryption = CapabilityBooleanType.TRUE
123+
}
124+
125+
val normalFolder = OCFile("/folder/").apply {
126+
mimeType = MimeType.DIRECTORY
127+
fileLength = SecureRandom().nextLong()
128+
}
129+
130+
configureCapability(capability)
131+
132+
launchActivity<TestActivity>().use {
133+
it.onActivity { activity ->
134+
val filterFactory =
135+
FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
136+
137+
val sut = filterFactory.newInstance(normalFolder, mockComponentsGetter, true, user)
138+
val toHide = sut.getToHide(false)
139+
140+
// normal folder
141+
assertFalse(toHide.contains(R.id.action_see_details))
142+
assertFalse(toHide.contains(R.id.action_favorite))
143+
assertTrue(toHide.contains(R.id.action_unset_favorite))
144+
}
145+
}
146+
}
147+
148+
private fun configureCapability(capability: OCCapability) {
149+
every { mockStorageManager.getCapability(any<User>()) } returns capability
150+
every { mockStorageManager.getCapability(any<String>()) } returns capability
151+
}
152+
}

‎app/src/androidTest/java/com/nmc/android/SetupEncryptionDialogFragmentIT.kt‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package com.nmc.android
2+
3+
import androidx.test.espresso.Espresso.onView
4+
import androidx.test.espresso.assertion.ViewAssertions.matches
5+
import androidx.test.espresso.intent.rule.IntentsTestRule
6+
import androidx.test.espresso.matcher.ViewMatchers.withHint
7+
import androidx.test.espresso.matcher.ViewMatchers.withId
8+
import androidx.test.internal.runner.junit4.statement.UiThreadStatement
9+
import com.nextcloud.test.TestActivity
10+
import com.owncloud.android.AbstractIT
11+
import com.owncloud.android.ui.dialog.setupEncryption.SetupEncryptionDialogFragment
12+
import org.junit.Rule
13+
import org.junit.Test
14+
import com.owncloud.android.R
15+
16+
class SetupEncryptionDialogFragmentIT : AbstractIT() {
17+
18+
@get:Rule
19+
val testActivityRule = IntentsTestRule(TestActivity::class.java, true, false)
20+
21+
@Test
22+
fun validatePassphraseInputHint() {
23+
val activity = testActivityRule.launchActivity(null)
24+
25+
val sut = SetupEncryptionDialogFragment.newInstance(user, 0)
26+
27+
sut.show(activity.supportFragmentManager, "1")
28+
29+
val keyWords = arrayListOf(
30+
"ability",
31+
"able",
32+
"about",
33+
"above",
34+
"absent",
35+
"absorb",
36+
"abstract",
37+
"absurd",
38+
"abuse",
39+
"access",
40+
"accident",
41+
"account",
42+
"accuse"
43+
)
44+
45+
shortSleep()
46+
47+
UiThreadStatement.runOnUiThread {
48+
sut.setMnemonic(keyWords)
49+
sut.showMnemonicInfo()
50+
}
51+
52+
waitForIdleSync()
53+
54+
onView(withId(R.id.encryption_passwordInput)).check(matches(withHint("Passphrase…")))
55+
}
56+
}

‎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
@@ -344,6 +344,11 @@ public void createFolder() {
344344

345345
}
346346

347+
@Override
348+
public void createEncryptedFolder() {
349+
350+
}
351+
347352
@Override
348353
public void uploadFromApp() {
349354

‎app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,18 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
382382

383383
testFolder.richWorkspace = " "
384384
activity.storageManager.saveFile(testFolder)
385-
sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
385+
sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "",
386+
showOnlyFolder = false,
387+
hideEncryptedFolder = false
388+
)
386389
Assert.assertFalse(sut.adapter.shouldShowHeader())
387390

388391
testFolder.richWorkspace = null
389392
activity.storageManager.saveFile(testFolder)
390-
sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "")
393+
sut.adapter.swapDirectory(user, testFolder, activity.storageManager, false, "",
394+
showOnlyFolder = false,
395+
hideEncryptedFolder = false
396+
)
391397
Assert.assertFalse(sut.adapter.shouldShowHeader())
392398

393399
testFolder.richWorkspace = "1"

‎app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ fun List<OCFile>.limitToPersonalFiles(userId: String): List<OCFile> = filter { f
3131
ownerId == userId && !file.isSharedWithMe && !file.isGroupFolder
3232
} == true
3333
}
34+
35+
// NMC method to filter only folders with/without e2ee folders
36+
fun List<OCFile>.filterByFolder(hideEncryptedFolder: Boolean = false): List<OCFile> =
37+
filter { it.isFolder && (!hideEncryptedFolder || !it.isEncrypted) }

‎app/src/main/java/com/owncloud/android/datamodel/OCFile.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,14 +611,19 @@ public boolean isHidden() {
611611
}
612612

613613
/**
614+
* The unique fileId for the file within the instance This only works if we have 12 digits for instanceId RemoteId
615+
* is a combination of localId + instanceId If a file has remoteId: 4174305739oc97a8ddfc96, in this 4174305739 is
616+
* localId & oc97a8ddfc96 is instanceId which is of 12 digits
617+
*
614618
* unique fileId for the file within the instance
615619
*/
616620
@SuppressFBWarnings("STT")
617621
public long getLocalId() {
618622
if (localId > 0) {
619623
return localId;
620624
} else if (remoteId != null && remoteId.length() > 8) {
621-
return Long.parseLong(remoteId.substring(0, 8).replaceAll("^0*", ""));
625+
//NMC Customization --> for long remote id's
626+
return Long.parseLong(remoteId.substring(0, remoteId.length() - 12).replaceAll("^0*", ""));
622627
} else {
623628
return -1;
624629
}

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private List<Integer> filter(boolean inSingleFileFragment) {
177177

178178

179179
private void filterShareFile(List<Integer> toHide, OCCapability capability) {
180-
if (!isSingleSelection() || containsEncryptedFile() || hasEncryptedParent() ||
180+
if (!isSingleSelection() || containsEncryptedFile() || hasEncryptedParent() || containsEncryptedFolder() ||
181181
(!isShareViaLinkAllowed() && !isShareWithUsersAllowed()) ||
182182
!isShareApiEnabled(capability) || !files.iterator().next().canReshare()) {
183183
toHide.add(R.id.action_send_share_file);
@@ -208,19 +208,21 @@ private void filterSendFiles(List<Integer> toHide, boolean inSingleFileFragment)
208208
}
209209

210210
private void filterDetails(Collection<Integer> toHide) {
211-
if (!isSingleSelection()) {
211+
if (!isSingleSelection() || containsEncryptedFolder() || containsEncryptedFile()) {
212212
toHide.add(R.id.action_see_details);
213213
}
214214
}
215215

216216
private void filterFavorite(List<Integer> toHide, boolean synchronizing) {
217-
if (files.isEmpty() || synchronizing || allFavorites()) {
217+
if (files.isEmpty() || synchronizing || allFavorites() || containsEncryptedFile()
218+
|| containsEncryptedFolder()) {
218219
toHide.add(R.id.action_favorite);
219220
}
220221
}
221222

222223
private void filterUnfavorite(List<Integer> toHide, boolean synchronizing) {
223-
if (files.isEmpty() || synchronizing || allNotFavorites()) {
224+
if (files.isEmpty() || synchronizing || allNotFavorites() || containsEncryptedFile()
225+
|| containsEncryptedFolder()) {
224226
toHide.add(R.id.action_unset_favorite);
225227
}
226228
}
@@ -253,7 +255,7 @@ private void filterUnlock(List<Integer> toHide, boolean fileLockingEnabled) {
253255

254256
private void filterEncrypt(List<Integer> toHide, boolean endToEndEncryptionEnabled) {
255257
if (files.isEmpty() || !isSingleSelection() || isSingleFile() || isEncryptedFolder() || isGroupFolder()
256-
|| !endToEndEncryptionEnabled || !isEmptyFolder() || isShared()) {
258+
|| !endToEndEncryptionEnabled || !isEmptyFolder() || isShared() || isInSubFolder()) {
257259
toHide.add(R.id.action_encrypted);
258260
}
259261
}
@@ -355,8 +357,10 @@ private void filterSelectAll(List<Integer> toHide, boolean inSingleFileFragment)
355357
}
356358

357359
private void filterRemove(List<Integer> toHide, boolean synchronizing) {
358-
if (files.isEmpty() || synchronizing || containsLockedFile()
359-
|| containsEncryptedFolder() || isFolderAndContainsEncryptedFile()) {
360+
if ((files.isEmpty() || synchronizing || containsLockedFile()
361+
|| containsEncryptedFolder() || isFolderAndContainsEncryptedFile())
362+
//show delete option for encrypted sub-folder
363+
&& !hasEncryptedParent()) {
360364
toHide.add(R.id.action_remove_file);
361365
}
362366
}
@@ -597,4 +601,15 @@ private boolean isShared() {
597601
}
598602
return false;
599603
}
604+
605+
private boolean isInSubFolder() {
606+
OCFile folder = files.iterator().next();
607+
OCFile parent = storageManager.getFileById(folder.getParentId());
608+
609+
if (parent == null) {
610+
return false;
611+
}
612+
613+
return !OCFile.ROOT_PATH.equals(parent.getRemotePath());
614+
}
600615
}

0 commit comments

Comments
 (0)