Loading library/src/main/java/com/nextcloud/android/lib/resources/users/GenerateAppPasswordRemoteOperation.java +1 −1 Original line number Original line Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class GenerateAppPasswordRemoteOperation extends OCSRemoteOperation { private final SessionTimeOut sessionTimeOut; private final SessionTimeOut sessionTimeOut; public GenerateAppPasswordRemoteOperation() { public GenerateAppPasswordRemoteOperation() { sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); this(SessionTimeOutKt.getDefaultSessionTimeOut()); } } public GenerateAppPasswordRemoteOperation(SessionTimeOut sessionTimeOut) { public GenerateAppPasswordRemoteOperation(SessionTimeOut sessionTimeOut) { Loading library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java +1 −2 Original line number Original line Diff line number Diff line Loading @@ -36,8 +36,7 @@ public class RichWorkspaceDirectEditingRemoteOperation extends RemoteOperation { private final String path; private final String path; public RichWorkspaceDirectEditingRemoteOperation(String path) { public RichWorkspaceDirectEditingRemoteOperation(String path) { this.path = path; this(path, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public RichWorkspaceDirectEditingRemoteOperation(String path, SessionTimeOut sessionTimeOut) { public RichWorkspaceDirectEditingRemoteOperation(String path, SessionTimeOut sessionTimeOut) { Loading library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java +1 −2 Original line number Original line Diff line number Diff line Loading @@ -44,8 +44,7 @@ public class GetMetadataRemoteOperation extends RemoteOperation<MetadataResponse * Constructor * Constructor */ */ public GetMetadataRemoteOperation(long fileId) { public GetMetadataRemoteOperation(long fileId) { this.fileId = fileId; this(fileId, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public GetMetadataRemoteOperation(long fileId, SessionTimeOut sessionTimeOut) { public GetMetadataRemoteOperation(long fileId, SessionTimeOut sessionTimeOut) { Loading library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java +9 −11 Original line number Original line Diff line number Diff line Loading @@ -30,7 +30,9 @@ public class LockFileRemoteOperation extends RemoteOperation<String> { private static final String COUNTER_HEADER = "X-NC-E2EE-COUNTER"; private static final String COUNTER_HEADER = "X-NC-E2EE-COUNTER"; private final long localId; private final long localId; private long counter = -1; private final long counter; private static final long defaultCounter = -1; // JSON node names // JSON node names private static final String NODE_OCS = "ocs"; private static final String NODE_OCS = "ocs"; Loading @@ -42,24 +44,20 @@ public class LockFileRemoteOperation extends RemoteOperation<String> { * Constructor * Constructor */ */ public LockFileRemoteOperation(long localId, long counter) { public LockFileRemoteOperation(long localId, long counter) { this.localId = localId; this(localId, counter, SessionTimeOutKt.getDefaultSessionTimeOut()); this.counter = counter; sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public LockFileRemoteOperation(long localId) { public LockFileRemoteOperation(long localId) { this.localId = localId; this(localId, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public LockFileRemoteOperation(long localId, long counter, SessionTimeOut sessionTimeOut) { public LockFileRemoteOperation(long localId, SessionTimeOut sessionTimeOut) { this.localId = localId; this(localId, defaultCounter, sessionTimeOut); this.counter = counter; this.sessionTimeOut = sessionTimeOut; } } public LockFileRemoteOperation(long localId, SessionTimeOut sessionTimeOut) { public LockFileRemoteOperation(long localId, long counter, SessionTimeOut sessionTimeOut) { this.localId = localId; this.localId = localId; this.counter = counter; this.sessionTimeOut = sessionTimeOut; this.sessionTimeOut = sessionTimeOut; } } Loading library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java +1 −3 Original line number Original line Diff line number Diff line Loading @@ -45,9 +45,7 @@ public class StoreMetadataRemoteOperation extends RemoteOperation { * Constructor * Constructor */ */ public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson) { public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson) { this.fileId = fileId; this(fileId, encryptedMetadataJson, SessionTimeOutKt.getDefaultSessionTimeOut()); this.encryptedMetadataJson = encryptedMetadataJson; sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson, SessionTimeOut sessionTimeOut) { public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson, SessionTimeOut sessionTimeOut) { Loading Loading
library/src/main/java/com/nextcloud/android/lib/resources/users/GenerateAppPasswordRemoteOperation.java +1 −1 Original line number Original line Diff line number Diff line Loading @@ -36,7 +36,7 @@ public class GenerateAppPasswordRemoteOperation extends OCSRemoteOperation { private final SessionTimeOut sessionTimeOut; private final SessionTimeOut sessionTimeOut; public GenerateAppPasswordRemoteOperation() { public GenerateAppPasswordRemoteOperation() { sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); this(SessionTimeOutKt.getDefaultSessionTimeOut()); } } public GenerateAppPasswordRemoteOperation(SessionTimeOut sessionTimeOut) { public GenerateAppPasswordRemoteOperation(SessionTimeOut sessionTimeOut) { Loading
library/src/main/java/com/nextcloud/android/lib/richWorkspace/RichWorkspaceDirectEditingRemoteOperation.java +1 −2 Original line number Original line Diff line number Diff line Loading @@ -36,8 +36,7 @@ public class RichWorkspaceDirectEditingRemoteOperation extends RemoteOperation { private final String path; private final String path; public RichWorkspaceDirectEditingRemoteOperation(String path) { public RichWorkspaceDirectEditingRemoteOperation(String path) { this.path = path; this(path, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public RichWorkspaceDirectEditingRemoteOperation(String path, SessionTimeOut sessionTimeOut) { public RichWorkspaceDirectEditingRemoteOperation(String path, SessionTimeOut sessionTimeOut) { Loading
library/src/main/java/com/owncloud/android/lib/resources/e2ee/GetMetadataRemoteOperation.java +1 −2 Original line number Original line Diff line number Diff line Loading @@ -44,8 +44,7 @@ public class GetMetadataRemoteOperation extends RemoteOperation<MetadataResponse * Constructor * Constructor */ */ public GetMetadataRemoteOperation(long fileId) { public GetMetadataRemoteOperation(long fileId) { this.fileId = fileId; this(fileId, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public GetMetadataRemoteOperation(long fileId, SessionTimeOut sessionTimeOut) { public GetMetadataRemoteOperation(long fileId, SessionTimeOut sessionTimeOut) { Loading
library/src/main/java/com/owncloud/android/lib/resources/e2ee/LockFileRemoteOperation.java +9 −11 Original line number Original line Diff line number Diff line Loading @@ -30,7 +30,9 @@ public class LockFileRemoteOperation extends RemoteOperation<String> { private static final String COUNTER_HEADER = "X-NC-E2EE-COUNTER"; private static final String COUNTER_HEADER = "X-NC-E2EE-COUNTER"; private final long localId; private final long localId; private long counter = -1; private final long counter; private static final long defaultCounter = -1; // JSON node names // JSON node names private static final String NODE_OCS = "ocs"; private static final String NODE_OCS = "ocs"; Loading @@ -42,24 +44,20 @@ public class LockFileRemoteOperation extends RemoteOperation<String> { * Constructor * Constructor */ */ public LockFileRemoteOperation(long localId, long counter) { public LockFileRemoteOperation(long localId, long counter) { this.localId = localId; this(localId, counter, SessionTimeOutKt.getDefaultSessionTimeOut()); this.counter = counter; sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public LockFileRemoteOperation(long localId) { public LockFileRemoteOperation(long localId) { this.localId = localId; this(localId, SessionTimeOutKt.getDefaultSessionTimeOut()); sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public LockFileRemoteOperation(long localId, long counter, SessionTimeOut sessionTimeOut) { public LockFileRemoteOperation(long localId, SessionTimeOut sessionTimeOut) { this.localId = localId; this(localId, defaultCounter, sessionTimeOut); this.counter = counter; this.sessionTimeOut = sessionTimeOut; } } public LockFileRemoteOperation(long localId, SessionTimeOut sessionTimeOut) { public LockFileRemoteOperation(long localId, long counter, SessionTimeOut sessionTimeOut) { this.localId = localId; this.localId = localId; this.counter = counter; this.sessionTimeOut = sessionTimeOut; this.sessionTimeOut = sessionTimeOut; } } Loading
library/src/main/java/com/owncloud/android/lib/resources/e2ee/StoreMetadataRemoteOperation.java +1 −3 Original line number Original line Diff line number Diff line Loading @@ -45,9 +45,7 @@ public class StoreMetadataRemoteOperation extends RemoteOperation { * Constructor * Constructor */ */ public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson) { public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson) { this.fileId = fileId; this(fileId, encryptedMetadataJson, SessionTimeOutKt.getDefaultSessionTimeOut()); this.encryptedMetadataJson = encryptedMetadataJson; sessionTimeOut = SessionTimeOutKt.getDefaultSessionTimeOut(); } } public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson, SessionTimeOut sessionTimeOut) { public StoreMetadataRemoteOperation(long fileId, String encryptedMetadataJson, SessionTimeOut sessionTimeOut) { Loading