kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Cleanup

Browse source 
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
This commit is contained in:
Harsh Shandilya 2019-11-04 19:18:08 +05:30
parent 077e67d8e3
commit 14d997f500
No known key found for this signature in database
GPG key ID: C2E74282C2133D62
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt
View file

@ -27,7 +27,7 @@ class SelectFolderActivity : AppCompatActivity() {
passwordList = SelectFolderFragment()
val args = Bundle()
args.putString("Path", PasswordRepository.getRepositoryDirectory(applicationContext)?.absolutePath)
args.putString("Path", PasswordRepository.getRepositoryDirectory(applicationContext).absolutePath)
passwordList.arguments = args

24
app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.kt
View file

@ -38,21 +38,15 @@ import java.util.Stack
class SelectFolderFragment : Fragment() {
// store the pass files list in a stack
private lateinit var pathStack: Stack<File>
private var pathStack: Stack<File> = Stack()
private lateinit var recyclerAdapter: FolderRecyclerAdapter
private lateinit var recyclerView: RecyclerView
private lateinit var mListener: OnFragmentInteractionListener
private lateinit var listener: OnFragmentInteractionListener
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val path = requireArguments().getString("Path")
pathStack = Stack()
recyclerAdapter = FolderRecyclerAdapter(
mListener,
getPasswords(
File(path),
getRepositoryDirectory(requireActivity())!!,
sortOrder))
val path = requireNotNull(requireArguments().getString("Path"))
recyclerAdapter = FolderRecyclerAdapter(listener, getPasswords(File(path), getRepositoryDirectory(requireActivity()), sortOrder))
}
override fun onCreateView(
@ -78,18 +72,18 @@ class SelectFolderFragment : Fragment() {
override fun onAttach(context: Context) {
super.onAttach(context)
try {
mListener = object : OnFragmentInteractionListener {
listener = object : OnFragmentInteractionListener {
override fun onFragmentInteraction(item: PasswordItem) {
if (item.type == PasswordItem.TYPE_CATEGORY) {
// push the category were we're going
pathStack.push(item.file)
recyclerView.scrollToPosition(0)
recyclerAdapter.clear()
recyclerAdapter.addAll(
getPasswords(
recyclerAdapter.addAll(getPasswords(
item.file,
getRepositoryDirectory(context)!!,
sortOrder))
getRepositoryDirectory(context),
sortOrder)
)
(requireActivity() as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
}