Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | more layout neatification | Vincent Breitmoser | 2014-10-05 | 3 | -4/+22 | |
| | | | ||||||
* | | | slight layout changes to keyspinner_item | Vincent Breitmoser | 2014-10-05 | 3 | -7/+6 | |
|/ / | ||||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 3 | -137/+141 | |
|\ \ | | | | | | | | | | into jacobshack-certify | |||||
| * | | use new multi certify, layout fixes | Dominik Schürmann | 2014-10-04 | 3 | -137/+141 | |
| | | | ||||||
* | | | merge key ids in getSelectedCertifyActions | Vincent Breitmoser | 2014-10-04 | 2 | -24/+28 | |
|/ / | ||||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Dominik Schürmann | 2014-10-04 | 1 | -6/+0 | |
|\ \ | | | | | | | | | | into jacobshack-certify | |||||
| * \ | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 13 | -206/+378 | |
| |\ \ | | | | | | | | | | | | | into jacobshack-certify | |||||
* | \ \ | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 12 | -200/+378 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | into jacobshack-certify | |||||
| * | | add divider | Dominik Schürmann | 2014-10-04 | 2 | -3/+7 | |
| | | | ||||||
| * | | qr code download, cleanup | Dominik Schürmann | 2014-10-04 | 2 | -117/+63 | |
| | | | ||||||
| * | | Workings on new parcel for key downloads | Dominik Schürmann | 2014-10-04 | 8 | -86/+212 | |
| | | | ||||||
| * | | Pass imported master key ids via result parcel | Dominik Schürmann | 2014-10-04 | 5 | -51/+87 | |
| | | | ||||||
| * | | Fixing import, start qr code stuff | Dominik Schürmann | 2014-10-04 | 1 | -50/+116 | |
| | | | ||||||
* | | | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 10 | -9/+822 | |
| | | | ||||||
* | | | certify: get rid of fingerprint check | Vincent Breitmoser | 2014-10-04 | 5 | -16/+6 | |
|/ / | | | | | | | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation. | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 12 | -42/+751 | |
|\ \ | | | | | | | | | | into jacobshack-certify | |||||
| * \ | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Dominik Schürmann | 2014-10-04 | 10 | -289/+653 | |
| |\ \ | | | | | | | | | | | | | into jacobshack-certify | |||||
| * | | | Import code, fix collision of key spinner with other loaders | Dominik Schürmann | 2014-10-04 | 7 | -46/+321 | |
| | | | | ||||||
| * | | | New add keys activity | Dominik Schürmann | 2014-10-04 | 8 | -13/+447 | |
| | |/ | |/| | ||||||
* | | | improve CertifyResult, add custom notify | Vincent Breitmoser | 2014-10-04 | 15 | -26/+140 | |
| |/ |/| | ||||||
* | | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 10 | -43/+389 | |
| | | ||||||
* | | keychainintentservice: rearrange actions in alphabetical order | Vincent Breitmoser | 2014-10-04 | 1 | -263/+281 | |
|/ | ||||||
* | add unit test for duplicate user ids (fix later!!) | Vincent Breitmoser | 2014-10-04 | 1 | -9/+39 | |
| | ||||||
* | canonicalize: compare user ids as string rather than bytes | Vincent Breitmoser | 2014-10-04 | 1 | -3/+3 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 37 | -72/+169 | |
|\ | ||||||
| * | Make app_name translatable | Dominik Schürmann | 2014-10-03 | 2 | -6/+2 | |
| | | ||||||
| * | Version 3.0.1 | Dominik Schürmann | 2014-10-03 | 1 | -2/+2 | |
| | | ||||||
| * | Fix string reference | Dominik Schürmann | 2014-10-03 | 1 | -1/+1 | |
| | | ||||||
| * | Pull from transifex | Dominik Schürmann | 2014-10-03 | 31 | -63/+154 | |
| | | ||||||
| * | Changelog | Dominik Schürmann | 2014-10-03 | 2 | -0/+10 | |
| | | ||||||
* | | fix nullpointer on button push while data is still loading | Vincent Breitmoser | 2014-10-03 | 1 | -0/+3 | |
|/ | | | | fixes #934 | |||||
* | Null check for getSelectedEntries | Dominik Schürmann | 2014-10-03 | 1 | -1/+7 | |
| | ||||||
* | one more fix for getting the right subkey in api signing | Vincent Breitmoser | 2014-10-03 | 1 | -19/+19 | |
| | ||||||
* | forgot adjustments in ProviderHelper | Vincent Breitmoser | 2014-10-03 | 1 | -4/+5 | |
| | ||||||
* | fix unit test for ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -2/+3 | |
| | ||||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-10-03 | 5 | -11/+10 | |
|\ | ||||||
| * | More beautifyKeyIdWithPrefix | Dominik Schürmann | 2014-10-03 | 2 | -3/+2 | |
| | | ||||||
| * | Update safeslinger lib | Dominik Schürmann | 2014-10-03 | 1 | -0/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-10-03 | 17 | -127/+175 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | |||||
| * | | Fix nullpointer with clipboard | Dominik Schürmann | 2014-10-03 | 2 | -10/+9 | |
| | | | ||||||
* | | | clean up PgpImportExport a bit | Vincent Breitmoser | 2014-10-03 | 1 | -7/+5 | |
| | | | ||||||
* | | | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 4 | -20/+25 | |
| | | | ||||||
* | | | actually use iterator interface for ParcelableFileCache in activities | Vincent Breitmoser | 2014-10-03 | 4 | -19/+52 | |
| | | | ||||||
* | | | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 5 | -56/+32 | |
| | | | ||||||
* | | | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 5 | -24/+30 | |
| |/ |/| | ||||||
* | | more getActivity() checks | Vincent Breitmoser | 2014-10-03 | 1 | -2/+11 | |
| | | ||||||
* | | fix nullpointer with subtle attention seeker | Vincent Breitmoser | 2014-10-03 | 1 | -8/+9 | |
| | | ||||||
* | | fix hideKeyboard() in other activities as well, just to be safe | Vincent Breitmoser | 2014-10-02 | 4 | -0/+12 | |
| | | ||||||
* | | fix NullPointerException in keyboard hack | Vincent Breitmoser | 2014-10-02 | 1 | -1/+10 | |
| | | ||||||
* | | add test case for stripped master key, correct signing subkey should still ↵ | Vincent Breitmoser | 2014-10-02 | 2 | -5/+95 | |
| | | | | | | | | be selected |