Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Stop refreshing after all keys have been updated | Dominik Schürmann | 2014-09-18 | 1 | -4/+4 | |
| | ||||||
* | Swipe-to-refresh fixes | Dominik Schürmann | 2014-09-18 | 1 | -1/+2 | |
| | ||||||
* | Swipe-to-refresh fixes | Dominik Schürmann | 2014-09-18 | 1 | -16/+20 | |
| | ||||||
* | Use key icons in spinners | Dominik Schürmann | 2014-09-17 | 1 | -12/+4 | |
| | ||||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -5/+5 | |
| | | | | created ui.util for everything related to formatting | |||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -5/+3 | |
| | ||||||
* | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 1 | -1/+1 | |
| | ||||||
* | Hack to disable overscroll effect of swipe to update | Dominik Schürmann | 2014-09-13 | 1 | -1/+2 | |
| | ||||||
* | Custom actionbar to indicate swipe down effect | Dominik Schürmann | 2014-09-13 | 1 | -0/+51 | |
| | ||||||
* | Removed unnecessary querying of keyservers, reimplemented the ↵ | Daniel Albert | 2014-09-13 | 1 | -0/+8 | |
| | | | | ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers | |||||
* | Implemented Pull2Refresh in the KeyListFragment | Daniel Albert | 2014-09-12 | 1 | -1/+27 | |
| | | | | | | Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs Added Pull2Refresh to the KeyListFragment | |||||
* | API fixes | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 | |
| | ||||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 | |
| | | | | http://developer.android.com/guide/components/intents-filters.html | |||||
* | Two buttons to encrypt files and text, some fixes | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 | |
| | ||||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -4/+3 | |
| | ||||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 | |
| | ||||||
* | small change to make android studio recognize a honeycomb-only block | Vincent Breitmoser | 2014-08-20 | 1 | -2/+4 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -4/+2 | |
|\ | ||||||
| * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -4/+2 | |
| | | ||||||
* | | close actionmode in keylist on loading events (avoid inconsistent state) | Vincent Breitmoser | 2014-08-20 | 1 | -0/+10 | |
|/ | ||||||
* | hacky fix to prevent key list from scrolling to top when opening nav drawer | Dominik Schürmann | 2014-08-14 | 1 | -7/+15 | |
| | ||||||
* | 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 | |
| | | |