moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
4,280 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

137 Commits

Author SHA1 Message Date
Dominik Schürmann aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Adithya Abraham Philip 6bc40d12ad renamed KeychainIntentService to KeychainService 2015-06-01 17:43:00 +05:30
Dominik Schürmann b794719020 Version 3.2.3 2015-05-29 02:33:04 +02:00
Dominik Schürmann 43d9e2ba76 Version 3.2.2 2015-05-21 10:34:39 +02:00
Dominik Schürmann 5c44f84009 3.2.1 2015-05-10 13:16:37 +02:00
Dominik Schürmann 5b1bf888b4 Reformat manifest 2015-05-10 11:15:10 +02:00
Dominik Schürmann 63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann e3f5c6d01e Cleanup manifest 2015-05-05 09:26:57 +02:00
Dominik Schürmann 7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Adithya Abraham Philip 91443c2f43 support for handling keyserver urls from browser, added documentation 2015-04-20 21:42:51 +05:30
Dominik Schürmann 256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Vincent Breitmoser b0a51e7dd3 remove unused NfcActivity 2015-03-30 23:39:36 +02:00
Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
 2015-03-24 13:19:43 +01:00
Dominik Schürmann eeccd7cd14 3.2beta3 2015-03-23 23:04:35 +01:00
Adithya Abraham Philip 9f5581463f shifted multi-threading to own service 
added multi-threaded cloud import, restored KeychainIntentService

eliminated code duplication in multi-threaded import
 2015-03-23 15:37:05 +05:30
Vincent Breitmoser 1ad3635d13 work on ad-hoc yubikey import support 2015-03-21 19:52:10 +01:00
Vincent Breitmoser abce05d529 Merge remote-tracking branch 'origin/development' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
 2015-03-20 14:01:07 +01:00
Dominik Schürmann 98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00
Vincent Breitmoser aca54e31ea generalize nfc crypto input structure 2015-03-18 18:25:44 +01:00
Dominik Schürmann dbcb7a9e10 Manifest cleanup 2015-03-17 13:29:54 +01:00
Dominik Schürmann 75368034bd Put API activites in normal process to allow hydrate/dehydrate of logs 2015-03-15 19:35:03 +01:00
Adithya Abraham Philip d4375b7dfc links own keys to me profile in contacts 2015-03-13 03:13:22 +05:30
Dominik Schürmann 4ed1bf0ca4 Version 3.2beta2 2015-03-10 16:30:00 +01:00
Dominik Schürmann f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann 67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Dominik Schürmann 5da57f0582 Update patternview lib, remove workaround 2015-03-03 15:56:03 +01:00
Dominik Schürmann b1c8fa3471 Fix keyboard overlay bug on top of edittexts 2015-02-27 23:24:04 +01:00
Dominik Schürmann 54e04f496e Better qr code resizing 2015-02-27 22:26:11 +01:00
Vincent Breitmoser 2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Dominik Schürmann 72acaaa41f Fingerprint verification, design fixes for qr code card 2015-02-26 02:06:57 +01:00
Dominik Schürmann 52bcfd71ad New advanced key view 2015-02-23 23:03:45 +01:00
Dominik Schürmann 7bddd5be1d Remove old pattern lib, add new pattern lib 2015-02-23 00:28:26 +01:00
Dominik Schürmann 21e7102e3a Fix back button in encrypt activities 2015-02-22 21:39:20 +01:00
Dominik Schürmann 38f7950d90 Saving of allowed keys 2015-01-29 21:00:58 +01:00
Dominik Schürmann c4ef86b38a Refactor DecryptActivity into DecryptOverviewFragment for nav drawer 2015-01-29 12:03:00 +01:00
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 1516ebf26a Toolbar for settings 2015-01-14 20:18:03 +01:00
Dominik Schürmann 2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Dominik Schürmann e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Dominik Schürmann 450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
Dominik Schürmann 9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann 148c9a5c62 Revert "Version 3.1.1" 
This reverts commit 8461f953f6.
 2014-10-30 12:54:01 +01:00
Dominik Schürmann 8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann 3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann 4aed570ee3 3.1beta1 2014-10-26 05:28:57 +01:00
Dominik Schürmann aaa4753503 Fix decrypt intent api 2014-10-26 02:00:52 +01:00
Dominik Schürmann dd007e9664 Hide keyboard in safe slinger activity 2014-10-26 02:36:57 +02:00