diff options
3 files changed, 5 insertions, 7 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt b/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt index c3c53998..c615ce8c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/SelectFolderActivity.kt @@ -3,7 +3,6 @@ package com.zeapo.pwdstore import android.app.Activity import android.app.FragmentManager import android.os.Bundle -import android.os.PersistableBundle import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem @@ -14,8 +13,8 @@ import com.zeapo.pwdstore.utils.PasswordRepository class SelectFolderActivity : AppCompatActivity() { internal var passwordList: SelectFolderFragment? = null - override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) { - super.onCreate(savedInstanceState, persistentState) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) setContentView(R.layout.select_folder_layout) diff --git a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java index e9c9bbab..f4a91425 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java +++ b/app/src/main/java/com/zeapo/pwdstore/SelectFolderFragment.java @@ -11,7 +11,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.zeapo.pwdstore.crypto.PgpHandler; import com.zeapo.pwdstore.utils.FolderRecyclerAdapter; import com.zeapo.pwdstore.utils.PasswordItem; import com.zeapo.pwdstore.utils.PasswordRepository; @@ -55,7 +54,7 @@ public class SelectFolderFragment extends Fragment{ passListStack = new Stack<>(); scrollPosition = new Stack<>(); pathStack = new Stack<>(); - recyclerAdapter = new FolderRecyclerAdapter((PgpHandler) getActivity(), mListener, + recyclerAdapter = new FolderRecyclerAdapter((SelectFolderActivity) getActivity(), mListener, PasswordRepository.getPasswords(new File(path), PasswordRepository.getRepositoryDirectory(getActivity()))); } diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java index 04b243e1..1888cc7e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java @@ -3,8 +3,8 @@ package com.zeapo.pwdstore.utils; import android.support.annotation.NonNull; import android.view.View; +import com.zeapo.pwdstore.SelectFolderActivity; import com.zeapo.pwdstore.SelectFolderFragment; -import com.zeapo.pwdstore.crypto.PgpHandler; import java.util.ArrayList; @@ -12,7 +12,7 @@ public class FolderRecyclerAdapter extends EntryRecyclerAdapter { private final SelectFolderFragment.OnFragmentInteractionListener listener; // Provide a suitable constructor (depends on the kind of dataset) - public FolderRecyclerAdapter(PgpHandler activity, SelectFolderFragment.OnFragmentInteractionListener listener, ArrayList<PasswordItem> values) { + public FolderRecyclerAdapter(SelectFolderActivity activity, SelectFolderFragment.OnFragmentInteractionListener listener, ArrayList<PasswordItem> values) { super(activity, values); this.listener = listener; } |