aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Start on Robolectric integration testArt O Cathain2014-06-169-43/+202
|
* Merge pull request #656 from danielhass/supertoast-devDominik Schürmann2014-06-164-1/+87
|\ | | | | Added SuperToasts with new notify-wrapper
| * 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 pull request #654 from artbristol/masterDominik Schürmann2014-06-141-1/+1
|\ | | | | Update JUnit version
| * Later version of Junit prevents 'Multiple dex files define ↵Art O Cathain2014-06-141-1/+1
|/ | | | Lorg/hamcrest/Description' error
* Merge branch 'canonicalize'Vincent Breitmoser2014-06-1372-483/+2583
|\
| * Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-1343-163/+823
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update example code instructionsDominik Schürmann2014-06-091-2/+2
| | |
| | * Update README for build toolsDominik Schürmann2014-06-091-1/+1
| | |
| | * Really fix travisDominik Schürmann2014-06-091-3/+3
| | |
| | * Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12Dominik Schürmann2014-06-093-9/+9
| | |
| | * Fix travis for buildTools 19.1Dominik Schürmann2014-06-091-1/+1
| | |
| | * Update buildTools to 19.1Dominik Schürmann2014-06-098-0/+0
| | |
| | * Update buildTools to 19.1Dominik Schürmann2014-06-091-1/+1
| | |
| | * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-065-110/+463
| | |\ | | | | | | | | Parcelable operation result with logging capabilities + import logging
| | * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-0622-57/+637
| | |\ \ | | | | | | | | | | 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
| | | * | | Add dnsjava as submodulemar-v-in2014-06-054-1/+5
| | | | | |
| | | * | | 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-04149-2417/+4042
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
| | | * | | | Merge branch 'hkps-support' into automatic-contact-discoverymar-v-in2014-05-291-15/+54
| | | |\ \ \ \
| | | | * | | | Fix url building to support certificate check on hkps serversmar-v-in2014-05-281-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
| | | | * | | | Add hkps supportmar-v-in2014-05-271-9/+37
| | | | | | | |
| | | * | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server)mar-v-in2014-05-291-1/+2
| | | | | | | |
| | | * | | | | Make abstract methods in Keyserver public (implementations make them public ↵mar-v-in2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anyway)
| | | * | | | | Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYSmar-v-in2014-05-291-3/+4
| | | |/ / / /
| | | * | | | Store origin with ImportKeysListEntrymar-v-in2014-05-273-0/+13
| | | | | | |
| | | * | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV recordmar-v-in2014-05-272-0/+39
| | | | | | |
| | | * | | | ContactHelper can read email addresses from contact listmar-v-in2014-05-262-0/+22
| | | | | | |
| | * | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-066-6/+6
| | | | | | |
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-064-10/+94
| | | |_|/ / | | |/| | |
| | * | | | Merge pull request #646 from timbray/masterDominik Schürmann2014-06-052-67/+66
| | |\ \ \ \ | | | | | | | | | | | | | | Clean up keyimport.ImportKeysListEntry
| | | * | | | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-052-67/+66
| | |/ / / /
| | * | | | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-052-7/+4
| |/| | | | |/| | | | | | | | | | | Don't show full fingerprint in key search result lists
| | * | | | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | | | | |
| | * | | | fixed error messageTim Bray2014-06-042-4/+3
| | | |/ / | | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 18:57:02 +0000