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

fix wrong class being used

Browse source
This commit is contained in:
Mohamed Zenadi 2017-07-29 15:29:32 +01:00 committed by Mohamed Zenadi
parent 958ea12a88
commit 0c09b42528
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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)

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

@ -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())));
}

4
app/src/main/java/com/zeapo/pwdstore/utils/FolderRecyclerAdapter.java
View file

@ -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;
}