aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* use LoaderFragment for CertifyActivityVincent Breitmoser2014-08-314-375/+432
|
* ditch NullProgressableVincent Breitmoser2014-08-303-38/+6
|
* fix one log levelVincent Breitmoser2014-08-301-1/+1
|
* get rid of a deprecated method useVincent Breitmoser2014-08-301-1/+2
|
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-302-4/+36
| | | | closes #797
* show bitsizes in import key list againVincent Breitmoser2014-08-301-4/+4
| | | | closes #802
* Fix possible nullpointer in PreferencesDominik Schürmann2014-08-291-0/+3
|
* Fix crash in PgpKeyHelperDominik Schürmann2014-08-281-1/+1
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-2877-1309/+3041
|\ | | | | | | | | | | | | 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
| * Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-2822-174/+459
| |\ | | | | | | ECC support
| | * add ecc supportVincent Breitmoser2014-08-2420-149/+454
| | |
| | * Add ECDH and ECDSA valuesDominik Schürmann2014-08-211-0/+4
| | |
| | * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-212-30/+5
| | |
| * | Fix NullPointerException in ImportKeysActivityDominik Schürmann2014-08-281-1/+3
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-272-10/+10
| |\ \
| | * | small language fixes for previous commitVincent Breitmoser2014-08-272-11/+10
| | | |
| * | | Strip out duplicate user idsDominik Schürmann2014-08-272-3/+14
| |/ /
| * | Abort import of pubkeys where secret keys exist but new pubkey has more ↵Dominik Schürmann2014-08-272-9/+33
| | | | | | | | | | | | subkeys, fix #696
| * | Cleanup FoldableLinearLayoutDominik Schürmann2014-08-271-6/+4
| | |
| * | API: Fix re-seletion of keys on default accountDominik Schürmann2014-08-232-9/+16
| | |
| * | Fix contact syncDominik Schürmann2014-08-221-5/+5
| | |
| * | Revert "No need for setSyncAutomatically, this is only for network tickles"Dominik Schürmann2014-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0c1e65bc8bbfed59d299e2f0ca7a6a30eef22664. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
| * | Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
| |/
| * Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
| |
| * Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
| |
| * Add account only on jelly bean and aboveDominik Schürmann2014-08-212-8/+15
| |
| * No need for setSyncAutomatically, this is only for network ticklesDominik Schürmann2014-08-211-3/+5
| |
| * Change account typeDominik Schürmann2014-08-214-7/+10
| |
| * cleanupDominik Schürmann2014-08-211-71/+0
| |
| * Fix result handling in account settingsDominik Schürmann2014-08-212-16/+13
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-213-40/+68
| |\
| | * Comment extra in requestSyncDominik Schürmann2014-08-201-0/+1
| | |
| | * Sync in KeychainIntentService on delete, import, saveDominik Schürmann2014-08-202-0/+21
| | |
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-207-50/+130
| | |\
| | * | Enable sync adapter, changelogDominik Schürmann2014-08-202-2/+7
| | | |
| | * | Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
| | | |
| * | | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-2131-2/+31
| | |/ | |/|
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-204-13/+8
| |\|
| | * Upload key workingDominik Schürmann2014-08-204-13/+8
| | |
| * | small change to make android studio recognize a honeycomb-only blockVincent Breitmoser2014-08-201-2/+4
| | |
| * | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-203-40/+103
| | |
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-33/+49
| |\|
| | * Upload key workingDominik Schürmann2014-08-201-0/+3
| | |
| | * Fix key sharingDominik Schürmann2014-08-201-3/+1
| | |
| | * Work on upload keyDominik Schürmann2014-08-201-14/+24
| | |
| | * Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
| | |
| | * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| | |
| | * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+1
| | |\
| | * | return some more resultsDominik Schürmann2014-08-202-6/+14
| | | |
| * | | consolidate: small ui thingsVincent Breitmoser2014-08-201-0/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 01:51:35 +0000