moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity
2,815 Commits 12 Branches 24 Tags 116 MiB
2ead78a1e5
Commit Graph

70 Commits

Author SHA1 Message Date
Dominik Schürmann
40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann
456aa00e2a Update TokenAutoComplete 2014-08-29 18:49:55 +02:00
Dominik Schürmann
aeb0296572 Update nfc lib 2014-08-28 11:05:52 +02:00
Dominik Schürmann
c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2014-08-28 11:00:18 +02:00
Vincent Breitmoser
08bdb0c5b9 update to tidy spongy-master 2014-08-23 11:59:21 +02:00
Dominik Schürmann
aa35f6cffb Fixing build with Spongy Castle 1.51 2014-08-21 15:20:49 +02:00
Dominik Schürmann
602fd546f7 Update spongy castle, not building... 2014-08-21 15:12:25 +02:00
Dominik Schürmann
d26c6b1a08 Update keybase lib 2014-08-20 09:20:30 +02:00
Dominik Schürmann
bc76941bc1 Fix sticky list headers lib, fix travis 2014-08-14 19:30:59 +02:00
Dominik Schürmann
110f8c4d52 Update sticky list headers 2014-08-14 17:00:36 +02:00
Dominik Schürmann
ad69e47cec Support for multiple hash algos 2014-08-14 14:50:13 +02:00
Dominik Schürmann
6da17ef6bb Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
 2014-08-14 13:31:01 +02:00
Dominik Schürmann
d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
Dominik Schürmann
9682826193 update api lib 2014-08-12 15:51:29 +02:00
Dominik Schürmann
a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +02:00
Dominik Schürmann
ae5e75f4e1 Implement EXTRA_ORIGINAL_FILENAME for API 2014-08-11 23:57:11 +02:00
Dominik Schürmann
acf5b99434 Update api lib 2014-08-11 21:26:52 +02:00
Dominik Schürmann
55d03f539e update api lib 2014-08-11 20:16:56 +02:00
Dominik Schürmann
82e66cd5b8 Update api lib 2014-08-11 17:19:58 +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
de6950377c Lint fixes 2014-08-04 17:10:56 +02:00
Dominik Schürmann
da163c8d3d TokenAutoComplete: Do not abort build if lint finds errors 2014-08-04 02:37:41 +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
377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Dominik Schürmann
ee307cdf28 Update gradle plugin to 0.12.2 2014-07-27 18:28:54 +02:00
Dominik Schürmann
cb3425f947 Update spongycastle 2014-07-27 18:21:39 +02:00
Dominik Schürmann
dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +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
Vincent Breitmoser
043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser
7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Dominik Schürmann
9ea5148550 Update libs 2014-07-25 01:34:57 +02:00
Dominik Schürmann
bef3e62111 update lib 2014-07-22 18:30:21 +02:00
Dominik Schürmann
878b5eb5ad Add values for NFC support 2014-07-22 18:10:22 +02:00
Dominik Schürmann
99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00
Dominik Schürmann
976b232946 update nfc lib 2014-07-21 15:11:30 +02:00
Dominik Schürmann
d882572f0d NFC Yubikey: only pass through hash of message and not whole content 2014-07-21 15:10:29 +02:00
Vincent Breitmoser
cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Dominik Schürmann
3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Dominik Schürmann
69c38c3f34 Update lib 2014-07-17 21:14:42 +02:00
Dominik Schürmann
45611a33fb Update libs 2014-07-17 20:30:41 +02:00
Dominik Schürmann
f2a6064e38 Fixes 2014-07-17 20:29:07 +02:00
Dominik Schürmann
3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
Dominik Schürmann
e531da4036 Add nfc lib 2014-07-16 10:22:51 +02:00
Vincent Breitmoser
d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
mar-v-in
fdf6411d5f Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
 2014-07-06 02:24:34 +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
Dominik Schürmann
931bfdd9df Update spongycastle 2014-07-02 16:56:38 +02:00
Dominik Schürmann
9c1c51bf0c Removed submodule AndroidBootstrap 2014-06-30 22:04:13 +02:00
Dominik Schürmann
97e1f365c2 Update keybase lib 2014-06-28 20:44:01 +02:00