diff options
| author | Felix Bechstein <f@ub0r.de> | 2017-07-25 15:23:50 +0200 |
|---|---|---|
| committer | Mohamed Zenadi <zeapo@users.noreply.github.com> | 2017-07-25 14:23:50 +0100 |
| commit | 5da9e67545644925902b04a11306289add29c033 (patch) | |
| tree | de8ec31c4fe216157b7680a4defdee86429a4122 /app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java | |
| parent | 5cba6c62d7b4628dfaf482dd883e333f93d323d4 (diff) | |
| download | HardenedPass-5da9e67545644925902b04a11306289add29c033.tar.gz HardenedPass-5da9e67545644925902b04a11306289add29c033.zip | |
Fix lint warnings (#319)
* Fix lint errors/warnings
Fix a lot of lint errors and warnings.
Most things are automatically applied fixes done with android studio:
* externalize strings
* remove unused code / classes / layouts / imports
* migrate some fields to local variables
* Remove dead code from comments
Removed code that is commented out long ago.
* remove unused resources
* colors
* strings
* drawables
* layouts
* menus
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java | 109 |
1 files changed, 5 insertions, 104 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java index bf378153..e9c9bbab 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java @@ -1,15 +1,12 @@ package com.zeapo.pwdstore; import android.content.Context; -import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.v4.app.Fragment; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -33,7 +30,7 @@ import java.util.Stack; public class SelectFolderFragment extends Fragment{ public interface OnFragmentInteractionListener { - public void onFragmentInteraction(PasswordItem item); + void onFragmentInteraction(PasswordItem item); } // store the pass files list in a stack @@ -42,9 +39,7 @@ public class SelectFolderFragment extends Fragment{ private Stack<Integer> scrollPosition; private FolderRecyclerAdapter recyclerAdapter; private RecyclerView recyclerView; - private RecyclerView.LayoutManager mLayoutManager; private OnFragmentInteractionListener mListener; - private SharedPreferences settings; /** * Mandatory empty constructor for the fragment manager to instantiate the @@ -57,10 +52,9 @@ public class SelectFolderFragment extends Fragment{ super.onCreate(savedInstanceState); String path = getArguments().getString("Path"); - settings = PreferenceManager.getDefaultSharedPreferences(getActivity()); - passListStack = new Stack<ArrayList<PasswordItem>>(); - scrollPosition = new Stack<Integer>(); - pathStack = new Stack<File>(); + passListStack = new Stack<>(); + scrollPosition = new Stack<>(); + pathStack = new Stack<>(); recyclerAdapter = new FolderRecyclerAdapter((PgpHandler) getActivity(), mListener, PasswordRepository.getPasswords(new File(path), PasswordRepository.getRepositoryDirectory(getActivity()))); } @@ -71,10 +65,8 @@ public class SelectFolderFragment extends Fragment{ View view = inflater.inflate(R.layout.password_recycler_view, container, false); // use a linear layout manager - mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerView = (RecyclerView) view.findViewById(R.id.pass_recycler); - recyclerView.setLayoutManager(mLayoutManager); + recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); // use divider recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.divider)); @@ -116,10 +108,6 @@ public class SelectFolderFragment extends Fragment{ ((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true); } } - - public void savePosition(Integer position) { - - } }; } catch (ClassCastException e) { throw new ClassCastException(context.toString() @@ -127,89 +115,6 @@ public class SelectFolderFragment extends Fragment{ } } - @Override - public void onPause() { - super.onPause(); -// mListener.savePosition(mListView.getFirstVisiblePosition()); -// mListView.closeOpenedItems(); - } - - /** - * clears the adapter content and sets it back to the root view - */ - public void updateAdapter() { - passListStack.clear(); - pathStack.clear(); - scrollPosition.clear(); - recyclerAdapter.clear(); - recyclerAdapter.addAll(PasswordRepository.getPasswords(PasswordRepository.getRepositoryDirectory(getActivity()))); - - ((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false); - } - - /** - * refreshes the adapter with the latest opened category - */ - public void refreshAdapter() { - recyclerAdapter.clear(); - recyclerAdapter.addAll(pathStack.isEmpty() ? - PasswordRepository.getPasswords(PasswordRepository.getRepositoryDirectory(getActivity())) : - PasswordRepository.getPasswords(pathStack.peek(), PasswordRepository.getRepositoryDirectory(getActivity()))); - } - - /** - * filters the list adapter - * @param filter the filter to apply - */ - public void filterAdapter(String filter) { - Log.d("FRAG", "filter: " + filter); - - if (filter.isEmpty()) { - refreshAdapter(); - } else { - recursiveFilter(filter, pathStack.isEmpty() ? null : pathStack.peek()); - } - } - - /** - * recursively filters a directory and extract all the matching items - * @param filter the filter to apply - * @param dir the directory to filter - */ - private void recursiveFilter(String filter, File dir) { - // on the root the pathStack is empty - ArrayList<PasswordItem> passwordItems = dir == null ? - PasswordRepository.getPasswords(PasswordRepository.getRepositoryDirectory(getActivity())) : - PasswordRepository.getPasswords(dir, PasswordRepository.getRepositoryDirectory(getActivity())); - - boolean rec = settings.getBoolean("filter_recursively", true); - for (PasswordItem item : passwordItems) { - if (item.getType() == PasswordItem.TYPE_CATEGORY && rec) { - recursiveFilter(filter, item.getFile()); - } - boolean matches = item.toString().toLowerCase().contains(filter.toLowerCase()); - boolean inAdapter = recyclerAdapter.getValues().contains(item); - if (matches && !inAdapter) { - recyclerAdapter.add(item); - } else if (!matches && inAdapter) { - recyclerAdapter.remove(recyclerAdapter.getValues().indexOf(item)); - } - } - } - - /** - * Goes back one level back in the path - */ - public void popBack() { - if (passListStack.isEmpty()) - return; - - recyclerView.scrollToPosition(scrollPosition.pop()); - recyclerAdapter.clear(); - recyclerAdapter.addAll(passListStack.pop()); - pathStack.pop(); - } - /** * gets the current directory * @return the current directory @@ -220,8 +125,4 @@ public class SelectFolderFragment extends Fragment{ else return pathStack.peek(); } - - public boolean isNotEmpty() { - return !passListStack.isEmpty(); - } } |
