diff options
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/PasswordStore.java | 1 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/UserPreference.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java | 2 | ||||
| -rw-r--r-- | app/src/main/res/xml/preference.xml | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index 0188f8f5..88b24916 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.zeapo.pwdstore" minSdkVersion 15 targetSdkVersion 22 - versionCode 38 - versionName "1.2.0.18" + versionCode 39 + versionName "1.2.0.19 (experimental)" } compileOptions { diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 048a7b29..30777d46 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -24,6 +24,7 @@ import com.zeapo.pwdstore.utils.PasswordItem; import com.zeapo.pwdstore.utils.PasswordRecyclerAdapter; import com.zeapo.pwdstore.utils.PasswordRepository; +import org.apache.commons.io.FileUtils; import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.Git; diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java index 00e71ae8..4c6ad4f5 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java @@ -45,6 +45,8 @@ public class UserPreference extends AppCompatActivity { final UserPreference callingActivity = (UserPreference) getActivity(); final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences(); + addPreferencesFromResource(R.xml.preference); + Preference keyPref = findPreference("openpgp_key_id_pref"); String selectedKeys = sharedPreferences.getString("openpgp_key_ids", ""); if (Strings.isNullOrEmpty(selectedKeys)) { 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 9395fd68..245d9604 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java +++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java @@ -107,7 +107,7 @@ public class PasswordRepository { } public static void closeRepository() { - repository.close(); + if (repository != null) repository.close(); repository = null; } diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml index b3bed289..bbb1ed24 100644 --- a/app/src/main/res/xml/preference.xml +++ b/app/src/main/res/xml/preference.xml @@ -9,6 +9,8 @@ android:summary="Use an external password repository"/> <Preference android:title="Select external repository" android:key="pref_select_external" android:dependency="git_external"/> + <CheckBoxPreference android:title="Enable git" android:key="git_enabled" + android:summary="Enable Git" android:enabled="false"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_crypto_title"> |