diff options
| author | tobiasKaminsky <tobias@kaminsky.me> | 2021-07-07 09:59:18 +0300 |
|---|---|---|
| committer | tobiasKaminsky <tobias@kaminsky.me> | 2021-07-07 09:59:18 +0300 |
| commit | 4670ad6d6736a8040b27f7d86ed1dbcae95b4575 (patch) | |
| tree | e2874242d51dd429300f854054daa61fc85eba7a | |
| parent | 4ceba3ef607965feb994e082404114cc955401b6 (diff) | |
Password is checked for compromised passwort since NC23passwordPolicy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
| -rw-r--r-- | src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt | 22 | ||||
| -rw-r--r-- | src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt | 1 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt b/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt index a789a6d8..fd03c084 100644 --- a/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt +++ b/src/androidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt @@ -157,12 +157,22 @@ class UpdateShareRemoteOperationIT : AbstractIT() { Assert.assertTrue(capabilityResult.isSuccess) val capability = capabilityResult.singleData as OCCapability - if (capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_22)) { - assertEquals("Password needs to be at least 10 characters long.", result.message) - } else if (capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_21)) { - assertEquals("Password needs to be at least 8 characters long.", result.message) - } else { - assertEquals("Password needs to be at least 8 characters long", result.message) + when { + capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_23) -> { + assertEquals( + "Password needs to be at least 10 characters long. Password is present in compromised password list. Please choose a different password.", + result.message + ) + } + capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_22) -> { + assertEquals("Password needs to be at least 10 characters long.", result.message) + } + capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_21) -> { + assertEquals("Password needs to be at least 8 characters long.", result.message) + } + else -> { + assertEquals("Password needs to be at least 8 characters long", result.message) + } } assertTrue(RemoveFileRemoteOperation(folder).execute(client).isSuccess) diff --git a/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt b/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt index ecc4e1eb..98cac911 100644 --- a/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt +++ b/src/main/java/com/owncloud/android/lib/resources/status/NextcloudVersion.kt @@ -27,6 +27,7 @@ class NextcloudVersion : OwnCloudVersion { @JvmField val nextcloud_21 = NextcloudVersion(0x15000000) // 21.0 val nextcloud_22 = NextcloudVersion(0x16000000) // 22.0 + val nextcloud_23 = NextcloudVersion(0x17000000) // 23.0 } constructor(string: String) : super(string) |