Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into improve-file-more | mar-v-in | 2014-08-01 | 1 | -30/+29 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | ||||
| * | Use darker colors | Dominik Schürmann | 2014-08-01 | 1 | -3/+3 |
| | | |||||
| * | Show revoked and expired for private keys | Dominik Schürmann | 2014-07-31 | 1 | -29/+28 |
| | | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-31 | 1 | -31/+35 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+3 |
| | | |||||
| * | Merge branch 'ditch-appmsg' | Vincent Breitmoser | 2014-07-29 | 1 | -4/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java | ||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -5/+2 |
| | | | |||||
| | * | use SuperToast instead of AppMsg in code, part 1 | Vincent Breitmoser | 2014-07-07 | 1 | -8/+7 |
| | | | |||||
| * | | Use new icons in other key related activites, delete old icons | Dominik Schürmann | 2014-07-28 | 1 | -3/+3 |
| | | | |||||
| * | | Set visibility at last | Dominik Schürmann | 2014-07-28 | 1 | -3/+3 |
| | | | |||||
| * | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 1 | -3/+3 |
| | | | |||||
| * | | Use new status icons in key list | Dominik Schürmann | 2014-07-28 | 1 | -20/+23 |
| | | | |||||
| * | | Smaller status images, green test | Dominik Schürmann | 2014-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | Fix resource names, add small test | Dominik Schürmann | 2014-07-28 | 1 | -5/+10 |
| | | | |||||
| * | | Work on first time wizard design | Dominik Schürmann | 2014-07-27 | 1 | -7/+5 |
| |/ | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-06 | 1 | -27/+7 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -6/+4 |
| | | |||||
| * | edit key: work on saving | Dominik Schürmann | 2014-07-02 | 1 | -6/+2 |
| | | |||||
| * | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 1 | -14/+0 |
| | | |||||
* | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | Converted all other buttons | Daniel Albert | 2014-06-30 | 1 | -5/+5 |
| | | |||||
* | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -4/+4 |
|/ | | | | | | | | | | | | | | | - 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 automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -4/+3 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -4/+3 |
| | | |||||
* | | Make keylist case insensitive | mar-v-in | 2014-06-05 | 1 | -3/+3 |
|/ | | | | You want "michael" to be next to "Michael", don't you? | ||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 1 | -16/+31 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 1 | -11/+27 |
| |\ | |||||
| | * | Use Highlighter instead of HighlightQueryCursorAdapter | Thialfihar | 2014-05-16 | 1 | -10/+17 |
| | | | |||||
| | * | Support mutliple search words and highlight them | Thialfihar | 2014-05-16 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything. | ||||
| * | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 1 | -5/+4 |
| |/ | |||||
* / | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 1 | -1/+1 |
|/ | |||||
* | extract generic LoaderFragment superclass from KeyList | Vincent Breitmoser | 2014-05-08 | 1 | -61/+10 |
| | |||||
* | ui: purplize searchtext in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+3 |
| | |||||
* | edit button with image | Dominik Schürmann | 2014-05-06 | 1 | -2/+3 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -1/+1 |
| | |||||
* | secret keys can only be deleted individually from multi selection | Vincent Breitmoser | 2014-04-17 | 1 | -4/+12 |
| | |||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 1 | -5/+2 |
| | |||||
* | stripped support: add has_secret column to keys table | Vincent Breitmoser | 2014-04-16 | 1 | -7/+7 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 1 | -4/+7 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -2/+1 |
| | |||||
* | Implement SIGNATURE_SUCCESS_CERTIFIED in PgpDecryptVerify (not tested) | Dominik Schürmann | 2014-04-13 | 1 | -1/+0 |
| | |||||
* | use view holder pattern in KeyListFragment | Vincent Breitmoser | 2014-04-10 | 1 | -36/+49 |
| | | | | Closes #551 | ||||
* | Select*KeyFragment rewrites | Vincent Breitmoser | 2014-04-10 | 1 | -1/+6 |
| | | | | | | | | | | - moved all specific Public/Secret logic from the Adapter class into inner subclasses in the Fragments - more versatile status display ("revoked", "expired", "can certify"...) - applied view holder pattern - query logic, including subqueries, moved into provider classes Closes #375 | ||||
* | Integrate NFC functionality into ViewKeyActivity | Dominik Schürmann | 2014-04-10 | 1 | -6/+1 |
| | |||||
* | show key expiry status similar to revocation | Vincent Breitmoser | 2014-04-06 | 1 | -5/+11 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+700 |