mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-31 06:15:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initial support for external *git* repositories, fix #41, fix #48

Browse Source
This commit is contained in:
Mohamed Zenadi
2015-05-17 19:12:14 +02:00
parent 7fe81e9c27
commit 275f06835a
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -9,8 +9,8 @@ android {
applicationId "com.zeapo.pwdstore" applicationId "com.zeapo.pwdstore"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 38 versionCode 39
versionName "1.2.0.18" versionName "1.2.0.19 (experimental)"
} }
compileOptions { compileOptions {

1
app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
View File

@@ -24,6 +24,7 @@ import com.zeapo.pwdstore.utils.PasswordItem;
import com.zeapo.pwdstore.utils.PasswordRecyclerAdapter; import com.zeapo.pwdstore.utils.PasswordRecyclerAdapter;
import com.zeapo.pwdstore.utils.PasswordRepository; import com.zeapo.pwdstore.utils.PasswordRepository;
import org.apache.commons.io.FileUtils;
import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;

2
app/src/main/java/com/zeapo/pwdstore/UserPreference.java
View File

@@ -45,6 +45,8 @@ public class UserPreference extends AppCompatActivity {
final UserPreference callingActivity = (UserPreference) getActivity(); final UserPreference callingActivity = (UserPreference) getActivity();
final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences(); final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
addPreferencesFromResource(R.xml.preference);
Preference keyPref = findPreference("openpgp_key_id_pref"); Preference keyPref = findPreference("openpgp_key_id_pref");
String selectedKeys = sharedPreferences.getString("openpgp_key_ids", ""); String selectedKeys = sharedPreferences.getString("openpgp_key_ids", "");
if (Strings.isNullOrEmpty(selectedKeys)) { if (Strings.isNullOrEmpty(selectedKeys)) {

2
app/src/main/java/com/zeapo/pwdstore/utils/PasswordRepository.java
View File

@@ -107,7 +107,7 @@ public class PasswordRepository {
} }
public static void closeRepository() { public static void closeRepository() {
repository.close(); if (repository != null) repository.close();
repository = null; repository = null;
} }

2
app/src/main/res/xml/preference.xml
View File

@@ -9,6 +9,8 @@
android:summary="Use an external password repository"/> android:summary="Use an external password repository"/>
<Preference android:title="Select external repository" android:key="pref_select_external" <Preference android:title="Select external repository" android:key="pref_select_external"
android:dependency="git_external"/> android:dependency="git_external"/>
<CheckBoxPreference android:title="Enable git" android:key="git_enabled"
android:summary="Enable Git" android:enabled="false"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_crypto_title"> <PreferenceCategory android:title="@string/pref_crypto_title">