Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -3/+7 |
|\ | |||||
| * | make FileImportCache generic, iterable, and add unit test | Vincent Breitmoser | 2014-08-01 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 5 | -132/+260 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | Remve cacheing of keyrings (cleanup of #726) | Dominik Schürmann | 2014-08-01 | 1 | -5/+0 |
| | | |||||
| * | Merge pull request #726 from mar-v-in/fix-import-from-server | Dominik Schürmann | 2014-08-01 | 1 | -3/+14 |
| |\ | | | | | | | Fix import from server | ||||
| | * | Undo import changes | mar-v-in | 2014-08-01 | 1 | -3/+27 |
| | | | |||||
| | * | Fix import from server | mar-v-in | 2014-08-01 | 1 | -30/+17 |
| | | | | | | | | | | | | | | | Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6 This also keeps the ACTION_IMPORT_KEYRING action stable | ||||
| * | | Fix update from keyserver | Dominik Schürmann | 2014-07-31 | 1 | -0/+5 |
| |/ | |||||
| * | completely overengineer progress indication in {modify,create}SecretKeyRing ↵ | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | | | | | | | methods | ||||
| * | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 1 | -7/+6 |
| | | | | | | | | file, fix #592 | ||||
| * | avoid nullpointerexception in EditKeyResult | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 |
| | | |||||
| * | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 1 | -1/+1 |
| | | |||||
| * | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+1 |
| | | |||||
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 3 | -12/+11 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -0/+1 |
| |\ | |||||
| | * | couple of fixes in save*KeyRing methods | Vincent Breitmoser | 2014-07-30 | 1 | -0/+1 |
| | | | |||||
| * | | Create key: work on upload | Dominik Schürmann | 2014-07-30 | 1 | -0/+9 |
| |/ | |||||
| * | return values for create key | Dominik Schürmann | 2014-07-30 | 1 | -4/+2 |
| | | |||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 4 | -42/+158 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | introduce EditKeyResult with transient UncachedKeyRing (half-baked!) | Vincent Breitmoser | 2014-07-27 | 3 | -26/+69 |
| | | | |||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 3 | -20/+33 |
| | | | |||||
| | * | Merge branch 'master' into ditch-appmsg | Vincent Breitmoser | 2014-07-26 | 4 | -50/+224 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | ||||
| | * | | use SuperToast instead of AppMsg in code, part 2 | Vincent Breitmoser | 2014-07-07 | 2 | -3/+64 |
| | | | | |||||
| | * | | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -4/+3 |
| | | | | |||||
| * | | | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 |
| | |/ | |/| | |||||
| * | | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
| | | | |||||
* | | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-07-21 | 1 | -0/+2 |
|\| | | |||||
| * | | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |
| | | | |||||
* | | | Fixes | Dominik Schürmann | 2014-07-17 | 1 | -0/+8 |
|/ / | |||||
* | | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -2/+2 |
| | | |||||
* | | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 |
| | | |||||
* | | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 2 | -13/+139 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -10/+10 |
| | | | |||||
| * | | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 |
| | | | |||||
| * | | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 |
| | | | |||||
| * | | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 2 | -4/+71 |
| | | | |||||
| * | | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 |
| | | | |||||
* | | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -8/+8 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | ||||
| * | | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
| | | | | | | | | | Naming conventions save lives... or atleast make addAll() work | ||||
* | | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| | | | |||||
* | | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 2 | -30/+30 |
| | | | |||||
* | | | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 1 | -5/+11 |
| | | | |||||
* | | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -4/+0 |
| | | | |||||
* | | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| | | | |||||
* | | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+5 |
| | | | |||||
* | | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+1 |
| | | |