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 --- .../com/zeapo/pwdstore/DividerItemDecoration.java | 4 +-- .../java/com/zeapo/pwdstore/PasswordStore.java | 8 ++--- .../java/com/zeapo/pwdstore/UserPreference.java | 10 +++--- .../pwdstore/autofill/AutofillRecyclerAdapter.java | 39 +++++++++++----------- .../java/com/zeapo/pwdstore/crypto/PgpHandler.java | 4 +-- .../java/com/zeapo/pwdstore/git/GitActivity.java | 4 --- .../java/com/zeapo/pwdstore/git/GitOperation.java | 10 +++--- .../java/com/zeapo/pwdstore/git/SyncOperation.java | 10 +++--- .../java/com/zeapo/pwdstore/pwgen/PRNGFixes.java | 5 +-- .../java/com/zeapo/pwdstore/pwgen/pw_phonemes.java | 2 +- .../java/com/zeapo/pwdstore/pwgen/pw_rand.java | 2 +- .../java/com/zeapo/pwdstore/pwgen/randnum.java | 2 +- .../com/zeapo/pwdstore/pwgenDialogFragment.java | 2 ++ .../zeapo/pwdstore/utils/EntryRecyclerAdapter.java | 6 ++-- .../com/zeapo/pwdstore/utils/PasswordItem.java | 21 ++---------- .../zeapo/pwdstore/utils/PasswordRepository.java | 3 +- 16 files changed, 55 insertions(+), 77 deletions(-) (limited to 'app/src/main/java/com') diff --git a/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java b/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java index 7bc66b62..bc174318 100644 --- a/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java +++ b/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java @@ -8,7 +8,7 @@ import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.view.View; -public class DividerItemDecoration extends RecyclerView.ItemDecoration { +class DividerItemDecoration extends RecyclerView.ItemDecoration { private static final int[] ATTRS = new int[]{android.R.attr.listDivider}; @@ -26,7 +26,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { /** * Custom divider will be used */ - public DividerItemDecoration(Context context, int resId) { + DividerItemDecoration(Context context, int resId) { mDivider = ContextCompat.getDrawable(context, resId); } diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index fb8ec8c7..6c232ab8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -294,7 +294,7 @@ public class PasswordStore extends AppCompatActivity { checkLocalRepository(); } - public void initializeRepositoryInfo() { + private void initializeRepositoryInfo() { if (settings.getBoolean("git_external", false) && settings.getString("git_external_repo", null) != null) { File dir = new File(settings.getString("git_external_repo", null)); @@ -521,13 +521,13 @@ public class PasswordStore extends AppCompatActivity { /** * Updates the adapter with the current view of passwords */ - public void refreshListAdapter() { + private void refreshListAdapter() { if ((null != plist)) { plist.refreshAdapter(); } } - public void filterListAdapter(String filter) { + private void filterListAdapter(String filter) { if ((null != plist)) { plist.filterAdapter(filter); } @@ -643,7 +643,7 @@ public class PasswordStore extends AppCompatActivity { } } - protected void initRepository(final int operation) { + private void initRepository(final int operation) { PasswordRepository.closeRepository(); new AlertDialog.Builder(this) diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java index 9ac88ef6..e39ad1c6 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java @@ -285,7 +285,7 @@ public class UserPreference extends AppCompatActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); } - public void selectExternalGitRepository() { + private void selectExternalGitRepository() { final Activity activity = this; new AlertDialog.Builder(this). setTitle("Choose where to store the passwords"). @@ -332,7 +332,7 @@ public class UserPreference extends AppCompatActivity { /** * Opens a file explorer to import the private key */ - public void getSshKeyWithPermissions(boolean useDefaultPicker) { + private void getSshKeyWithPermissions(boolean useDefaultPicker) { final Activity activity = this; if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) { @@ -362,7 +362,7 @@ public class UserPreference extends AppCompatActivity { /** * Opens a file explorer to import the private key */ - public void getSshKey(boolean useDefaultPicker) { + private void getSshKey(boolean useDefaultPicker) { if (useDefaultPicker) { Intent intent = new Intent(Intent.ACTION_GET_CONTENT); intent.setType("*/*"); @@ -382,7 +382,7 @@ public class UserPreference extends AppCompatActivity { } } - public void exportPasswordsWithPermissions() { + private void exportPasswordsWithPermissions() { final Activity activity = this; if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { @@ -421,7 +421,7 @@ public class UserPreference extends AppCompatActivity { /** * Opens a key generator to generate a public/private key pair */ - public void makeSshKey(boolean fromPreferences) { + private void makeSshKey(boolean fromPreferences) { Intent intent = new Intent(getApplicationContext(), SshKeyGen.class); startActivity(intent); if (!fromPreferences) { diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java index 80942c58..b28687d8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillRecyclerAdapter.java @@ -18,23 +18,23 @@ import com.zeapo.pwdstore.R; import java.util.ArrayList; import java.util.List; -public class AutofillRecyclerAdapter extends RecyclerView.Adapter { +class AutofillRecyclerAdapter extends RecyclerView.Adapter { private SortedList apps; private ArrayList allApps; // for filtering, maintain a list of all private AutofillPreferenceActivity activity; - Drawable browserIcon = null; + private Drawable browserIcon = null; - public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { + class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { public View view; public TextView name; - public TextView secondary; + TextView secondary; public ImageView icon; - public String packageName; - public String appName; - public Boolean isWeb; + String packageName; + String appName; + Boolean isWeb; - public ViewHolder(View view) { + ViewHolder(View view) { super(view); this.view = view; name = (TextView) view.findViewById(R.id.app_name); @@ -50,13 +50,13 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter allApps, final PackageManager pm + AutofillRecyclerAdapter(List allApps, final PackageManager pm , AutofillPreferenceActivity activity) { SortedList.Callback callback = new SortedListAdapterCallback(this) { // don't take into account secondary text. This is good enough @@ -92,7 +92,6 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter(AppInfo.class, callback); this.apps.addAll(allApps); this.allApps = new ArrayList<>(allApps); - PackageManager pm1 = pm; this.activity = activity; try { browserIcon = activity.getPackageManager().getApplicationIcon("com.android.browser"); @@ -155,28 +154,28 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter files = new ArrayList<>(Arrays.asList(path.listFiles((FileFilter) FileFilterUtils.directoryFileFilter()))); - files.addAll(new ArrayList<>((List) FileUtils.listFiles(path, new String[]{"gpg"}, false))); + files.addAll(new ArrayList<>(FileUtils.listFiles(path, new String[]{"gpg"}, false))); return new ArrayList<>(files); } -- cgit v1.2.3