aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Collapse)AuthorAgeFilesLines
...
* Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-4/+4
|
* Fix debug backup/restore methodsDominik Schürmann2014-08-041-22/+17
|
* Merge branch 'master' into improve-file-moremar-v-in2014-07-312-89/+79
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-67/+64
| |
| * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-23/+13
| |
| * Fallback if no primary user id existsDominik Schürmann2014-07-161-0/+4
| |
| * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-151-1/+1
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-151-1/+1
| |\
| | * merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-1/+1
| | |
| * | some fixes for editDominik Schürmann2014-07-151-1/+1
| |/
| * some UncachedKeyRing fixes, primary user id mostlyVincent Breitmoser2014-07-111-6/+5
| |
* | - add multi select for storage api (kitkat)mar-v-in2014-07-311-0/+2
| | | | | | | | | | - UI fixes - refactoring
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-061-1/+5
|\| | | | | | | | | | | | | | | | | 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
| * don't use zero plural string for englishVincent Breitmoser2014-07-021-1/+5
| | | | | | | | closes #703
* | Many changes to file ... and still incompletemar-v-in2014-07-062-10/+56
| | | | | | | | | | - Multi file - Reworked UI
* | Encrypt/Decrypt UI workmar-v-in2014-07-021-7/+7
| |
* | Add temporary file storage as discussed in #665mar-v-in2014-07-011-0/+151
|/ | | | Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
* pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-2/+2
|
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-282-65/+41
| | | | closes #698
* fix indentation in various key import methodsVincent Breitmoser2014-06-221-60/+64
|
* VERY basic test for save keyringArt O Cathain2014-06-211-13/+2
|
* generate public keyring from secret if not availableVincent Breitmoser2014-06-181-18/+18
|
* consolidate: almost sane loggingVincent Breitmoser2014-06-181-42/+54
|
* consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-43/+166
|
* consolidate: make it workVincent Breitmoser2014-06-181-0/+13
|
* code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-181-10/+2
|
* consolidate: add loggingVincent Breitmoser2014-06-181-0/+8
|
* consolidate: first draftVincent Breitmoser2014-06-181-1/+1
|
* import-log: don't count self certs as unknownVincent Breitmoser2014-06-181-0/+1
|
* prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-181-73/+85
|
* handle database error on secret key insertVincent Breitmoser2014-06-171-1/+4
|
* canonicalize: support secret keysVincent Breitmoser2014-06-171-0/+6
|
* import-log: clean up progress messagesVincent Breitmoser2014-06-171-1/+0
|
* drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+3
|
* add more progress info from import routineVincent Breitmoser2014-06-161-1/+26
|
* import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-23/+41
| | | | more docs
* canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-35/+9
|
* import-log: more minor improvementsVincent Breitmoser2014-06-121-6/+5
|
* import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-121-25/+19
|
* import-log: minor improvementsVincent Breitmoser2014-06-121-48/+65
|
* canonicalize: implementation, first draftVincent Breitmoser2014-06-121-1/+1
|
* import-log: properly distinguish return statesVincent Breitmoser2014-06-121-8/+10
|
* import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-121-13/+5
|
* import-log: work on log fragment uiVincent Breitmoser2014-06-101-1/+1
|
* import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-101-9/+15
|
* import-log: more interface workVincent Breitmoser2014-06-101-14/+30
|
* import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-101-64/+103
|
* import-log: better stripped key loggingVincent Breitmoser2014-06-061-14/+37
|
* import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-061-0/+7
|
* import-log: add log statements in import routineVincent Breitmoser2014-06-061-94/+188
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:52:34 +0000