diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2020-12-03 16:52:22 +0530 |
---|---|---|
committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-12-21 20:30:57 +0530 |
commit | 31ec316b8b5a77781b32ebde79a09045fb3f300e (patch) | |
tree | 5c467ebf2121ae9056ded41a78f7c76ef925d412 /app/src/main/java | |
parent | 575e5f24e43f9522c925f66fd49fd1e7867cb227 (diff) |
Set 10 second timeout on JGit transport commands (#1230)
* GitOperation: set a 10 second connection timeout
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Update changelog
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
(cherry picked from commit 77e77be999ed45dfccf1c3db838821442931eff4)
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java')
-rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt index 491feaf0..5649e8de 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/operation/GitOperation.kt @@ -108,6 +108,7 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) { (transport as? SshTransport)?.sshSessionFactory = sshSessionFactory credentialsProvider?.let { transport.credentialsProvider = it } } + command.setTimeout(CONNECT_TIMEOUT) } } @@ -204,4 +205,12 @@ abstract class GitOperation(protected val callingActivity: FragmentActivity) { sshSessionFactory?.close() } } + + companion object { + + /** + * Timeout in seconds before [TransportCommand] will abort a stalled IO operation. + */ + private const val CONNECT_TIMEOUT = 10 + } } |