From ebf359634139ff2125233a78a976388082abf00c Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 9 Mar 2015 21:04:03 +0100 Subject: rearrange linked id layouts, add CertListWidget --- OpenKeychain/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 97c8a6d5e..8a39cafc6 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -20,6 +20,7 @@ dependencies { compile 'it.neokree:MaterialNavigationDrawer:1.3.1' compile 'com.nispok:snackbar:2.9.1' compile 'com.getbase:floatingactionbutton:1.8.0' + compile 'com.ocpsoft:ocpsoft-pretty-time:1.0.6' // libs as submodules compile project(':extern:openpgp-api-lib') -- cgit v1.2.3 From 9aff6c7f8527f3eb78a14c62a677a2fd0631130e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 9 May 2015 19:26:11 +0200 Subject: linked-ids: add certificate pinning, pin twitter api cert --- OpenKeychain/build.gradle | 1 + 1 file changed, 1 insertion(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 7d6cf17b9..0cc09d663 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -28,6 +28,7 @@ dependencies { compile 'com.mikepenz.iconics:octicons-typeface:2.2.0@aar' compile 'com.mikepenz.iconics:meteocons-typeface:1.1.1@aar' compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar' + compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' // libs as submodules compile project(':extern:openpgp-api-lib') -- cgit v1.2.3 From ad7c567f7c02db80cdae045407f0799958593979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 17 Aug 2015 13:15:19 +0200 Subject: Version 3.5 --- OpenKeychain/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 7d2f40128..d6d19f718 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -117,8 +117,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 22 - versionCode 34100 - versionName "3.4.1" + versionCode 35000 + versionName "3.5" applicationId "org.sufficientlysecure.keychain" // the androidjunitrunner is broken regarding coverage, see here: // https://code.google.com/p/android/issues/detail?id=170607 -- cgit v1.2.3 From 931342ae7da5674b4a4bd3b64e1994a372b61703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 18 Aug 2015 11:21:23 +0200 Subject: Version 3.5.1 --- OpenKeychain/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index d6d19f718..2f47b0b92 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -117,8 +117,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 22 - versionCode 35000 - versionName "3.5" + versionCode 35100 + versionName "3.5.1" applicationId "org.sufficientlysecure.keychain" // the androidjunitrunner is broken regarding coverage, see here: // https://code.google.com/p/android/issues/detail?id=170607 -- cgit v1.2.3 From 448657602ce5baa5b2a99e26ab2eb2fb8061778f Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Thu, 30 Jul 2015 04:39:38 +0530 Subject: improved orbot notify, added periodic sync --- OpenKeychain/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 2f47b0b92..2ca1d752a 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -141,9 +141,11 @@ android { // Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE. buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.account\"" + buildConfigField "String", "PROVIDER_CONTENT_AUTHORITY", "\"org.sufficientlysecure.keychain.provider\"" // Reference them in .xml files. resValue "string", "account_type", "org.sufficientlysecure.keychain.account" + resValue "string", "provider_content_authority", "org.sufficientlysecure.keychain.provider" } debug { @@ -151,9 +153,11 @@ android { // Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE. buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.debug.account\"" + buildConfigField "String", "PROVIDER_CONTENT_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.provider\"" // Reference them in .xml files. resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" + resValue "string", "provider_content_authority", "org.sufficientlysecure.keychain.debug.provider" // Enable code coverage (Jacoco) testCoverageEnabled true -- cgit v1.2.3 From 36f7ef28089154b42ed290f55e11010a802d846b Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Sep 2015 11:47:28 +0200 Subject: enable incremental and jumboMode for dexing, speeds up process considerably --- OpenKeychain/build.gradle | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 7c68ae062..cbdd498a5 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -207,7 +207,9 @@ android { // Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems dexOptions { + incremental = true preDexLibraries = false + jumboMode = true javaMaxHeapSize "2g" } -- cgit v1.2.3 From ceefa960764aa93523aa563f0291551bbbe8d7a5 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Sep 2015 12:10:24 +0200 Subject: linked: move github client id and secret into build vars --- OpenKeychain/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index cbdd498a5..273efac7d 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -157,6 +157,10 @@ android { buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.debug.account\"" buildConfigField "String", "PROVIDER_CONTENT_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.provider\"" + // Github api for debug build only + buildConfigField "String", "GITHUB_CLIENT_ID", "\"7a011b66275f244d3f21\"" + buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"ced8a6655719d8c6848396de97b3f5d7a89fec\"" + // Reference them in .xml files. resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" resValue "string", "provider_content_authority", "org.sufficientlysecure.keychain.debug.provider" -- cgit v1.2.3 From 9ac150eae020f57b0e776ec2622ddf444e4e2e4e Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 10 Sep 2015 16:29:16 +0200 Subject: linked: fix client secret paste error --- OpenKeychain/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/build.gradle') diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 273efac7d..7bb6eba9b 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -159,7 +159,7 @@ android { // Github api for debug build only buildConfigField "String", "GITHUB_CLIENT_ID", "\"7a011b66275f244d3f21\"" - buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"ced8a6655719d8c6848396de97b3f5d7a89fec\"" + buildConfigField "String", "GITHUB_CLIENT_SECRET", "\"eaced8a6655719d8c6848396de97b3f5d7a89fec\"" // Reference them in .xml files. resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account" -- cgit v1.2.3