aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | add more progress info from import routineVincent Breitmoser2014-06-163-3/+43
| | | | |
| | * | | import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-163-70/+133
| | | |/ | | |/| | | | | | | | | more docs
| * / | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1811-322/+236
| |/ /
| * | 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
| | |
| * | Replaced AppMsg with notify wrapper callDaniel Haß2014-06-161-1/+4
| | |
| * | Added notification wrapper for toast like notifysDaniel Haß2014-06-161-0/+70
| | |
| * | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1318-145/+741
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-3/+44
| | |
| * | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-122-39/+9
| | |
| * | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-123-13/+85
| | |
| * | import-log: more minor improvementsVincent Breitmoser2014-06-122-9/+6
| | |
| * | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-121-25/+19
| | |
| * | import-log: minor improvementsVincent Breitmoser2014-06-124-55/+74
| | |
| * | canonicalize: more stuffVincent Breitmoser2014-06-124-40/+60
| | |
| * | canonicalize: implementation, first draftVincent Breitmoser2014-06-124-28/+317
| | |
| * | 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-122-16/+6
| | |
| * | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| | |
| * | import-log: work on log fragment uiVincent Breitmoser2014-06-104-18/+102
| | |
| * | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-105-90/+133
| | |
| * | import-log: more interface workVincent Breitmoser2014-06-106-40/+71
| | |
| * | import-log: some cosmeticsVincent Breitmoser2014-06-103-3/+7
| | |
| * | import-log: add LogDisplay activityVincent Breitmoser2014-06-103-4/+107
| | |
| * | 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-105-98/+251
| | |
* | | 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-064-110/+424
|\| | | | | Parcelable operation result with logging capabilities + import logging
| * import-log: better stripped key loggingVincent Breitmoser2014-06-063-16/+41
| |
| * import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| |
| * 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-0613-57/+580
|\ \ | | | | | | 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-061-2/+3
| | |
| * | 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-055-8/+111
| | | | | | | | | | | | | | | | 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-0449-1662/+2686
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 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-044-0/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 13:22:12 +0000