Commit Graph

54 Commits

Author SHA1 Message Date
Dominik Schürmann d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +02:00
Dominik Schürmann bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Dominik Schürmann afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00
Dominik Schürmann 66554607d0 Remove unused includes in settings.gradle 2015-04-14 09:37:17 +02:00
Dominik Schürmann fd09b9d380 Remove html-textview reference from settings.gradle 2015-04-12 18:39:37 +02:00
Vincent Breitmoser 8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
Dominik Schürmann 1a12eb1a7a Cleanup settings.gradle 2015-03-03 00:27:33 +01:00
Dominik Schürmann 85b6669625 Integrate QR Code library instead of requiring the app to be installed, also due to security reasons 2015-01-14 19:14:30 +01:00
Dominik Schürmann 320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann d8e6e51452 Fix test for future creation timestamps to account for loosen timestamp check 2014-12-28 21:44:48 +01:00
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann 6b90de2489 Fix tests 2014-09-13 22:16:00 +02:00
Dominik Schürmann be199b844c Cleanup tests 2014-09-13 22:02:01 +02:00
Dominik Schürmann a1323a1a14 deactivate screenshots in new PassphraseDialogActivity 2014-09-13 21:17:19 +02:00
Dominik Schürmann cf8978b86d Revert "Fix test"
This reverts commit f392d95ac3.
2014-09-08 11:40:56 +02:00
Dominik Schürmann f392d95ac3 Fix test 2014-09-08 11:40:06 +02:00
Dominik Schürmann d0f46f1efb Integrate safeslinger share 2014-09-04 12:54:16 +02:00
Dominik Schürmann 10e96dff43 Add safeslinger to build 2014-09-04 11:30:36 +02:00
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +02:00
mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
2014-07-31 23:19:01 +02:00
Dominik Schürmann 2f5c73746d Merge branch 'master' into yubikey 2014-07-21 15:11:59 +02:00
Vincent Breitmoser 6d9eaaabb2 work on test prepare script, make the whole thing optional 2014-07-18 19:05:38 +02:00
Dominik Schürmann 3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
mar-v-in bc9922263c Add TokenAutoComplete to gradle 2014-07-15 01:53:46 +02:00
Vincent Breitmoser d4c1b781db test: add algorithm choice tests 2014-07-12 01:28:27 +02:00
Vincent Breitmoser d4fa2bbf47 test: make testing optional in build 2014-07-11 19:58:28 +02:00
Vincent Breitmoser 718acbf954 put unit tests into external module (CAVEAT)
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
2014-07-09 16:03:30 +02:00
Vincent Breitmoser d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
Daniel Albert f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 2014-06-30 19:18:20 +02:00
mar-v-in 2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
Tim Bray 17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
2014-06-13 00:27:40 +02:00
Vincent Breitmoser 97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
mar-v-in 36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
Dominik Schürmann ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00
Dominik Schürmann 6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
Dominik Schürmann 0e33fd2392 Split api libs into OpenKeychain specific and OpenPGP Provider lib 2014-03-07 23:05:03 +01:00
Dominik Schürmann 5c78c11756 remove dublication of api library, let both proejcts depend on the same 2014-02-27 16:40:59 +01:00
Daniel Haß 6d2fd89280 Added AppMsg library 2014-02-20 22:50:49 +01:00
Dominik Schürmann 754b2a6cb1 Restructuring for new API library 2014-02-09 19:22:14 +01:00
Dominik Schürmann 6eaf45940e Switch from ActionBarSherlock to ActionBarCompat 2014-02-02 14:13:09 +01:00
Dominik Schürmann 6ae99cc6cb New build files for spongy castle 2014-01-27 14:01:37 +01:00
Dominik Schürmann 59217ec9ba fix some small layout bugs, add barcode scanner lib as source lib, fix qr code scanning issues 2014-01-14 21:19:43 +01:00
Dominik Schürmann 9da46cb2ff fix gradle build 2014-01-10 09:09:36 +01:00
Dominik Schürmann 11ed8d7e16 add AndroidBootstrap lib 2014-01-09 12:31:45 +01:00
Dominik Schürmann ccb462e94f externalize zxing lib, fix gradle build 2014-01-06 22:52:45 +01:00
Dominik Schürmann f5da63f988 New list with sticky list headers library 2014-01-02 21:10:08 +01:00
Dominik Schürmann 1d91804dc7 Simple new list implementations, remove library, use simple adapter with headings 2014-01-01 22:26:19 +01:00