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

Use support library fragment (to avoid onAttach deprecation problems, etc)

Browse source
This commit is contained in:
Matthew Wong 2016-07-21 20:49:41 -04:00
parent 1e5303a142
commit ca10446914
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
View file

@ -1,7 +1,7 @@
package com.zeapo.pwdstore;
import android.app.Activity;
import android.app.Fragment;
import android.support.v4.app.Fragment;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
@ -94,23 +94,23 @@ public class PasswordFragment extends Fragment{
}
@Override
public void onAttach(final Activity activity) {
super.onAttach(activity);
public void onAttach(final Context context) {
super.onAttach(context);
try {
mListener = new OnFragmentInteractionListener() {
public void onFragmentInteraction(PasswordItem item) {
if (item.getType() == PasswordItem.TYPE_CATEGORY) {
// push the current password list (non filtered plz!)
passListStack.push(pathStack.isEmpty() ?
PasswordRepository.getPasswords(PasswordRepository.getRepositoryDirectory(activity)) :
PasswordRepository.getPasswords(pathStack.peek(), PasswordRepository.getRepositoryDirectory(activity)));
PasswordRepository.getPasswords(PasswordRepository.getRepositoryDirectory(context)) :
PasswordRepository.getPasswords(pathStack.peek(), PasswordRepository.getRepositoryDirectory(context)));
//push the category were we're going
pathStack.push(item.getFile());
scrollPosition.push(recyclerView.getVerticalScrollbarPosition());
recyclerView.scrollToPosition(0);
recyclerAdapter.clear();
recyclerAdapter.addAll(PasswordRepository.getPasswords(item.getFile(), PasswordRepository.getRepositoryDirectory(activity)));
recyclerAdapter.addAll(PasswordRepository.getPasswords(item.getFile(), PasswordRepository.getRepositoryDirectory(context)));
((AppCompatActivity) getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} else {
@ -127,7 +127,7 @@ public class PasswordFragment extends Fragment{
}
};
} catch (ClassCastException e) {
throw new ClassCastException(activity.toString()
throw new ClassCastException(context.toString()
+ " must implement OnFragmentInteractionListener");
}
}

6
app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
View file

@ -2,8 +2,8 @@ package com.zeapo.pwdstore;
import android.Manifest;
import android.app.Activity;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@ -331,7 +331,7 @@ public class PasswordStore extends AppCompatActivity {
}
private void checkLocalRepository(File localDir) {
FragmentManager fragmentManager = getFragmentManager();
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
if (localDir != null && settings.getBoolean("repository_initialized", false)) {
Log.d("PASS", "Check, dir: " + localDir.getAbsolutePath());

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

@ -1,9 +1,7 @@
package com.zeapo.pwdstore;
import android.app.Activity;
import android.net.Uri;
import android.os.Bundle;
import android.app.Fragment;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;