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

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

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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)) {

View File

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

View File

@@ -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">