corrected a nasty bug, resolves #18

2 files changed, 10 insertions, 4 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 4d3ed8ee..a613b021 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -98,7 +98,7 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
                 return true;
 
             case R.id.menu_add_password:
-                if (PasswordRepository.isInitialized()) {
+                if (!PasswordRepository.isInitialized()) {
                     initBefore.show();
                     break;
                 }
@@ -110,7 +110,7 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
 //                break;
 
             case R.id.git_push:
-                if (PasswordRepository.isInitialized()) {
+                if (!PasswordRepository.isInitialized()) {
                     initBefore.show();
                     break;
                 }
@@ -122,7 +122,7 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
                 return true;
 
             case R.id.git_pull:
-                if (PasswordRepository.isInitialized()) {
+                if (!PasswordRepository.isInitialized()) {
                     initBefore.show();
                     break;
                 }
@@ -250,12 +250,14 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
             case 0:
                 if(!localDir.equals(PasswordRepository.getWorkTree()))
                     break;
+                PasswordRepository.setInitialized(false);
 
                 ToCloneOrNot cloneFrag = new ToCloneOrNot();
                 fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot");
                 fragmentTransaction.commit();
                 break;
             default:
+                PasswordRepository.setInitialized(true);
                 PasswordFragment passFrag = new PasswordFragment();
                 Bundle args = new Bundle();
                 args.putString("Path", localDir.getAbsolutePath());
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
index 3e40d4b9..24a1524c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
@@ -38,7 +38,6 @@ public class PasswordRepository {
                         .readEnvironment()
                         .findGitDir()
                         .build();
-                initialized = true;
             } catch (Exception e) {
                 e.printStackTrace();
                 return null;
@@ -51,6 +50,10 @@ public class PasswordRepository {
         return initialized;
     }
 
+    public static void setInitialized(boolean v) {
+        initialized = v;
+    }
+
     public static void createRepository(File localDir) {
         localDir.delete();
 
@@ -71,6 +74,7 @@ public class PasswordRepository {
                     .setName("master")
                     .call();
 
+            initialized = true;
         } catch (Exception e) {
             e.printStackTrace();
             return;