diff options
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/utils')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java | 18 |
1 files changed, 11 insertions, 7 deletions
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 8fa08f48..a2ca8824 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java @@ -114,18 +114,26 @@ public class PasswordRepository { repository = null; } - public static Repository initialize(Activity callingActivity) { + public static File getRepositoryDirectory(Activity callingActivity) { File dir = null; SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(callingActivity.getApplicationContext()); if (settings.getBoolean("git_external", false)) { - if (settings.getString("git_external_repo", null) != null) { - dir = new File(settings.getString("git_external_repo", null)); + String external_repo = settings.getString("git_external_repo", null); + if (external_repo != null) { + dir = new File(external_repo); } } else { dir = new File(callingActivity.getFilesDir() + "/store"); } + return dir; + } + + public static Repository initialize(Activity callingActivity) { + File dir = getRepositoryDirectory(callingActivity); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(callingActivity.getApplicationContext()); + if (dir == null) { return null; } @@ -143,10 +151,6 @@ public class PasswordRepository { return PasswordRepository.getRepository(new File(dir.getAbsolutePath() + "/.git")); } - public static ArrayList<File> getFilesList(){ - return getFilesList(repository.getWorkTree()); - } - /** * Gets the password items in the root directory * @return a list of passwords in the root direcotyr |