From e169235d961d93105f210d0c3c4dc29a21008c68 Mon Sep 17 00:00:00 2001 From: Felix Bechstein Date: Wed, 2 Aug 2017 11:15:31 +0200 Subject: Fix more lint (#325) * fix/ignore lint errors, run lint on travis * fix/ignore some lint warnings --- app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java | 4 ---- app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java | 10 +++++----- app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java | 10 +++++----- 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java index 6314a4b3..51ab863d 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java @@ -456,8 +456,6 @@ public class GitActivity extends AppCompatActivity { /** * Save the repository information to the shared preferences settings - * - * @param view */ public void saveConfiguration(View view) { if (!saveConfiguration()) @@ -500,8 +498,6 @@ public class GitActivity extends AppCompatActivity { /** * Clones the repository, the directory exists, deletes it - * - * @param view */ public void cloneRepository(View view) { if (PasswordRepository.getRepository(null) == null) { diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java index 4002d24e..6f886687 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.java @@ -30,9 +30,9 @@ public abstract class GitOperation { public static final int GET_SSH_KEY_FROM_CLONE = 201; protected final Repository repository; - protected final Activity callingActivity; - protected UsernamePasswordCredentialsProvider provider; - protected GitCommand command; + final Activity callingActivity; + UsernamePasswordCredentialsProvider provider; + GitCommand command; /** * Creates a new git operation @@ -52,7 +52,7 @@ public abstract class GitOperation { * @param password the password * @return the current object */ - public GitOperation setAuthentication(String username, String password) { + GitOperation setAuthentication(String username, String password) { SshSessionFactory.setInstance(new GitConfigSessionFactory()); this.provider = new UsernamePasswordCredentialsProvider(username, password); return this; @@ -66,7 +66,7 @@ public abstract class GitOperation { * @param passphrase the passphrase * @return the current object */ - public GitOperation setAuthentication(File sshKey, String username, String passphrase) { + GitOperation setAuthentication(File sshKey, String username, String passphrase) { JschConfigSessionFactory sessionFactory = new SshConfigSessionFactory(sshKey.getAbsolutePath(), username, passphrase); SshSessionFactory.setInstance(sessionFactory); this.provider = null; diff --git a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java index 0094b22c..089993d3 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/SyncOperation.java @@ -16,11 +16,11 @@ import org.eclipse.jgit.api.StatusCommand; import java.io.File; public class SyncOperation extends GitOperation { - protected AddCommand addCommand; - protected StatusCommand statusCommand; - protected CommitCommand commitCommand; - protected PullCommand pullCommand; - protected PushCommand pushCommand; + private AddCommand addCommand; + private StatusCommand statusCommand; + private CommitCommand commitCommand; + private PullCommand pullCommand; + private PushCommand pushCommand; /** * Creates a new git operation -- cgit v1.2.3