aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/utils
diff options
context:
space:
mode:
authorMohamed Zenadi <mohamed@zenadi.com>2015-07-26 14:53:31 +0200
committerMohamed Zenadi <mohamed@zenadi.com>2015-07-26 14:54:07 +0200
commit294f068991dce1dbb845761a5a0fc7a139de3992 (patch)
tree08022b764e44913c41e489817e9ee433349fe28e /app/src/main/java/com/zeapo/pwdstore/utils
parente45afa3392e63f72ebfc7418ebad4038e6c4539d (diff)
downloadHardenedPass-294f068991dce1dbb845761a5a0fc7a139de3992.tar.gz
HardenedPass-294f068991dce1dbb845761a5a0fc7a139de3992.zip
prompt for an external dir if none is selected
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/utils')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java14
1 files changed, 4 insertions, 10 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 4836c41d..aaca0cf1 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
@@ -1,13 +1,10 @@
package com.zeapo.pwdstore.utils;
import android.app.Activity;
-import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.util.Log;
-import com.zeapo.pwdstore.UserPreference;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.eclipse.jgit.api.Git;
@@ -117,7 +114,7 @@ public class PasswordRepository {
repository = null;
}
- public static void initialize(Activity callingActivity) {
+ public static Repository initialize(Activity callingActivity) {
File dir = null;
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(callingActivity.getApplicationContext());
@@ -128,12 +125,9 @@ public class PasswordRepository {
} else {
dir = new File(callingActivity.getFilesDir() + "/store");
}
- // temp for debug
+
if (dir == null) {
- Intent intent = new Intent(callingActivity, UserPreference.class);
- intent.putExtra("operation", "git_external");
- callingActivity.startActivity(intent);
- return;
+ return null;
}
// uninitialize the repo if the dir does not exist or is absolutely empty
@@ -146,7 +140,7 @@ public class PasswordRepository {
}
// create the repository static variable in PasswordRepository
- PasswordRepository.getRepository(new File(dir.getAbsolutePath() + "/.git"));
+ return PasswordRepository.getRepository(new File(dir.getAbsolutePath() + "/.git"));
}
public static ArrayList<File> getFilesList(){