diff options
Diffstat (limited to 'app/src/main/java')
16 files changed, 55 insertions, 77 deletions
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<AutofillRecyclerAdapter.ViewHolder> { +class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecyclerAdapter.ViewHolder> { private SortedList<AppInfo> apps; private ArrayList<AppInfo> 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<AutofillRecycl } - public static class AppInfo { - public String packageName; - public String appName; - public boolean isWeb; + static class AppInfo { + String packageName; + String appName; + boolean isWeb; public Drawable icon; - public AppInfo(String packageName, String appName, boolean isWeb, Drawable icon) { + AppInfo(String packageName, String appName, boolean isWeb, Drawable icon) { this.packageName = packageName; this.appName = appName; this.isWeb = isWeb; @@ -69,7 +69,7 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl } } - public AutofillRecyclerAdapter(List<AppInfo> allApps, final PackageManager pm + AutofillRecyclerAdapter(List<AppInfo> allApps, final PackageManager pm , AutofillPreferenceActivity activity) { SortedList.Callback<AppInfo> callback = new SortedListAdapterCallback<AppInfo>(this) { // don't take into account secondary text. This is good enough @@ -92,7 +92,6 @@ public class AutofillRecyclerAdapter extends RecyclerView.Adapter<AutofillRecycl this.apps = new SortedList<>(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<AutofillRecycl return apps.size(); } - public int getPosition(String appName) { + int getPosition(String appName) { return apps.indexOf(new AppInfo(null, appName, false, null)); } // for websites, URL = packageName == appName - public void addWebsite(String packageName) { + void addWebsite(String packageName) { apps.add(new AppInfo(packageName, packageName, true, browserIcon)); allApps.add(new AppInfo(packageName, packageName, true, browserIcon)); } - public void removeWebsite(String packageName) { + void removeWebsite(String packageName) { apps.remove(new AppInfo(null, packageName, false, null)); allApps.remove(new AppInfo(null, packageName, false, null)); // compare with equals } - public void updateWebsite(String oldPackageName, String packageName) { + void updateWebsite(String oldPackageName, String packageName) { apps.updateItemAt(getPosition(oldPackageName), new AppInfo (packageName, packageName, true, browserIcon)); allApps.remove(new AppInfo(null, oldPackageName, false, null)); // compare with equals allApps.add(new AppInfo(null, packageName, false, null)); } - public void filter(String s) { + void filter(String s) { if (s.isEmpty()) { apps.addAll(allApps); return; diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java index 8f75a31f..c4013dc6 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java @@ -1,5 +1,6 @@ package com.zeapo.pwdstore.crypto; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.DialogFragment; import android.app.PendingIntent; @@ -666,8 +667,6 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne /** * Encrypts a password file - * - * @param data */ public void encrypt(Intent data) { data.setAction(OpenPgpApi.ACTION_ENCRYPT); @@ -730,6 +729,7 @@ public class PgpHandler extends AppCompatActivity implements OpenPgpServiceConne } // TODO (low priority but still...) android M potential permissions crashes + @SuppressLint("SetTextI18n") @Override public void onBound(IOpenPgpService2 service) { Log.i("PGP", "ISBOUND!!"); 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 diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/PRNGFixes.java b/app/src/main/java/com/zeapo/pwdstore/pwgen/PRNGFixes.java index 201e821d..aabc27b2 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/PRNGFixes.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/PRNGFixes.java @@ -185,16 +185,12 @@ public final class PRNGFixes { /** * Input stream for reading from Linux PRNG or {@code null} if not yet * opened. - * - * @GuardedBy("sLock") */ private static DataInputStream sUrandomIn; /** * Output stream for writing to Linux PRNG or {@code null} if not yet * opened. - * - * @GuardedBy("sLock") */ private static OutputStream sUrandomOut; @@ -224,6 +220,7 @@ public final class PRNGFixes { } } + @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter") @Override protected void engineNextBytes(byte[] bytes) { if (!mSeeded) { diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_phonemes.java b/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_phonemes.java index 1b312232..297c21c5 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_phonemes.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_phonemes.java @@ -1,6 +1,6 @@ package com.zeapo.pwdstore.pwgen; -public class pw_phonemes { +class pw_phonemes { private static final int CONSONANT = 0x0001; private static final int VOWEL = 0x0002; private static final int DIPTHONG = 0x0004; diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_rand.java b/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_rand.java index 945aaf71..9afd5e4a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_rand.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/pw_rand.java @@ -1,6 +1,6 @@ package com.zeapo.pwdstore.pwgen; -public class pw_rand { +class pw_rand { /** * Generates a completely random password. diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgen/randnum.java b/app/src/main/java/com/zeapo/pwdstore/pwgen/randnum.java index 83cf4b03..583d0863 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgen/randnum.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgen/randnum.java @@ -3,7 +3,7 @@ package com.zeapo.pwdstore.pwgen; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -public class randnum { +class randnum { private static SecureRandom random; static { diff --git a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java index 7b55dccf..2a04be0e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java @@ -1,5 +1,6 @@ package com.zeapo.pwdstore; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; @@ -30,6 +31,7 @@ public class pwgenDialogFragment extends DialogFragment { } + @SuppressLint("SetTextI18n") @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java index a36b1124..f1d2c36b 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/EntryRecyclerAdapter.java @@ -1,5 +1,6 @@ package com.zeapo.pwdstore.utils; +import android.annotation.SuppressLint; import android.app.Activity; import android.graphics.Color; import android.support.annotation.NonNull; @@ -83,7 +84,7 @@ public abstract class EntryRecyclerAdapter extends RecyclerView.Adapter<EntryRec } @NonNull - protected View.OnLongClickListener getOnLongClickListener(ViewHolder holder, PasswordItem pass) { + View.OnLongClickListener getOnLongClickListener(ViewHolder holder, PasswordItem pass) { return new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { @@ -93,6 +94,7 @@ public abstract class EntryRecyclerAdapter extends RecyclerView.Adapter<EntryRec } // Replace the contents of a view (invoked by the layout manager) + @SuppressLint("SetTextI18n") @Override public void onBindViewHolder(final ViewHolder holder, int position) { final PasswordItem pass = getValues().get(position); @@ -118,7 +120,7 @@ public abstract class EntryRecyclerAdapter extends RecyclerView.Adapter<EntryRec holder.itemView.setBackgroundResource(R.color.deep_orange_200); holder.type.setTextColor(Color.BLACK); } else { - holder.itemView.setBackgroundResource(Color.alpha(1)); + holder.itemView.setBackgroundColor(Color.alpha(1)); holder.type.setTextColor(ContextCompat.getColor(activity, R.color.grey_500)); } } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java index cfdb829d..f45abc38 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java @@ -18,11 +18,8 @@ public class PasswordItem implements Comparable{ /** Create a password item * * Make it protected so that we use a builder - * @param name - * @param parent - * @param type */ - protected PasswordItem(String name, PasswordItem parent, char type, File file, File rootDir) { + private PasswordItem(String name, PasswordItem parent, char type, File file, File rootDir) { this.name = name; this.parent = parent; this.type = type; @@ -31,38 +28,24 @@ public class PasswordItem implements Comparable{ } /** Create a new Category item - * - * @param name - * @param parent - * @return */ public static PasswordItem newCategory(String name, File file, PasswordItem parent, File rootDir) { return new PasswordItem(name, parent, TYPE_CATEGORY, file, rootDir); } /** Create a new parentless category item - * - * @param name - * @return */ public static PasswordItem newCategory(String name, File file, File rootDir) { return new PasswordItem(name, null, TYPE_CATEGORY, file, rootDir); } /** Create a new password item - * - * @param name - * @param parent - * @return */ public static PasswordItem newPassword(String name, File file, PasswordItem parent, File rootDir) { return new PasswordItem(name, parent, TYPE_PASSWORD, file, rootDir); } /** Create a new parentless password item - * - * @param name - * @return */ public static PasswordItem newPassword(String name, File file, File rootDir) { return new PasswordItem(name, null, TYPE_PASSWORD, file, rootDir); @@ -72,7 +55,7 @@ public class PasswordItem implements Comparable{ return this.type; } - public String getName(){ + private String getName(){ return this.name; } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java index d97e3294..b1ee7ed0 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java @@ -19,7 +19,6 @@ import java.io.File; import java.io.FileFilter; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.Set; import static java.util.Collections.sort; @@ -168,7 +167,7 @@ public class PasswordRepository { Log.d("REPO", "current path: " + path.getPath()); ArrayList<File> files = new ArrayList<>(Arrays.asList(path.listFiles((FileFilter) FileFilterUtils.directoryFileFilter()))); - files.addAll(new ArrayList<>((List<File>) FileUtils.listFiles(path, new String[]{"gpg"}, false))); + files.addAll(new ArrayList<>(FileUtils.listFiles(path, new String[]{"gpg"}, false))); return new ArrayList<>(files); } |