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

avoid adding anything when getting back from an activity

Browse source
This commit is contained in:
Zeapo 2014-08-01 14:01:54 +01:00
parent 4fadd0f81f
commit c19191a3d5
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package com.zeapo.pwdstore;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
@ -16,19 +15,16 @@ import com.zeapo.pwdstore.utils.PasswordItem;
import com.zeapo.pwdstore.utils.PasswordRepository;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.transport.CredentialItem;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.util.Stack;
public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentInteractionListener, PasswordFragment.OnFragmentInteractionListener {
private int listState = 0;
private Stack<Integer> scrollPositions;
/** if we leave the activity to do something, do not add any other fragment */
private boolean leftActivity = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -48,6 +44,12 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
checkLocalRepository();
}
@Override
public void onPause() {
super.onPause();
this.leftActivity = true;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
@ -98,7 +100,10 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
}
private void checkLocalRepository() {
// final File localDir = new File(getFilesDir() + "/store/.git");
// if we are coming back from gpg do not anything
if (this.leftActivity)
return;
checkLocalRepository(PasswordRepository.getWorkTree());
}
@ -141,6 +146,8 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
fragmentTransaction.replace(R.id.main_layout, passFrag, "PasswordsList");
fragmentTransaction.commit();
}
this.leftActivity = false;
}
/** Stack the positions the different fragments were at */
@ -157,6 +164,8 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
} else {
try {
try {
this.leftActivity = true;
Intent intent = new Intent(this, PgpHandler.class);
intent.putExtra("PGP-ID", FileUtils.readFileToString(PasswordRepository.getFile("/.gpg-id")));
intent.putExtra("NAME", item.getName());