Skip to content

Commit b106f71

Browse files
Merge pull request #1000 from nextcloud/e2eKey
Expose if e2e keys is exists
2 parents eff7e86 + ac903bb commit b106f71

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

library/src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
159159
private static final String NODE_USER_STATUS_ENABLED = "enabled";
160160
private static final String NODE_USER_STATUS_SUPPORTS_EMOJI = "supports_emoji";
161161

162+
// end to end encryption
163+
private static final String PROPERTY_KEYS_EXIST = "keys-exist";
164+
162165

163166
private OCCapability currentCapability = null;
164167

@@ -556,6 +559,19 @@ private OCCapability parseResponse(String response) throws JSONException {
556559
} else {
557560
capability.setEndToEndEncryption(CapabilityBooleanType.FALSE);
558561
}
562+
563+
if (respEndToEndEncryption.has(PROPERTY_KEYS_EXIST)) {
564+
final boolean keysExist = respEndToEndEncryption.getBoolean(PROPERTY_KEYS_EXIST);
565+
if (keysExist) {
566+
capability.setEndToEndEncryptionKeysExist(CapabilityBooleanType.TRUE);
567+
} else {
568+
capability.setEndToEndEncryptionKeysExist(CapabilityBooleanType.FALSE);
569+
}
570+
} else {
571+
capability.setEndToEndEncryptionKeysExist(CapabilityBooleanType.UNKNOWN);
572+
}
573+
574+
559575
Log_OC.d(TAG, "*** Added " + NODE_END_TO_END_ENCRYPTION);
560576
}
561577

library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class OCCapability {
8686
var fullNextSearchFiles: CapabilityBooleanType? = null
8787

8888
var endToEndEncryption = CapabilityBooleanType.UNKNOWN
89+
var endToEndEncryptionKeysExist = CapabilityBooleanType.UNKNOWN
8990

9091
// Richdocuments
9192
var richDocuments = CapabilityBooleanType.UNKNOWN

0 commit comments

Comments
 (0)