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

corrected a nasty bug, resolves #18

Browse source
This commit is contained in:
knuthy 2014-10-01 11:13:40 +02:00
parent cc2883fe1b
commit 7264494a02
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/app-debug.apk
View file

Binary file not shown.

BIN
app/app-release.apk
View file

Binary file not shown.

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

@ -98,7 +98,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
return true; return true;
case R.id.menu_add_password: case R.id.menu_add_password:
if (PasswordRepository.isInitialized()) { if (!PasswordRepository.isInitialized()) {
initBefore.show(); initBefore.show();
break; break;
} }
@ -110,7 +110,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
// break; // break;
case R.id.git_push: case R.id.git_push:
if (PasswordRepository.isInitialized()) { if (!PasswordRepository.isInitialized()) {
initBefore.show(); initBefore.show();
break; break;
} }
@ -122,7 +122,7 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
return true; return true;
case R.id.git_pull: case R.id.git_pull:
if (PasswordRepository.isInitialized()) { if (!PasswordRepository.isInitialized()) {
initBefore.show(); initBefore.show();
break; break;
} }
@ -250,12 +250,14 @@ public class PasswordStore extends Activity implements ToCloneOrNot.OnFragmentI
case 0: case 0:
if(!localDir.equals(PasswordRepository.getWorkTree())) if(!localDir.equals(PasswordRepository.getWorkTree()))
break; break;
PasswordRepository.setInitialized(false);
ToCloneOrNot cloneFrag = new ToCloneOrNot(); ToCloneOrNot cloneFrag = new ToCloneOrNot();
fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot"); fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot");
fragmentTransaction.commit(); fragmentTransaction.commit();
break; break;
default: default:
PasswordRepository.setInitialized(true);
PasswordFragment passFrag = new PasswordFragment(); PasswordFragment passFrag = new PasswordFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("Path", localDir.getAbsolutePath()); args.putString("Path", localDir.getAbsolutePath());

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

@ -38,7 +38,6 @@ public class PasswordRepository {
.readEnvironment() .readEnvironment()
.findGitDir() .findGitDir()
.build(); .build();
initialized = true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
@ -51,6 +50,10 @@ public class PasswordRepository {
return initialized; return initialized;
} }
public static void setInitialized(boolean v) {
initialized = v;
}
public static void createRepository(File localDir) { public static void createRepository(File localDir) {
localDir.delete(); localDir.delete();
@ -71,6 +74,7 @@ public class PasswordRepository {
.setName("master") .setName("master")
.call(); .call();
initialized = true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return; return;