diff options
| author | Petter Arvidsson <petter.arvidsson@fidesmo.com> | 2015-12-18 10:28:00 +0100 |
|---|---|---|
| committer | Petter Arvidsson <petter.arvidsson@fidesmo.com> | 2016-01-12 18:39:31 +0100 |
| commit | 02854a617b62728184a95f1a172a1a5d27f73f22 (patch) | |
| tree | 71291e994d9a702027e41cf26158cc356078ce83 /OpenKeychain | |
| parent | dd85bbb4b5c0ee8d7356bbac766ab5e17de20b3e (diff) | |
| download | open-keychain-02854a617b62728184a95f1a172a1a5d27f73f22.tar.gz open-keychain-02854a617b62728184a95f1a172a1a5d27f73f22.tar.bz2 open-keychain-02854a617b62728184a95f1a172a1a5d27f73f22.zip | |
Use new version of Nordpol from jcenter
- Use version 0.1.13 that is now available on jcenter
- Add a "gradle witness" for this version
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/build.gradle | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 519f7ff0c..d9c3d652f 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -65,8 +65,8 @@ dependencies { compile 'com.cocosw:bottomsheet:1.2.0@aar' // Nordpol - compile 'com.fidesmo:nordpol-android:0.1.10@aar' - compile 'com.fidesmo:nordpol-core:0.1.10' + compile 'com.fidesmo:nordpol-android:0.1.15@aar' + compile 'com.fidesmo:nordpol-core:0.1.15' // libs as submodules compile project(':extern:openpgp-api-lib:openpgp-api') @@ -121,6 +121,8 @@ dependencyVerification { // 'OpenKeychain.extern:minidns:51e34ebab23ebd6bdd4cc681024040e5cfd2d713a51a4b209e4fbeaa73e5fe57', 'com.android.support:support-annotations:f347a35b9748a4103b39a6714a77e2100f488d623fd6268e259c177b200e9d82', 'com.squareup.okio:okio:114bdc1f47338a68bcbc95abf2f5cdc72beeec91812f2fcd7b521c1937876266', + 'com.fidesmo:nordpol-core:fe09e65379f2c7300b669ef7df2bfbde47729dac19edacc26b5ddb44b94ff67d', + 'com.fidesmo:nordpol-android:012f93c2c78bd5e3b35af3e8a6676c4fac56755abee252dcfdbb8b35df19e3dd' ] } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java index 1c064610f..1a04bcf43 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenNfcActivity.java @@ -191,7 +191,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity implemen protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mTagDispatcher = TagDispatcher.get(this, this, false); + mTagDispatcher = TagDispatcher.get(this, this, false, false); // Check whether we're recreating a previously destroyed instance if (savedInstanceState != null) { |