Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add contact count to My Keys header | Vincent Breitmoser | 2014-03-08 | 3 | -2/+30 |
| | |||||
* | better handling of multi select in ListKeysFragment | Vincent Breitmoser | 2014-03-08 | 1 | -17/+22 |
| | |||||
* | ditch old key list activities | Vincent Breitmoser | 2014-03-08 | 19 | -1433/+6 |
| | |||||
* | add edit button and secret key info to public key view | Vincent Breitmoser | 2014-03-08 | 5 | -2/+71 |
| | |||||
* | move some placeholders into resources | Vincent Breitmoser | 2014-03-08 | 4 | -5/+6 |
| | |||||
* | Normalize public key uri in KeyListFragment | Vincent Breitmoser | 2014-03-08 | 3 | -6/+29 |
| | | | | | | | | | Find the explicit row id of the public key id given in the uri in KeyListFragment and work with that. This way, passing in uris by master key id, mail address, or any other criteria, works. Might be a good idea to add an actual check if the row id is non-zero here, but not sure how to do a "bad intent" thing | ||||
* | Make EditKeyActivity's uri handling (more) sane | Vincent Breitmoser | 2014-03-08 | 2 | -6/+4 |
| | | | | | This activity didn't actually use the uri for anything, but just chopped off the last path segment and interpreted it as row id. What the hell. | ||||
* | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 9 | -246/+450 |
| | |||||
* | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 8 | -5/+776 |
| | |||||
* | Merge pull request #322 from mj7007/smooth_activity_switch | Dominik Schürmann | 2014-03-04 | 1 | -8/+15 |
|\ | | | | | Smooth Activity Switch Fixed | ||||
| * | Smooth Activity Switch Fixed | mj7007 | 2014-03-04 | 1 | -8/+15 |
| | | |||||
* | | Merge pull request #315 from jessicayuen/master | Dominik Schürmann | 2014-03-04 | 7 | -11/+87 |
|\ \ | | | | | | | #226: Added cancel option to ProgressDialogFragments. Create Key is now cancelable. | ||||
| * | | #226: Small fix to prevent message from being sent if IntentService is canceled | Jessica Yuen | 2014-03-03 | 1 | -0/+16 |
| | | | |||||
| * | | #226: Async key gen task is stopped if progress is canceled | Jessica Yuen | 2014-03-02 | 5 | -17/+40 |
| | | | |||||
| * | | #226: Activity no longer closes if progress is canceled for key creation in ↵ | Jessica Yuen | 2014-03-02 | 5 | -10/+17 |
| | | | | | | | | | | | | EditKeyActivity | ||||
| * | | #226: Added cancel option to ProgressDialogFragments. Create Key is now ↵ | Jessica Yuen | 2014-03-02 | 6 | -9/+39 |
| | | | | | | | | | | | | cancelable. | ||||
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-03 | 6 | -11/+17 |
|\ \ \ | |||||
| * | | | Fix NewApi Lint Errors | Emantor | 2014-03-03 | 3 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix missing ; import android.annotation.TargetApi where needed | ||||
| * | | | Fix DefaultLocale Lint Warnings | Emantor | 2014-03-03 | 1 | -3/+4 |
| | | | | |||||
| * | | | Fix ScrollViewSize Lint Warnings | Emantor | 2014-03-03 | 3 | -6/+6 |
| | | | | |||||
* | | | | change ordering in Intent descriptions for better readability in small dialogs | Dominik Schürmann | 2014-03-03 | 1 | -4/+4 |
|/ / / | |||||
* | | | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | version code 23101 for beta testing | Dominik Schürmann | 2014-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Update from transifex | Dominik Schürmann | 2014-03-02 | 39 | -276/+626 |
| | | | |||||
* | | | API changes | Dominik Schürmann | 2014-03-02 | 3 | -160/+132 |
|/ / | |||||
* | | Merge pull request #306 from danielhass/keyserver-conerror | Dominik Schürmann | 2014-02-28 | 5 | -27/+102 |
|\ \ | | | | | | | Show error if keyserver is not reachable | ||||
| * | | Some clean up | Daniel Haß | 2014-02-28 | 1 | -4/+2 |
| | | | |||||
| * | | Added different notifys for different exceptions | Daniel Haß | 2014-02-27 | 1 | -6/+17 |
| | | | |||||
| * | | Added error strings for key import from keyserver | Daniel Haß | 2014-02-27 | 1 | -0/+3 |
| | | | |||||
| * | | Added StackOverflow link to documentation | Daniel Haß | 2014-02-27 | 1 | -0/+2 |
| | | | |||||
| * | | Added documentation to the AsyncTaskResultWrapper | Daniel Haß | 2014-02-27 | 1 | -0/+5 |
| | | | |||||
| * | | Adapted the ImportKeysLoader to work with the new AsyncWrapper | Daniel Haß | 2014-02-26 | 3 | -9/+13 |
| | | | |||||
| * | | Reworked ImportKeysListFragment to handel exceptions, ImportKeyListLoader is ↵ | Daniel Haß | 2014-02-26 | 2 | -20/+34 |
| | | | | | | | | | | | | temporarily disabled | ||||
| * | | Added the AsyncTaskResultWrapper | Daniel Haß | 2014-02-26 | 1 | -0/+38 |
| | | | |||||
* | | | cleanup | Dominik Schürmann | 2014-02-27 | 4 | -40/+22 |
| | | | |||||
* | | | Added GPL headers | Nikhil Peter Raj | 2014-02-27 | 2 | -11/+31 |
| | | | |||||
* | | | Complete fix for #304 | Nikhil Peter Raj | 2014-02-27 | 2 | -94/+170 |
| | | | |||||
* | | | Partial fix for #304 | Nikhil Peter Raj | 2014-02-26 | 2 | -32/+82 |
|/ / | |||||
* | | Final fix for #266 | Nikhil Peter Raj | 2014-02-26 | 2 | -2/+2 |
| | | | | | | | | | | -Fix implemented using setIcon() as setIconAttribute() is not valid for API less than 11 | ||||
* | | Removed Thumbs.db,added to gitignore | Nikhil Peter Raj | 2014-02-25 | 4 | -0/+0 |
| | | |||||
* | | Fix for #266 | Nikhil Peter Raj | 2014-02-25 | 10 | -2/+3 |
|/ | | | | | -Extra: Added the appropriate images to drawable folder from Android SDK source, can be used as alternative if required. | ||||
* | Replaced Toast with AppMsg in DecryptActivity | Daniel Haß | 2014-02-24 | 1 | -16/+17 |
| | |||||
* | cleanup | Dominik Schürmann | 2014-02-24 | 1 | -57/+7 |
| | |||||
* | fix signature passing and verify in demo | Dominik Schürmann | 2014-02-24 | 1 | -5/+6 |
| | |||||
* | remove debug stuff | Daniel Haß | 2014-02-23 | 1 | -2/+1 |
| | |||||
* | Revert "Replaced Toast with AppMsg in EncryptActivity" | Daniel Haß | 2014-02-23 | 1 | -13/+15 |
| | | | | This reverts commit e936a4762b4c6ed8153d216ab4655e251c4366f3. | ||||
* | Replaced Toast with AppMsg in EncryptActivity | Daniel Haß | 2014-02-23 | 1 | -15/+13 |
| | |||||
* | Replaced Toast with AppMsg in EncryptActivity | Daniel Haß | 2014-02-23 | 1 | -13/+15 |
| | |||||
* | Update help_start.html | Dominik Schürmann | 2014-02-23 | 1 | -1/+1 |
| | |||||
* | AndroidManfiest code for later... | Dominik Schürmann | 2014-02-21 | 2 | -3/+23 |
| |