diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-04 11:30:36 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-04 11:30:36 +0200 |
| commit | 10e96dff43bfc9ff36fdd5a282b20f20df53d6db (patch) | |
| tree | b058a1ebde65d7312e2a41c824254a5a4646b193 | |
| parent | dece50244b62c817917443e849811325be99c63a (diff) | |
| download | open-keychain-10e96dff43bfc9ff36fdd5a282b20f20df53d6db.tar.gz open-keychain-10e96dff43bfc9ff36fdd5a282b20f20df53d6db.tar.bz2 open-keychain-10e96dff43bfc9ff36fdd5a282b20f20df53d6db.zip | |
Add safeslinger to build
| -rw-r--r-- | OpenKeychain/build.gradle | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 1 | ||||
| m--------- | extern/safeslinger-exchange | 0 | ||||
| -rw-r--r-- | settings.gradle | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 32ae8ceb0..ec6d2c35d 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -20,11 +20,12 @@ dependencies { compile project(':extern:KeybaseLib:Lib') compile project(':extern:TokenAutoComplete:library') compile project(':extern:openpgp-card-nfc-lib:library') + compile project(':extern:safeslinger-exchange') } android { compileSdkVersion 19 - buildToolsVersion "19.1" + buildToolsVersion '19.1' defaultConfig { minSdkVersion 9 @@ -67,7 +68,7 @@ android { checkAllWarnings true htmlReport true - htmlOutput file("lint-report.html") + htmlOutput file('lint-report.html') } // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems @@ -78,7 +79,7 @@ android { // NOTE: This disables Lint! tasks.whenTaskAdded { task -> - if (task.name.contains("lint")) { + if (task.name.contains('lint')) { task.enabled = false } } diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 0e5ffe8b3..e644012eb 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -54,6 +54,7 @@ <uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" /> <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange -Subproject 7e10175f2f7560d777b93fbf365a547191dd406 +Subproject b0f7e0af9b19e63032ce2452b6ca27285a72793 diff --git a/settings.gradle b/settings.gradle index 7b9bb577a..3e232d229 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,3 +14,4 @@ include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:TokenAutoComplete:library' include ':extern:openpgp-card-nfc-lib:library' +include ':extern:safeslinger-exchange'
\ No newline at end of file |