diff options
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt index 2c13fe61..97e506f5 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.kt @@ -138,20 +138,14 @@ open class PasswordRepository protected constructor() { } @JvmStatic - fun getRepositoryDirectory(context: Context): File? { - var dir: File? = null + fun getRepositoryDirectory(context: Context): File { val settings = PreferenceManager.getDefaultSharedPreferences(context.applicationContext) - - if (settings.getBoolean("git_external", false)) { + return if (settings.getBoolean("git_external", false)) { val externalRepo = settings.getString("git_external_repo", null) - if (externalRepo != null) { - dir = File(externalRepo) - } + File(requireNotNull(externalRepo)) } else { - dir = File(context.filesDir.toString() + "/store") + File(context.filesDir.toString() + "/store") } - - return dir } @JvmStatic @@ -159,10 +153,6 @@ open class PasswordRepository protected constructor() { val dir = getRepositoryDirectory(context) val settings = PreferenceManager.getDefaultSharedPreferences(context.applicationContext) - if (dir == null) { - return null - } - // uninitialize the repo if the dir does not exist or is absolutely empty if (!dir.exists() || !dir.isDirectory || dir.listFiles()!!.isEmpty()) { settings.edit().putBoolean("repository_initialized", false).apply() |