From c200566bcaec971e1756afe5ebf96baf09e88816 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 2 Jan 2019 22:44:52 +0530 Subject: Bump minSdk to 21 (#466) * Bump minSdk to 21 Signed-off-by: Harsh Shandilya * PasswordGenerator: Constify things Signed-off-by: Harsh Shandilya * Deprecate PRNG fixes The problem being fixed doesn't exist on SDK 21 and above. Signed-off-by: Harsh Shandilya * treewide: Switch to lambdas Signed-off-by: Harsh Shandilya * treewide: Formatting fixes Signed-off-by: Harsh Shandilya * treewide: Remove useless casts and add missing annotations Signed-off-by: Harsh Shandilya --- .../java/com/zeapo/pwdstore/git/config/GitConfigSessionFactory.java | 4 +--- .../java/com/zeapo/pwdstore/git/config/SshConfigSessionFactory.java | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/config') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/GitConfigSessionFactory.java b/app/src/main/java/com/zeapo/pwdstore/git/config/GitConfigSessionFactory.java index ab23361e..58762888 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/config/GitConfigSessionFactory.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/config/GitConfigSessionFactory.java @@ -3,7 +3,6 @@ package com.zeapo.pwdstore.git.config; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; - import org.eclipse.jgit.transport.JschConfigSessionFactory; import org.eclipse.jgit.transport.OpenSshConfig; import org.eclipse.jgit.util.FS; @@ -15,8 +14,7 @@ public class GitConfigSessionFactory extends JschConfigSessionFactory { } @Override - protected JSch - getJSch(final OpenSshConfig.Host hc, FS fs) throws JSchException { + protected JSch getJSch(final OpenSshConfig.Host hc, FS fs) throws JSchException { JSch jsch = super.getJSch(hc, fs); jsch.removeAllIdentity(); return jsch; diff --git a/app/src/main/java/com/zeapo/pwdstore/git/config/SshConfigSessionFactory.java b/app/src/main/java/com/zeapo/pwdstore/git/config/SshConfigSessionFactory.java index b958546e..38c5fb7e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/config/SshConfigSessionFactory.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/config/SshConfigSessionFactory.java @@ -4,7 +4,6 @@ import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; - import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.transport.CredentialItem; import org.eclipse.jgit.transport.CredentialsProvider; -- cgit v1.2.3