From 294f068991dce1dbb845761a5a0fc7a139de3992 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Sun, 26 Jul 2015 14:53:31 +0200 Subject: prompt for an external dir if none is selected --- .../java/com/zeapo/pwdstore/utils/PasswordRepository.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/utils') 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 getFilesList(){ -- cgit v1.2.3