aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix tests for new PgpSignEncryptInputVincent Breitmoser2015-02-021-29/+29
|
* rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0169-851/+1062
| | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3149-1370/+3221
|\
| * Rename app setting classes for consistencyDominik Schürmann2015-01-307-15/+14
| |
| * Fix saving of allowed keysDominik Schürmann2015-01-301-11/+5
| |
| * Fix travis for build tools updateDominik Schürmann2015-01-302-1/+1
| |
| * Update mini dns libDominik Schürmann2015-01-301-0/+0
| |
| * Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into developmentDominik Schürmann2015-01-302-2/+2
| |\
| | * Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵Dominik Schürmann2015-01-302-2/+2
| |/| | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8
| | * Add explicit casting to be able to compile with java8ligi2015-01-291-1/+1
| | |
| | * Use latest buildToolsligi2015-01-291-1/+1
| | |
| * | Header exportedDominik Schürmann2015-01-301-1/+4
| | |
| * | Saving of allowed keysDominik Schürmann2015-01-2912-232/+467
| | |
| * | Introduce allowed keys table per API clientDominik Schürmann2015-01-294-5/+70
| | |
| * | Header image tryoutDominik Schürmann2015-01-296-5/+2039
| | |
| * | Update api libDominik Schürmann2015-01-291-0/+0
| |/
| * Remove files related to old nav drawerDominik Schürmann2015-01-2919-551/+53
| |
| * Fix item layout in apps listDominik Schürmann2015-01-292-10/+10
| |
| * Close FileDescriptors and input, output streams when possibleDominik Schürmann2015-01-291-285/+335
| |
| * Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-299-278/+243
| |
| * Update api libDominik Schürmann2015-01-291-0/+0
| |
| * White popup themeDominik Schürmann2015-01-291-3/+7
| |
* | prevent recursive consolidateVincent Breitmoser2015-01-315-5/+11
|/
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-2920-360/+61
|
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-2911-214/+370
|\ | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-198-210/+198
| |
* | Cloud search iconDominik Schürmann2015-01-2810-3/+58
| |
* | Fix cleartext signatures internallyDominik Schürmann2015-01-271-5/+4
| |
* | Update api libDominik Schürmann2015-01-271-0/+0
| |
* | Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
| |
* | Merge branch 'detached-sigs-api' into developmentDominik Schürmann2015-01-2716-200/+449
|\ \
| * | Support verification of detached signaturesDominik Schürmann2015-01-273-98/+223
| | |
| * | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2713-57/+187
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | Temporary nav drawer fixesDominik Schürmann2015-01-279-20/+54
| | | |
| * | | Fixes for detached signaturesDominik Schürmann2015-01-262-11/+36
| | | |
| * | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26652-3346/+5071
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | | Update safeslinger libDominik Schürmann2015-01-121-0/+0
| | | | |
| * | | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-082-2/+1
| | | | |
| * | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-086-44/+118
| | | | |
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-271-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | development
| * | | | update openpgp-api-lib for charset supportVincent Breitmoser2015-01-271-0/+0
| | | | |
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-2712-57/+188
|\| | | | | |_|/ / |/| | | | | | | development
| * | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-278-4/+120
| | | |
| * | | remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | | |
| * | | move last parts of import logic from kis into operationVincent Breitmoser2015-01-265-41/+68
| | | |
* | | | Material Design DrawerDominik Schürmann2015-01-2635-29/+101
|/ / /
* | | Material Design: Full screen dialogsDominik Schürmann2015-01-2657-273/+209
| | |
* | | specify our usage of java 1.7 in build filesVincent Breitmoser2015-01-251-0/+5
| | |
* | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2588-838/+757
| | |
* | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-259-1/+334
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 06:52:08 +0000