Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | Lint changes after testing | Bhargav Golla | 2014-03-10 | 11 | -19/+16 | |
| | | | | | ||||||
| | * | | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526 | uberspot | 2014-03-12 | 2 | -12/+60 | |
| | | | | | ||||||
| * | | | | merge fixes as per comments in merge | Vincent Breitmoser | 2014-03-13 | 1 | -30/+19 | |
| | | | | | | | | | | | | | | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753 | |||||
| * | | | | remove special treatment for unified list query | Vincent Breitmoser | 2014-03-13 | 1 | -39/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: the unified query /will/ need special treatment once certs are joined in, so I am leaving this as an artifact commit for later reference or point to revert to. | |||||
| * | | | | keychainprovider cleanup, kindasorta | Vincent Breitmoser | 2014-03-13 | 2 | -56/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?). | |||||
* | | | | | Merge branch 'master' into certs | Vincent Breitmoser | 2014-03-12 | 127 | -1106/+2747 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |||||
| * | | | | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 27 | -876/+600 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml | |||||
| * | | | | Merge pull request #395 from uberspot/master | Dominik Schürmann | 2014-03-12 | 38 | -281/+244 | |
| |\ \ \ \ | | | | | | | | | | | | | Remove duplicate code from ActionBarHelper. Add export in multiselect. | |||||
| | * | | | | Add Email suggestions in Create Key activity | uberspot | 2014-03-12 | 4 | -6/+55 | |
| | | | | | | ||||||
| | * | | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 15 | -24/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | imports and throw exceptions | |||||
| | * | | | | minor clean up in colorize method | uberspot | 2014-03-11 | 1 | -2/+3 | |
| | | | | | | ||||||
| | * | | | | Add export... button and functionality in multi-select | uberspot | 2014-03-11 | 10 | -12/+31 | |
| | | | | | | ||||||
| | * | | | | Make export work with rowIds instead of MasterKeyIds | uberspot | 2014-03-11 | 6 | -53/+92 | |
| | | | | | | ||||||
| | * | | | | Remove duplicate code from ActionBarHelper. You can now set the drawables ↵ | uberspot | 2014-03-11 | 9 | -187/+42 | |
| | | |_|/ | | |/| | | | | | | | | | | | | via the method calls | |||||
| * | | | | Merge pull request #397 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-12 | 1 | -0/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted ) | |||||
| | * | | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : Fixed | Tharindu Wijewardane | 2014-03-11 | 1 | -0/+1 | |
| | |/ / / | ||||||
| * / / / | Fix error in importing/updating keys from keyserver by removing extra 0x | Miroojin Bakshi | 2014-03-12 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | more tight layout | Dominik Schürmann | 2014-03-11 | 1 | -12/+10 | |
| | | | | ||||||
| * | | | cleanup | Dominik Schürmann | 2014-03-11 | 2 | -43/+37 | |
| | | | | ||||||
| * | | | Merge pull request #394 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-11 | 1 | -1/+4 | |
| |\ \ \ | | | | | | | | | | | linear layout edited to display test horizontally #391 | |||||
| | * | | | linear layout edited to display test horizontally | Sreeram Boyapati | 2014-03-11 | 1 | -1/+4 | |
| | | | | | ||||||
| * | | | | Merge pull request #392 from honnel/cursor-reset2 | Dominik Schürmann | 2014-03-11 | 1 | -0/+14 | |
| |\ \ \ \ | | |/ / / | |/| | | | Reset cursor query when closing search view #386 | |||||
| | * | | | OnFocusChangeListener replaced with OnActionExpandListener | Daniel Hammann | 2014-03-11 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | | For same behaviour like contacts app #386 #387 | |||||
| | * | | | Reset cursor query when closing search view #386 | Daniel Hammann | 2014-03-10 | 1 | -0/+10 | |
| | | |/ | | |/| | | | | | | | | | Without focus the search result get erased. | |||||
| * | | | Appropriate save Icon in EditKeyActivity | uberspot | 2014-03-11 | 9 | -1/+153 | |
| | | | | ||||||
| * | | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 5 | -39/+109 | |
| |\ \ \ | | | | | | | | | | | Fix to passphrase dialog and Issue #207 | |||||
| | * | | | Added string reference for Issue #207 | Sreeram Boyapati | 2014-03-10 | 2 | -4/+6 | |
| | | | | | ||||||
| | * | | | ViewHolder Pattern Implemented | Sreeram Boyapati | 2014-03-10 | 1 | -26/+39 | |
| | | | | | ||||||
| | * | | | Fix to passphrase dialog and Issue #207 | Sreeram Boyapati | 2014-03-10 | 3 | -13/+68 | |
| | | | | | ||||||
| * | | | | More fixes for KeychainIntentServiceHandler | Dominik Schürmann | 2014-03-10 | 1 | -41/+43 | |
| | | | | | ||||||
| * | | | | Pull from transifex | Dominik Schürmann | 2014-03-10 | 23 | -269/+828 | |
| | | | | | ||||||
| * | | | | getString before init of KeychainIntentHandler | Dominik Schürmann | 2014-03-10 | 9 | -62/+49 | |
| | | | | | ||||||
| * | | | | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix progress_generating and reformat | Dominik Schürmann | 2014-03-10 | 6 | -61/+93 | |
| | |/ / | |/| | | ||||||
| * | | | @color/white instead of hex | Dominik Schürmann | 2014-03-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Revert "Lint changes" | Dominik Schürmann | 2014-03-10 | 13 | -20/+23 | |
| | | | | | | | | | | | | | | | | This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee. | |||||
| * | | | Merge pull request #381 from bhargavgolla/Lint-error-fix | Dominik Schürmann | 2014-03-10 | 13 | -23/+20 | |
| |\ \ \ | | | | | | | | | | | Lint changes #223 | |||||
| | * | | | Lint changes | Bhargav Golla | 2014-03-10 | 13 | -23/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting lint-report gen files Adding lint output files to gitignore | |||||
| * | | | | Make code more tidy for multiselect | Dominik Schürmann | 2014-03-10 | 4 | -44/+10 | |
| | | | | | ||||||
| * | | | | Improve hightlight query code: make cursor abstract, tidy up code | Dominik Schürmann | 2014-03-10 | 4 | -55/+51 | |
| | | | | | ||||||
| * | | | | Merge pull request #384 from mb-14/search1 | Dominik Schürmann | 2014-03-10 | 5 | -8/+79 | |
| |\ \ \ \ | | | | | | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into search1 | Miroojin Bakshi | 2014-03-10 | 1 | -0/+3 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Create custom HighlightQueryCursorAdapter | Miroojin Bakshi | 2014-03-10 | 3 | -68/+70 | |
| | | | | | | | ||||||
| | * | | | | | Highlight search query in SelectPublicKeyFragment and | Miroojin Bakshi | 2014-03-10 | 4 | -3/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyListPublicFragment | |||||
| * | | | | | | Cleanup ImportKeysListEntry | Dominik Schürmann | 2014-03-10 | 1 | -4/+6 | |
| | | | | | | | ||||||
| * | | | | | | remove double definition of progress_generating | Dominik Schürmann | 2014-03-10 | 1 | -1/+0 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #385 from tharinduwijewardane/master | Dominik Schürmann | 2014-03-10 | 1 | -0/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Issue #378 ( private keys are no longer red ): Fixed | |||||
| | * | | | | Issue #378 ( private keys are no longer red ): Fixed | Tharindu Wijewardane | 2014-03-10 | 1 | -0/+3 | |
| | | | | | | ||||||
| * | | | | | remove unneeded replace for newline on fingerprint | Dominik Schürmann | 2014-03-09 | 1 | -2/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #380 from uberspot/master | Dominik Schürmann | 2014-03-09 | 2 | -12/+28 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Colorize fingerprint |