aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1830-458/+446
| |/ /
| * | Changed license headerDaniel Haß2014-06-161-11/+11
| | |
| * | Moved Notify class to utilsDaniel Haß2014-06-162-2/+2
| | |
| * | Removed unused importDaniel Haß2014-06-161-1/+0
| | |
| * | Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
| | |
| * | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| | |
| * | Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
| | |
| * | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
| | |
| * | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1326-147/+802
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
| * | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-123-5/+49
| | |
| * | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-123-43/+9
| | |
| * | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-124-19/+98
| | |
| * | import-log: more minor improvementsVincent Breitmoser2014-06-123-17/+12
| | |
| * | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-122-26/+20
| | |
| * | import-log: minor improvementsVincent Breitmoser2014-06-125-56/+77
| | |
| * | canonicalize: more stuffVincent Breitmoser2014-06-125-47/+70
| | |
| * | canonicalize: implementation, first draftVincent Breitmoser2014-06-125-29/+337
| | |
| * | import-log: properly distinguish return statesVincent Breitmoser2014-06-125-26/+25
| | |
| * | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-123-17/+6
| | |
| * | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| | |
| * | import-log: work on log fragment uiVincent Breitmoser2014-06-106-21/+113
| | |
| * | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1016-160/+205
| | |
| * | import-log: more interface workVincent Breitmoser2014-06-107-50/+94
| | |
| * | import-log: some cosmeticsVincent Breitmoser2014-06-108-26/+33
| | |
| * | import-log: add LogDisplay activityVincent Breitmoser2014-06-108-21/+204
| | |
| * | import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
| | |
| * | canonicalize: first step(s)Vincent Breitmoser2014-06-103-3/+66
| | |
| * | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-106-101/+260
| | |
* | | Delete using Document API (unsafe)mar-v-in2014-06-103-5/+43
| | |
* | | Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-106-54/+200
| | |
* | | Modify KeychainIntentService to support I/O with URIs, allow input and ↵mar-v-in2014-06-085-176/+109
| |/ |/| | | | | output to/from different types (eg. encrypt file and return byte array)
* | Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
|\| | | | | Parcelable operation result with logging capabilities + import logging
| * import-log: better stripped key loggingVincent Breitmoser2014-06-064-17/+43
| |
| * import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| |
| * import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
| |
| * import-log: add log statements in import routineVincent Breitmoser2014-06-062-97/+225
| |
| * import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-062-10/+37
| |
| * import-log: add parcelable prototypeVincent Breitmoser2014-06-051-0/+123
| |
* | Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0618-57/+632
|\ \ | | | | | | Automatic contact discovery and more
| * | Fix TAG in account service as wellmar-v-in2014-06-061-7/+8
| | |
| * | Fixing TAG and string resourcemar-v-in2014-06-062-4/+4
| | |
| * | Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
| | |
| * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0537-340/+214
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Show keys with android contactsmar-v-in2014-06-058-11/+119
| | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
| * | | Make keylist case insensitivemar-v-in2014-06-051-3/+3
| | | | | | | | | | | | | | | | You want "michael" to be next to "Michael", don't you?
| * | | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-04142-2311/+4001
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | | Fix regex for hkp parsing to support multiple uidsmar-v-in2014-06-041-2/+2
| | | | |
| * | | | First version of automatic contact discovery.mar-v-in2014-06-049-0/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - Configuration (much of it) - Enabled by default? - Which keys to import? Current state: All non-revoked and non-expired with matching userid - Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?) - Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
| * | | | Store expired state within ImportKeysListEntrymar-v-in2014-06-042-0/+12
| | | | |
| * | | | Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYSmar-v-in2014-05-291-54/+15
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 02:26:49 +0000