aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-141-4/+4
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
| * Dont write version header by defaultDominik Schürmann2014-08-141-4/+4
| |
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-066-117/+221
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle
| * Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-3/+10
| |
| * Optimize importsDominik Schürmann2014-08-055-9/+25
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-051-1/+5
| |\
| | * Use size of input uris for progress bar in encrypt/decryptmar-v-in2014-08-041-1/+5
| | |
| * | KeychainContract: use longs instead of String, other fixesDominik Schürmann2014-08-051-1/+1
| |/
| * Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-1/+2
| |
| * Cleanup, prevent encrypt Intent inceptionDominik Schürmann2014-08-041-9/+12
| |
| * Cache contact photos to make UI more fluidmar-v-in2014-08-011-0/+10
| |
| * Merge branch 'master' into improve-file-moremar-v-in2014-07-311-0/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | - add multi select for storage api (kitkat)mar-v-in2014-07-311-8/+9
| | | | | | | | | | | | | | | - UI fixes - refactoring
| * | Load of rework on EncryptActivity, still some TODOsmar-v-in2014-07-201-8/+13
| | |
| * | Many changes to file ... and still incompletemar-v-in2014-07-062-0/+55
| | | | | | | | | | | | | | | - Multi file - Reworked UI
| * | Merge branch 'master' into improve-file-moremar-v-in2014-07-013-2/+282
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
| * \ \ Merge branch 'master' into improve-file-moremar-v-in2014-06-241-5/+7
| |\ \ \
| * | | | Improve file more, Part 1mar-v-in2014-06-222-105/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion)
* | | | | Merge branch 'master' into yubikeyDominik Schürmann2014-08-011-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
| * | | | Program flow fixesDominik Schürmann2014-07-251-1/+1
| | | | |
* | | | | Remove support for V3 signaturesDominik Schürmann2014-07-221-10/+0
|/ / / /
* | | | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-161-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
| * | | | New first time screenDominik Schürmann2014-07-161-0/+10
| | |_|/ | |/| |
* / | | Added Preference for concealing the PgpApplicationDaniel Albert2014-07-121-0/+10
|/ / /
* | | Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-2/+135
| | |
* | | Move sks-keyservers.net CA into assets foldermar-v-in2014-06-251-0/+46
| | |
* | | Update Keyservers to use hkps as neededmar-v-in2014-06-241-0/+18
| | |
* | | Add TlsHelper (designed to be used with sks-keyservers.net)mar-v-in2014-06-231-0/+83
| |/ |/| | | | | We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
* | Switch to dnsjavamar-v-in2014-06-231-5/+7
|/
* Merge branch 'master' into improve-filemar-v-in2014-06-182-51/+187
|\
| * Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-181-51/+178
| |\ | | | | | | Improve contact sync
| | * Remove abandoned contactsmar-v-in2014-06-181-26/+90
| | |
| | * Code stylemar-v-in2014-06-181-13/+26
| | |
| | * Continue contact db syncmar-v-in2014-06-181-39/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only add keyrings to contact db that are not expired nor revoked - Merge all user ids of a key into one contact (#659) - Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db TODO: - delete contact once keyring is removed from OK - sync: wait for key downloads to complete before changing contact db
| * | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-181-0/+9
| |/
* / Use Document API on KitKat for file encrypt/decryptmar-v-in2014-06-101-0/+35
|/
* Fix compile error introduced during mergemar-v-in2014-06-061-1/+2
|
* Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-051-3/+0
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * neatness refactoringVincent Breitmoser2014-06-041-3/+0
| |
* | Show keys with android contactsmar-v-in2014-06-051-2/+87
| | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
* | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-041-2/+4
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-211-2/+4
| |
* | First version of automatic contact discovery.mar-v-in2014-06-041-0/+97
| | | | | | | | | | | | | | | | | | 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)
* | ContactHelper can read email addresses from contact listmar-v-in2014-05-261-0/+21
|/
* proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-081-5/+7
|
* Better handling of actionbars backDominik Schürmann2014-05-071-19/+0
|
* Optimize importsDominik Schürmann2014-04-155-1/+5
|
* Removing remaining uses of Id, closing one of the oldest bugs #9Dominik Schürmann2014-04-142-4/+2
|
* Update license header for 2014Dominik Schürmann2014-04-134-4/+4
|
* Refactor ProviderHelper to be non-static using a constructor based on ↵Dominik Schürmann2014-04-111-1/+1
| | | | context (first commit to get context out of pgp classes)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 18:03:38 +0000