moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-14 12:55:08 -05:00
Code Issues Releases Wiki Activity
3,492 Commits 12 Branches 24 Tags 116 MiB
43930ed8f2
Commit Graph

53 Commits

Author SHA1 Message Date
Dominik Schürmann
5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development 
Conflicts:
	OpenKeychain/build.gradle
 2015-01-29 09:55:09 +01:00
Dominik Schürmann
e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Vincent Breitmoser
b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser
198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Dominik Schürmann
09e992081b Style tabs, add missing drawables 2015-01-15 14:48:13 +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
9b093c6d73 Increase minSdk to 15, according to stats 2015-01-14 18:59:18 +01:00
Dominik Schürmann
2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Dominik Schürmann
2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +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
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
a2c1221397 Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +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
Vincent Breitmoser
8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Dominik Schürmann
2f5c73746d Merge branch 'master' into yubikey 2014-07-21 15:11:59 +02:00
Vincent Breitmoser
f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
Dominik Schürmann
3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
Vincent Breitmoser
faa8c2baa3 travis: get rid of lint 2014-07-11 16:39:31 +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
mar-v-in
1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
Daniel Albert
f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 2014-06-30 19:18:20 +02:00
Vincent
c865de4002 Merge pull request #686 from mar-v-in/minidns 
Use minidns instead of dnsjava
 2014-06-23 23:16:25 +02:00
mar-v-in
2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
Dominik Schürmann
e8b96d1035 Disable pre-dexing, causes exceptions on some systems 2014-06-23 13:44:25 +02:00
Dominik Schürmann
4cc127e460 Merge pull request #672 from artbristol/functional-testing 
VERY basic test for save keyring
 2014-06-21 21:31:25 +02:00
Art O Cathain
0af2b27cb3 VERY basic test for save keyring 2014-06-21 17:44:04 +01:00
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Art O Cathain
b1815ef24a revert to previous min version 2014-06-19 07:52:37 +01:00
Art O Cathain
d06ba72edc Start on Robolectric integration test 2014-06-16 18:58:41 +01:00
Art O Cathain
63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error 2014-06-14 13:16:39 +01: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
Dominik Schürmann
cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann
d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
mar-v-in
36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
mar-v-in
cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
Dominik Schürmann
52f1f30846 Use fixed gradle versions 2014-06-04 10:22:05 +02:00
Dominik Schürmann
6cb791d567 Use fixed gradle versions 2014-06-04 10:21:28 +02:00
mar-v-in
3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +02:00
Vincent Breitmoser
e7fa124108 update unit test support in build files 2014-05-27 13:52:58 +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
8e645453b1 Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint 2014-05-02 17:42:40 +02:00
Dominik Schürmann
b1cd669f14 Update maven libs and use fixed version 2014-04-18 20:54:13 +02:00
Dominik Schürmann
19d3fcec7a Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
Dominik Schürmann
f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00