summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2019-11-08 12:30:14 +0530
committerHarsh Shandilya <msfjarvis@gmail.com>2019-11-08 12:30:14 +0530
commit67160f50d16e725a1464214da2d4a43ef671f10e (patch)
treeff44b33af13f411fa87ced9943eb3339c004c95b
parentb9e2d6d498dfdf38314108ee507adc29c87ebefb (diff)
Re-add OpenPgpAppPreference
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
-rw-r--r--app/build.gradle6
-rw-r--r--app/src/main/res/xml/preference.xml4
-rw-r--r--versions.gradle2
3 files changed, 7 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index a97ebab7..8f557ca3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,6 +10,10 @@ plugins {
id 'kotlin-android-extensions'
}
+repositories {
+ maven { url 'https://jitpack.io' }
+}
+
android {
defaultConfig {
applicationId 'com.zeapo.pwdstore'
@@ -76,7 +80,7 @@ dependencies {
implementation 'com.google.android.material:material:' + versions.material
implementation 'androidx.annotation:annotation:' + versions.annotation
implementation 'androidx.biometric:biometric:' + versions.biometric
- implementation 'org.sufficientlysecure:openpgp-api:' + versions.openpgp
+ implementation 'com.github.msfjarvis:openpgp-api:' + versions.openpgp
implementation('org.eclipse.jgit:org.eclipse.jgit:' + versions.jgit) {
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
}
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 25026517..6ac317ad 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -40,11 +40,9 @@
</androidx.preference.PreferenceCategory>
<androidx.preference.PreferenceCategory android:title="@string/pref_crypto_title">
- <!-- TODO(msf): Update the damn library and re-enable this
- <org.openintents.openpgp.util.OpenPgpAppPreference
+ <org.openintents.openpgp.util.OpenPgpAppPreference2
android:key="openpgp_provider_list"
android:title="@string/pref_provider_title" />
- -->
<androidx.preference.Preference
android:key="openpgp_key_id_pref"
android:title="@string/pref_key_title" />
diff --git a/versions.gradle b/versions.gradle
index 9670d26b..611eab65 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -35,7 +35,7 @@ ext {
commons_codec: '1.13',
jgit: '3.7.1.201504261725-r',
jsch: '0.1.55',
- openpgp: '12.0',
+ openpgp: 'v14',
sshauth: '1.0'
]
}